diff options
| author | Lukas Slebodnik <lslebodn@redhat.com> | 2015-09-11 13:39:20 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-09-18 13:33:35 +0200 |
| commit | bee2f31ca5d151b7fe35c509fe7eae24ca4f4451 (patch) | |
| tree | 5d61f679b1707a9f7fb27d69e30fccd5b92162e7 | |
| parent | c106bfdf2ee6cfdfb76578b93523d054af2a3a99 (diff) | |
| download | sssd-bee2f31ca5d151b7fe35c509fe7eae24ca4f4451.tar.gz sssd-bee2f31ca5d151b7fe35c509fe7eae24ca4f4451.tar.xz sssd-bee2f31ca5d151b7fe35c509fe7eae24ca4f4451.zip | |
test_ipa_subdomains_server: Use unique dorectory for keytabs
Resolves:
https://fedorahosted.org/sssd/ticket/2694
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/tests/cmocka/test_ipa_subdomains_server.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index ff3434301..3eaf578a8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2519,7 +2519,7 @@ test_ipa_subdom_server_SOURCES = \ $(NULL) test_ipa_subdom_server_CFLAGS = \ $(AM_CFLAGS) \ - -DIPA_TRUST_KEYTAB_DIR=TEST_DIR \ + -DIPA_TRUST_KEYTAB_DIR=TEST_DIR\"/tp_test_ipa_subdom_server-test_ipa_subdomains_server\" \ $(NULL) test_ipa_subdom_server_LDFLAGS = \ -Wl,-wrap,krb5_kt_default \ diff --git a/src/tests/cmocka/test_ipa_subdomains_server.c b/src/tests/cmocka/test_ipa_subdomains_server.c index fc9a73cf6..3c40f04e3 100644 --- a/src/tests/cmocka/test_ipa_subdomains_server.c +++ b/src/tests/cmocka/test_ipa_subdomains_server.c @@ -30,6 +30,8 @@ #include <ifaddrs.h> #include <arpa/inet.h> +#define TESTS_PATH "tp_" BASE_FILE_STEM + #include "providers/ipa/ipa_subdomains.h" #include "providers/ipa/ipa_opts.h" #include "providers/data_provider.h" @@ -45,7 +47,7 @@ #define TEST_AUTHID "host/"HOSTNAME #define KEYTAB_TEST_PRINC TEST_AUTHID"@"DOM_REALM -#define KEYTAB_PATH TEST_DIR"/keytab_test.keytab" +#define KEYTAB_PATH TEST_DIR"/"TESTS_PATH"/keytab_test.keytab" #define SUBDOM_NAME "twoway.subdom.test" #define SUBDOM_REALM "TWOWAY.SUBDOM.TEST" @@ -57,12 +59,11 @@ #define CHILD_FLAT "CHILD" #define CHILD_SID "S-1-2-3-4" -#define TESTS_PATH "tp_" BASE_FILE_STEM #define TEST_CONF_DB "test_ipa_subdom_server.ldb" #define TEST_DOM_NAME "ipa_subdom_server_test" #define TEST_ID_PROVIDER "ipa" -#define ONEWAY_KEYTAB TEST_DIR"/"SUBDOM_REALM".keytab" +#define ONEWAY_KEYTAB TEST_DIR"/"TESTS_PATH"/"SUBDOM_REALM".keytab" #define ONEWAY_PRINC DOM_FLAT"$" #define ONEWAY_AUTHID ONEWAY_PRINC"@"SUBDOM_REALM |