X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=test%2FT380-atomicity.sh;h=45de22284cb83af03294390bb4d2c52aab20810f;hp=c6a9fb980bf0d4678a444939f5bb97ddd957747a;hb=1c390652455356c9acfea0eb982c688e2f09e47a;hpb=e0e8586fc72763571f9eafeb831c7bc79a15273d diff --git a/test/T380-atomicity.sh b/test/T380-atomicity.sh index c6a9fb98..45de2228 100755 --- a/test/T380-atomicity.sh +++ b/test/T380-atomicity.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash test_description='atomicity' -. ./test-lib.sh || exit 1 +. $(dirname "$0")/test-lib.sh || exit 1 # This script tests the effects of killing and restarting "notmuch # new" at arbitrary points. If notmuch new is properly atomic, the @@ -64,7 +64,7 @@ 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 @@ -95,6 +95,7 @@ fi test_begin_subtest '"notmuch new" is idempotent under arbitrary aborts' test_expect_equal_file searchall expectall -test_expect_success "detected $outcount>10 abort points" "test $outcount -gt 10" +test_begin_subtest "detected $outcount>10 abort points" +test_expect_success "test $outcount -gt 10" test_done