aboutsummaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorGravatar David Bremner <david@tethera.net>2014-05-18 06:37:48 +0900
committerGravatar David Bremner <david@tethera.net>2014-05-18 06:37:48 +0900
commitc67587f003db32a60aca93fc12f7e82204ee55f6 (patch)
treed7f56b893907624b13fa38c5550d5787a85712b6 /test
parent7d81d700426a76a1ccec107ea2c95d8c47d31465 (diff)
parenta33ec9ce40ff6304d620d391593357f22dcebbf0 (diff)
Merge branch 'release'
bugfix release being built up on release.
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.local2
-rw-r--r--test/atomicity.gdb4
2 files changed, 5 insertions, 1 deletions
diff --git a/test/Makefile.local b/test/Makefile.local
index 987441f0..d622eafe 100644
--- a/test/Makefile.local
+++ b/test/Makefile.local
@@ -16,7 +16,7 @@ $(dir)/arg-test: $(dir)/arg-test.o command-line-arguments.o util/libutil.a
$(call quiet,CC) $^ -o $@
$(dir)/hex-xcode: $(dir)/hex-xcode.o command-line-arguments.o util/libutil.a
- $(call quiet,CC) $^ -o $@ -ltalloc
+ $(call quiet,CC) $^ $(TALLOC_LDFLAGS) -o $@
random_corpus_deps = $(dir)/random-corpus.o $(dir)/database-test.o \
notmuch-config.o command-line-arguments.o \
diff --git a/test/atomicity.gdb b/test/atomicity.gdb
index fd675257..15adb16c 100644
--- a/test/atomicity.gdb
+++ b/test/atomicity.gdb
@@ -18,6 +18,10 @@ shell echo 0 > outcount
shell touch inodes
+# work around apparent issue with lazy library loading on some
+# platforms
+set breakpoint pending on
+
break rename
commands
# As an optimization, only consider snapshots after a Xapian commit.