From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 0C537431FD0 for ; Fri, 25 Nov 2011 02:09:42 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -0.7 X-Spam-Level: X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XAj6ay55ig2m for ; Fri, 25 Nov 2011 02:09:41 -0800 (PST) Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 5280F431FB6 for ; Fri, 25 Nov 2011 02:09:41 -0800 (PST) Received: by bkaq10 with SMTP id q10so4504822bka.26 for ; Fri, 25 Nov 2011 02:09:40 -0800 (PST) Received: by 10.204.130.90 with SMTP id r26mr33785774bks.46.1322215779221; Fri, 25 Nov 2011 02:09:39 -0800 (PST) Received: from localhost (abtw56.neoplus.adsl.tpnet.pl. [83.8.168.56]) by mx.google.com with ESMTPS id jf4sm12751825bkc.5.2011.11.25.02.09.37 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 25 Nov 2011 02:09:38 -0800 (PST) From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= To: notmuch@notmuchmail.org Subject: [PATCH] Build symbol-test with make instead of hardcoding in symbol-hiding. Date: Fri, 25 Nov 2011 11:09:28 +0100 Message-Id: <1322215768-4883-1-git-send-email-aidecoe@aidecoe.name> X-Mailer: git-send-email 1.7.8.rc3 In-Reply-To: <1322215147-sup-1990@ittemni> References: <1322215147-sup-1990@ittemni> Cc: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Nov 2011 10:09:42 -0000 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. Fixed warnings in symbol-test.cc, btw. --- test/.gitignore | 1 + test/Makefile.local | 5 ++++- test/basic | 2 +- test/symbol-hiding | 3 +-- test/symbol-test.cc | 9 ++++----- 5 files changed, 11 insertions(+), 9 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' diff --git a/test/symbol-test.cc b/test/symbol-test.cc index 1de06ea..bfbe38f 100644 --- a/test/symbol-test.cc +++ b/test/symbol-test.cc @@ -1,14 +1,13 @@ #include #include #include -main (int argc, char **argv){ +int main (){ - notmuch_database_t *notmuch - = notmuch_database_open ("fakedb", - NOTMUCH_DATABASE_MODE_READ_ONLY); + //notmuch_database_t *notmuch = + notmuch_database_open ("fakedb", NOTMUCH_DATABASE_MODE_READ_ONLY); try{ - (void)new Xapian::WritableDatabase ("./nonexistant", Xapian::DB_OPEN); + (void)new Xapian::WritableDatabase ("./nonexistant", Xapian::DB_OPEN); } catch (const Xapian::Error &error) { printf("caught %s\n",error.get_msg().c_str()); return 0; -- 1.7.8.rc3