debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-23 01:44:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Build symbol-test with make instead of hardcoding in symbol-hiding.

Browse source 
If symbol-test is built in symbol-hiding with hardcoded g++ invokation,
it's not so easy to pass $(srcdir) which is required to find notmuch.h
when srcdir and builddir are separate directories.
This commit is contained in:
Amadeusz Żołnowski 2011-11-26 22:14:20 +01:00 committed by David Bremner
parent ac8576de63
commit 945196d79b
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
test/.gitignore vendored
View file

@ -1,4 +1,5 @@
test-results test-results
corpus.mail corpus.mail
smtp-dummy smtp-dummy
symbol-test
tmp.* tmp.*

7
test/Makefile.local
View file

@ -11,10 +11,13 @@ smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o)
$(dir)/smtp-dummy: $(smtp_dummy_modules) $(dir)/smtp-dummy: $(smtp_dummy_modules)
$(call quiet,CC) $^ -o $@ $(call quiet,CC) $^ -o $@
$(dir)/symbol-test: $(dir)/symbol-test.o
$(call quiet,CC) $^ -o $@ -Llib -lnotmuch -lxapian
.PHONY: test check .PHONY: test check
test: all $(dir)/smtp-dummy test: all $(dir)/smtp-dummy $(dir)/symbol-test
@${dir}/notmuch-test $(OPTIONS) @${dir}/notmuch-test $(OPTIONS)
check: test 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

2
test/basic
View file

@ -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) eval $(sed -n -e '/^TESTS="$/,/^"$/p' $TEST_DIRECTORY/notmuch-test)
tests_in_suite=$(for i in $TESTS; do echo $i; done | sort) tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)
available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -executable -printf '%f\n' | \ 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) sort)
test_expect_equal "$tests_in_suite" "$available" test_expect_equal "$tests_in_suite" "$available"

3
test/symbol-hiding
View file

@ -12,13 +12,12 @@ test_description='exception symbol hiding'
. ./test-lib.sh . ./test-lib.sh
run_test(){ 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' output="A Xapian exception occurred opening database: Couldn't stat 'fakedb/.notmuch/xapian'
caught No chert database found at path \`./nonexistant'" 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 mkdir -p fakedb/.notmuch
test_expect_success 'running test' run_test test_expect_success 'running test' run_test
test_begin_subtest 'checking output' test_begin_subtest 'checking output'