util: Fix two corner-cases in boolean term quoting function

[notmuch] / test / Makefile.local

diff --git a/test/Makefile.local b/test/Makefile.local
index 2ec659560626e1a16e224d85e1b58cb318033fe9..36b1c1b71de08f598f4b9e314170a3e186c14ec4 100644 (file)
--- a/test/Makefile.local
+++ b/test/Makefile.local
@@ -2,6 +2,8 @@
 
 dir := test
 
+# save against changes in $(dir)
+test_src_dir := $(dir)
 extra_cflags += -I.
 
 smtp_dummy_srcs =              \
@@ -27,7 +29,7 @@ $(dir)/random-corpus: $(random_corpus_deps)
 $(dir)/smtp-dummy: $(smtp_dummy_modules)
        $(call quiet,CC) $^ -o $@
 
-$(dir)/symbol-test: $(dir)/symbol-test.o
+$(dir)/symbol-test: $(dir)/symbol-test.o lib/$(LINKER_NAME)
        $(call quiet,CXX) $^ -o $@ -Llib -lnotmuch $(XAPIAN_LDFLAGS)
 
 $(dir)/parse-time: $(dir)/parse-time.o parse-time-string/parse-time-string.o
@@ -45,16 +47,11 @@ TEST_BINARIES=$(dir)/arg-test \
 test-binaries: $(TEST_BINARIES)
 
 test:  all test-binaries
-       @${dir}/notmuch-test $(OPTIONS)
+       @${test_src_dir}/notmuch-test $(OPTIONS)
 
 check: test
 
 SRCS := $(SRCS) $(smtp_dummy_srcs)
-CLEAN := $(CLEAN) $(dir)/smtp-dummy $(dir)/smtp-dummy.o \
-        $(dir)/symbol-test $(dir)/symbol-test.o \
-        $(dir)/arg-test $(dir)/arg-test.o \
-        $(dir)/hex-xcode $(dir)/hex-xcode.o \
+CLEAN += $(TEST_BINARIES) $(addsuffix .o,$(TEST_BINARIES)) \
         $(dir)/database-test.o \
-        $(dir)/random-corpus $(dir)/random-corpus.o \
-        $(dir)/parse-time $(dir)/parse-time.o \
         $(dir)/corpus.mail $(dir)/test-results $(dir)/tmp.*