aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--notmuch-dump.c2
-rw-r--r--test/Makefile.local2
-rw-r--r--test/atomicity.gdb4
3 files changed, 6 insertions, 2 deletions
diff --git a/notmuch-dump.c b/notmuch-dump.c
index 2849eaba..887a2082 100644
--- 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 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.