unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
* [PATCH 1/2] Build symbol-test with make instead of hardcoding in symbol-hiding.
@ 2011-11-25 10:54 Amadeusz Żołnowski
  2011-11-25 10:54 ` [PATCH 2/2] Fixed warnings for test/symbol-test.cc Amadeusz Żołnowski
                   ` (2 more replies)
  0 siblings, 3 replies; 13+ messages in thread
From: Amadeusz Żołnowski @ 2011-11-25 10:54 UTC (permalink / raw)
  To: notmuch; +Cc: Amadeusz Żołnowski

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.
---
 test/.gitignore     |    1 +
 test/Makefile.local |    5 ++++-
 test/basic          |    2 +-
 test/symbol-hiding  |    3 +--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/test/.gitignore b/test/.gitignore
index 9e97052..7e30e8d 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 8eb0433..a672fd3 100644
--- a/test/Makefile.local
+++ b/test/Makefile.local
@@ -11,8 +11,11 @@ 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
diff --git a/test/basic b/test/basic
index 38db2ba..5463bf8 100755
--- a/test/basic
+++ b/test/basic
@@ -56,7 +56,7 @@ tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)
 available=$(ls -1 $TEST_DIRECTORY/ | \
     sed -r -e "/^(aggregate-results.sh|Makefile|Makefile.local|notmuch-test)/d" \
 	   -e "/^(README|test-lib.sh|test-lib.el|test-results|tmp.*|valgrind|corpus*)/d" \
-	   -e "/^(emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|symbol-test.cc)/d" \
+	   -e "/^(emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|symbol-test.cc|symbol-test|symbol-test.o)/d" \
 	   -e "/^(test.expected-output|.*~)/d" \
 	   -e "/^(gnupg-secret-key.asc)/d" \
 	   -e "/^(gnupg-secret-key.NOTE)/d" \
diff --git a/test/symbol-hiding b/test/symbol-hiding
index d0b31ae..f67b653 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'
-- 
1.7.8.rc3

^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2011-11-27 18:25 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-25 10:54 [PATCH 1/2] Build symbol-test with make instead of hardcoding in symbol-hiding Amadeusz Żołnowski
2011-11-25 10:54 ` [PATCH 2/2] Fixed warnings for test/symbol-test.cc Amadeusz Żołnowski
2011-11-25 13:07   ` David Bremner
2011-11-25 15:34     ` [PATCH 2/3] Fix " Amadeusz Żołnowski
2011-11-25 15:34       ` [PATCH 3/3] Whitespaces cleanup Amadeusz Żołnowski
2011-11-25 13:04 ` [PATCH 1/2] Build symbol-test with make instead of hardcoding in symbol-hiding David Bremner
2011-11-25 15:12   ` Amadeusz Żołnowski
2011-11-26 19:12 ` David Bremner
2011-11-26 20:51   ` [PATCH] " Amadeusz Żołnowski
2011-11-26 21:13     ` Amadeusz Żołnowski
2011-11-26 21:14       ` Amadeusz Żołnowski
2011-11-27 16:20         ` David Bremner
2011-11-27 18:25         ` Dmitry Kurochkin

Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).