Verified Commit 4cd664b8 authored by Michal Nowak's avatar Michal Nowak
Browse files

Associate unit test data dir with a more specific variable

Having 'TESTS', the Automake variable and 'TESTS' the unit test data dir
seems confusing, lets rename the latter to to 'TESTS_DIR'.
parent be69acfb
Pipeline #43552 canceled with stages
in 2 minutes and 31 seconds
......@@ -17,7 +17,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = -I. -Iinclude ${DNS_INCLUDES} ${ISC_INCLUDES} \
@DST_OPENSSL_INC@ ${MAXMINDDB_CFLAGS}
CDEFINES = @CRYPTO@ -DTESTS="\"${top_builddir}/lib/dns/tests/\""
CDEFINES = @CRYPTO@ -DTESTS_DIR="\"${top_builddir}/lib/dns/tests/\""
ISCLIBS = ../../isc/libisc.@A@
ISCDEPLIBS = ../../isc/libisc.@A@
......
......@@ -197,7 +197,7 @@ dns_test_begin(FILE *logfile, bool start_managers) {
* that access test data files must first chdir to the proper
* location.
*/
if (chdir(TESTS) == -1) {
if (chdir(TESTS_DIR) == -1) {
CHECK(ISC_R_FAILURE);
}
......
......@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I. -Iinclude -I../include ${ISC_INCLUDES} ${IRS_INCLUDES}
CDEFINES = -DTESTS="\"${top_builddir}/lib/irs/tests/\""
CDEFINES = -DTESTS_DIR="\"${top_builddir}/lib/irs/tests/\""
CFGLIBS = ../../isccfg/libisccfg.@A@
CFGDEPLIBS = ../../isccfg/libisccfg.@A@
......
......@@ -47,7 +47,7 @@ setup_test() {
* that access test data files must first chdir to the proper
* location.
*/
assert_return_code(chdir(TESTS), 0);
assert_return_code(chdir(TESTS_DIR), 0);
}
/* test irs_resconf_load() */
......
......@@ -16,7 +16,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I. -Iinclude ${ISC_INCLUDES} @ISC_OPENSSL_INC@
CDEFINES = @CRYPTO@ -DTESTS="\"${top_builddir}/lib/isc/tests/\""
CDEFINES = @CRYPTO@ -DTESTS_DIR="\"${top_builddir}/lib/isc/tests/\""
ISCLIBS = ../libisc.@A@ @ISC_OPENSSL_LIBS@
ISCDEPLIBS = ../libisc.@A@
......
......@@ -61,7 +61,7 @@ isc_file_sanitize_test(void **state) {
UNUSED(state);
assert_return_code(chdir(TESTS), 0);
assert_return_code(chdir(TESTS_DIR), 0);
result = isc_file_sanitize("testdata/file", NAME, "test", buf, 1024);
assert_int_equal(result, ISC_R_SUCCESS);
......@@ -97,7 +97,7 @@ isc_file_template_test(void **state) {
UNUSED(state);
assert_return_code(chdir(TESTS), 0);
assert_return_code(chdir(TESTS_DIR), 0);
result = isc_file_template("/absolute/path", "file-XXXXXXXX",
buf, sizeof(buf));
......
......@@ -18,7 +18,7 @@ VERSION=@BIND9_VERSION@
CINCLUDES = -I. -Iinclude \
${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
@DST_OPENSSL_INC@
CDEFINES = @CRYPTO@ -DTESTS="\"${top_builddir}/lib/dns/tests/\""
CDEFINES = @CRYPTO@ -DTESTS_DIR="\"${top_builddir}/lib/dns/tests/\""
ISCLIBS = ../../isc/libisc.@A@
ISCDEPLIBS = ../../isc/libisc.@A@
......
......@@ -20,7 +20,7 @@ VERSION=@BIND9_VERSION@
@BIND9_MAKE_INCLUDES@
CINCLUDES = -I. -Iinclude -I../include ${LWRES_INCLUDES} ${ISC_INCLUDES}
CDEFINES = -DTESTS="\"${top_builddir}/lib/lwres/tests/\""
CDEFINES = -DTESTS_DIR="\"${top_builddir}/lib/lwres/tests/\""
LWRESLIBS = ../liblwres.@A@
LWRESDEPLIBS = ../liblwres.@A@
......
......@@ -36,7 +36,7 @@ setup_test() {
* that access test data files must first chdir to the proper
* location.
*/
assert_int_not_equal(chdir(TESTS), -1);
assert_int_not_equal(chdir(TESTS_DIR), -1);
}
/* lwres_conf_parse link-local nameserver */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment