From: "Amadeusz Żołnowski" <aidecoe@aidecoe.name>
To: notmuch@notmuchmail.org
Cc: "Amadeusz Żołnowski" <aidecoe@aidecoe.name>
Subject: [PATCH] Build symbol-test with make instead of hardcoding in symbol-hiding.
Date: Sat, 26 Nov 2011 22:14:20 +0100 [thread overview]
Message-ID: <1322342060-967-1-git-send-email-aidecoe@aidecoe.name> (raw)
In-Reply-To: <1322341843-sup-9963@raeviah>
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 | 7 +++++--
test/basic | 2 +-
test/symbol-hiding | 3 +--
4 files changed, 8 insertions(+), 5 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 9b3308a..646779e 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
diff --git a/test/basic b/test/basic
index f258d1f..4edf831 100755
--- a/test/basic
+++ b/test/basic
@@ -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 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
next prev parent reply other threads:[~2011-11-26 21:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2011-11-27 16:20 ` David Bremner
2011-11-27 18:25 ` Dmitry Kurochkin
-- strict thread matches above, loose matches on Subject: below --
2011-11-25 10:03 [PATCH] Build symbol-test with make a not manually " Amadeusz Żołnowski
2011-11-25 10:09 ` [PATCH] Build symbol-test with make instead of hardcoding " Amadeusz Żołnowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1322342060-967-1-git-send-email-aidecoe@aidecoe.name \
--to=aidecoe@aidecoe.name \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).