[PATCH 1/2] Build symbol-test with make instead of hardcoding in symbol-hiding.

diff --git a/7b/8372903fc4d090a76785d8ba94007a44300e35 b/7b/8372903fc4d090a76785d8ba94007a44300e35
new file mode 100644 (file)
index 0000000..4ddd742
--- /dev/null
+++ b/7b/8372903fc4d090a76785d8ba94007a44300e35
@@ -0,0 +1,123 @@
+Return-Path: <aidecoe@aidecoe.name>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id A3A52431FD0\r
+       for <notmuch@notmuchmail.org>; Fri, 25 Nov 2011 02:55:08 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 48oHSdduCzKG for <notmuch@notmuchmail.org>;\r
+       Fri, 25 Nov 2011 02:55:08 -0800 (PST)\r
+Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com\r
+       [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id DCE33431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 25 Nov 2011 02:55:07 -0800 (PST)\r
+Received: by bkaq10 with SMTP id q10so4563796bka.26\r
+       for <notmuch@notmuchmail.org>; Fri, 25 Nov 2011 02:55:06 -0800 (PST)\r
+Received: by 10.204.156.208 with SMTP id y16mr33403421bkw.72.1322218506424;\r
+       Fri, 25 Nov 2011 02:55:06 -0800 (PST)\r
+Received: from localhost (abtw56.neoplus.adsl.tpnet.pl. [83.8.168.56])\r
+       by mx.google.com with ESMTPS id x14sm18440443bkf.10.2011.11.25.02.55.03\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Fri, 25 Nov 2011 02:55:05 -0800 (PST)\r
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] Build symbol-test with make instead of hardcoding in\r
+       symbol-hiding.\r
+Date: Fri, 25 Nov 2011 11:54:51 +0100\r
+Message-Id: <1322218492-8300-1-git-send-email-aidecoe@aidecoe.name>\r
+X-Mailer: git-send-email 1.7.8.rc3\r
+Cc: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 25 Nov 2011 10:55:08 -0000\r
+\r
+If symbol-test is built in symbol-hiding with hardcoded g++ invokation,\r
+it's not so easy to pass $(srcdir) which is required to find notmuch.h\r
+when srcdir and builddir are separate directories.\r
+---\r
+ test/.gitignore     |    1 +\r
+ test/Makefile.local |    5 ++++-\r
+ test/basic          |    2 +-\r
+ test/symbol-hiding  |    3 +--\r
+ 4 files changed, 7 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/test/.gitignore b/test/.gitignore\r
+index 9e97052..7e30e8d 100644\r
+--- a/test/.gitignore\r
++++ b/test/.gitignore\r
+@@ -1,4 +1,5 @@\r
+ test-results\r
+ corpus.mail\r
+ smtp-dummy\r
++symbol-test\r
+ tmp.*\r
+diff --git a/test/Makefile.local b/test/Makefile.local\r
+index 8eb0433..a672fd3 100644\r
+--- a/test/Makefile.local\r
++++ b/test/Makefile.local\r
+@@ -11,8 +11,11 @@ smtp_dummy_modules = $(smtp_dummy_srcs:.c=.o)\r
+ $(dir)/smtp-dummy: $(smtp_dummy_modules)\r
+       $(call quiet,CC) $^ -o $@\r
+ \r
++$(dir)/symbol-test: $(dir)/symbol-test.o\r
++      $(call quiet,CC) $^ -o $@ -Llib -lnotmuch -lxapian\r
++\r
+ .PHONY: test check\r
+-test: all $(dir)/smtp-dummy\r
++test: all $(dir)/smtp-dummy $(dir)/symbol-test\r
+       @${dir}/notmuch-test $(OPTIONS)\r
+ \r
+ check: test\r
+diff --git a/test/basic b/test/basic\r
+index 38db2ba..5463bf8 100755\r
+--- a/test/basic\r
++++ b/test/basic\r
+@@ -56,7 +56,7 @@ tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)\r
+ available=$(ls -1 $TEST_DIRECTORY/ | \\r
+     sed -r -e "/^(aggregate-results.sh|Makefile|Makefile.local|notmuch-test)/d" \\r
+          -e "/^(README|test-lib.sh|test-lib.el|test-results|tmp.*|valgrind|corpus*)/d" \\r
+-         -e "/^(emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|symbol-test.cc)/d" \\r
++         -e "/^(emacs.expected-output|smtp-dummy|smtp-dummy.c|test-verbose|symbol-test.cc|symbol-test|symbol-test.o)/d" \\r
+          -e "/^(test.expected-output|.*~)/d" \\r
+          -e "/^(gnupg-secret-key.asc)/d" \\r
+          -e "/^(gnupg-secret-key.NOTE)/d" \\r
+diff --git a/test/symbol-hiding b/test/symbol-hiding\r
+index d0b31ae..f67b653 100755\r
+--- a/test/symbol-hiding\r
++++ b/test/symbol-hiding\r
+@@ -12,13 +12,12 @@ test_description='exception symbol hiding'\r
+ . ./test-lib.sh\r
+ \r
+ run_test(){\r
+-    result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib ./symbol-test 2>&1)\r
++    result=$(LD_LIBRARY_PATH=$TEST_DIRECTORY/../lib $TEST_DIRECTORY/symbol-test 2>&1)\r
+ }\r
+ \r
+ output="A Xapian exception occurred opening database: Couldn't stat 'fakedb/.notmuch/xapian'\r
+ caught No chert database found at path \`./nonexistant'"\r
+ \r
+-g++ -o symbol-test -I$TEST_DIRECTORY/../lib $TEST_DIRECTORY/symbol-test.cc -L$TEST_DIRECTORY/../lib -lnotmuch -lxapian\r
+ mkdir -p fakedb/.notmuch\r
+ test_expect_success 'running test' run_test\r
+ test_begin_subtest 'checking output'\r
+-- \r
+1.7.8.rc3\r
+\r