Merge branch 'release'

bugfix release being built up on release.

diff --git a/notmuch-dump.c b/notmuch-dump.c
index 2849eabaadb9b292b0eab8e4dab6c10d4b26398d..887a20822d828ef6dab98f58f156e37bebefdf06 100644 (file)
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -169,7 +169,7 @@ notmuch_database_dump (notmuch_database_t *notmuch,
     }
 
     if (output_file_name) {
-       ret = fdatasync (outfd);
+       ret = fsync (outfd);
        if (ret) {
            fprintf (stderr, "Error syncing %s to disk: %s\n",
                     name_for_error, strerror (errno));

diff --git a/test/Makefile.local b/test/Makefile.local
index 987441f04f1d689758e6825272d8b9c9210a2841..d622eafee7865588ef4a0112225aebed8fe22bd0 100644 (file)
--- 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 fd675257d2aca77658bd96ecbb80dfa407203cbc..15adb16cb226b18aca57106f3c7ae060fdc29af1 100644 (file)
--- 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.