X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=test%2FT380-atomicity.sh;h=0f9e6d2e2bc4169127304d75669adabf2f557e2f;hb=e663231681b129befadd9f66cb064c104149fb16;hp=17a3e478aecad546e6a8ffee0949ef14c7db5a2e;hpb=a863de1e43ee34f6f5794a2759fdceb287e851aa;p=notmuch

diff --git a/test/T380-atomicity.sh b/test/T380-atomicity.sh
index 17a3e478..0f9e6d2e 100755
--- a/test/T380-atomicity.sh
+++ b/test/T380-atomicity.sh
@@ -64,15 +64,15 @@ if test_require_external_prereq gdb; then
     # -tty /dev/null works around a conflict between the 'timeout' wrapper
     # and gdb's attempt to control the TTY.
     export MAIL_DIR
-    ${TEST_GDB} -tty /dev/null -batch -x $TEST_DIRECTORY/atomicity.py notmuch 1>gdb.out 2>&1
+    ${TEST_GDB} -tty /dev/null -batch -x $NOTMUCH_SRCDIR/test/atomicity.py notmuch 1>gdb.out 2>&1
 
     # Get the final, golden output
-    notmuch search '*' > expected
+    notmuch search '*' 2>/dev/null > expected
 
     # Check output against golden output
     outcount=$(cat outcount)
-    echo -n > searchall
-    echo -n > expectall
+    : > searchall
+    : > expectall
     for ((i = 0; i < $outcount; i++)); do
 	if ! cmp -s search.$i expected; then
 	    # Find the range of interruptions that match this output