4b97cd2fb4
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.-][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.-][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
Fix tests by disabling failures related to softhsm, see
|
|
|
|
https://github.com/SSSD/sssd/issues/5397
|
|
|
|
--- a/src/tests/cmocka/test_pam_srv.c
|
|
+++ b/src/tests/cmocka/test_pam_srv.c
|
|
@@ -41,6 +41,8 @@
|
|
#include "tests/test_CA/SSSD_test_cert_x509_0002.h"
|
|
#include "tests/test_CA/SSSD_test_cert_x509_0005.h"
|
|
|
|
+#define TEST_MODULE_NAME SOFTHSM2_PATH
|
|
+
|
|
#include "tests/test_ECC_CA/SSSD_test_ECC_cert_x509_0001.h"
|
|
#else
|
|
#define SSSD_TEST_CERT_0001 ""
|
|
@@ -48,6 +50,7 @@
|
|
#define SSSD_TEST_CERT_0005 ""
|
|
|
|
#define SSSD_TEST_ECC_CERT_0001 ""
|
|
+#define TEST_MODULE_NAME ""
|
|
#endif
|
|
|
|
#define TESTS_PATH "tp_" BASE_FILE_STEM
|
|
@@ -62,7 +65,6 @@
|
|
#define TEST_TOKEN_NAME "SSSD Test Token"
|
|
#define TEST_TOKEN2_NAME "SSSD Test Token Number 2"
|
|
#define TEST_KEY_ID "C554C9F82C2A9D58B70921C143304153A8A42F17"
|
|
-#define TEST_MODULE_NAME SOFTHSM2_PATH
|
|
#define TEST_PROMPT "SSSD test cert 0001\nCN=SSSD test cert 0001,OU=SSSD test,O=SSSD"
|
|
#define TEST2_PROMPT "SSSD test cert 0002\nCN=SSSD test cert 0002,OU=SSSD test,O=SSSD"
|
|
#define TEST5_PROMPT "SSSD test cert 0005\nCN=SSSD test cert 0005,OU=SSSD test,O=SSSD"
|
|
|
|
The test_ncache_* functions require a working user directory, which is
|
|
generally unavailable in xbps-src builds.
|
|
|
|
--- a/src/tests/cmocka/test_negcache.c
|
|
+++ b/src/tests/cmocka/test_negcache.c
|
|
@@ -1089,7 +1089,7 @@
|
|
setup, teardown),
|
|
cmocka_unit_test_setup_teardown(test_sss_ncache_domain_locate_type,
|
|
setup, teardown),
|
|
-
|
|
+#if 0
|
|
/* user */
|
|
cmocka_unit_test_setup_teardown(test_ncache_nocache_user,
|
|
test_ncache_setup,
|
|
@@ -1142,6 +1142,7 @@
|
|
cmocka_unit_test_setup_teardown(test_ncache_both_gid,
|
|
test_ncache_setup,
|
|
test_ncache_teardown),
|
|
+#endif
|
|
};
|
|
|
|
tests_set_cwd();
|