upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '1726-unit-tests-rename-tests-to-something-more-descriptive' into 'master'

Browse source 
Associate unit test data dir with a more specific variable

Closes #1726

See merge request isc-projects/bind9!3624
This commit is contained in:
Michal Nowak 2020-06-04 10:58:55 +00:00
commit 3eabeab0f8
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.tests
View file

@ -3,7 +3,7 @@
AM_CPPFLAGS += \
$(CMOCKA_CFLAGS) \
-DTESTS=\"$(abs_srcdir)\" \
-DTESTS_DIR=\"$(abs_srcdir)\" \
-DNAMED_PLUGINDIR=\"$(libdir)/named\"
LDADD = \

2
lib/dns/tests/dnstest.c
View file

@ -179,7 +179,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);
}

2
lib/irs/tests/resconf_test.c
View file

@ -39,7 +39,7 @@ setup_test(void) {
* 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() */

4
lib/isc/tests/file_test.c
View file

@ -57,7 +57,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);
@ -93,7 +93,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));

2
lib/ns/tests/nstest.c
View file

@ -315,7 +315,7 @@ ns_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);
}