diff options
| -rw-r--r-- | test/.gitignore | 1 | ||||
| -rw-r--r-- | test/Makefile.local | 7 | ||||
| -rwxr-xr-x | test/basic | 2 | ||||
| -rwxr-xr-x | test/symbol-hiding | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/test/.gitignore b/test/.gitignore index 9e97052d..7e30e8d5 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -1,4 +1,5 @@ test-results corpus.mail smtp-dummy +symbol-test tmp.* diff --git a/test/Makefile.local b/test/Makefile.local index 9b3308a1..646779e1 100644 --- a/test/Makefile.local +++ b/test/Makefile.local @@ -11,10 +11,13 @@ smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o) $(dir)/smtp-dummy: $(smtp_dummy_modules) $(call quiet,CC) $^ -o $@ +$(dir)/symbol-test: $(dir)/symbol-test.o + $(call quiet,CC) $^ -o $@ -Llib -lnotmuch -lxapian + .PHONY: test check -test: all $(dir)/smtp-dummy +test: all $(dir)/smtp-dummy $(dir)/symbol-test @${dir}/notmuch-test $(OPTIONS) check: test -CLEAN := $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o +CLEAN := $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o $(dir)/symbol-test $(dir)/symbol-test.o @@ -54,7 +54,7 @@ test_begin_subtest 'Ensure that all available tests will be run by notmuch-test' eval $(sed -n -e '/^TESTS="$/,/^"$/p' $TEST_DIRECTORY/notmuch-test) tests_in_suite=$(for i in $TESTS; do echo $i; done | sort) available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -executable -printf '%f\n' | \ - sed -r -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose)$/d" | \ + sed -r -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test)$/d" | \ sort) test_expect_equal "$tests_in_suite" "$available" diff --git a/test/symbol-hiding b/test/symbol-hiding index d0b31aec..f67b653e 100755 --- a/test/symbol-hiding +++ b/test/symbol-hiding @@ -12,13 +12,12 @@ test_description='exception symbol hiding' . ./test-lib.sh run_test(){ - result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib ./symbol-test 2>&1) + result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib $TEST_DIRECTORY/symbol-test 2>&1) } output="A Xapian exception occurred opening database: Couldn't stat 'fakedb/.notmuch/xapian' caught No chert database found at path \`./nonexistant'" -g++ -o symbol-test -I$TEST_DIRECTORY/../lib $TEST_DIRECTORY/symbol-test.cc -L$TEST_DIRECTORY/../lib -lnotmuch -lxapian mkdir -p fakedb/.notmuch test_expect_success 'running test' run_test test_begin_subtest 'checking output' |