From 95efe2d4849f218fffd232dd6e10011f0f837878 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Sat, 7 Jan 2017 11:47:27 +0200 Subject: [PATCH] test: allow user to choose which gdb to run tests with The variable used for selecting gdb is TEST_GDB, consistent with TEST_CC and TEST_EMACS{,CLIENT}. --- test/T050-new.sh | 2 +- test/T060-count.sh | 2 +- test/T070-insert.sh | 8 ++++---- test/T380-atomicity.sh | 2 +- test/test-lib.sh | 3 ++- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/test/T050-new.sh b/test/T050-new.sh index 2bc799d2..9115de82 100755 --- a/test/T050-new.sh +++ b/test/T050-new.sh @@ -317,7 +317,7 @@ end run EOF -gdb --batch-silent --return-child-result -x notmuch-new-vanish.gdb \ +${TEST_GDB} --batch-silent --return-child-result -x notmuch-new-vanish.gdb \ --args notmuch new 2>OUTPUT 1>/dev/null echo "exit status: $?" >> OUTPUT diff --git a/test/T060-count.sh b/test/T060-count.sh index 69ab591f..d27e1bab 100755 --- a/test/T060-count.sh +++ b/test/T060-count.sh @@ -115,7 +115,7 @@ EOF backup_database test_begin_subtest "error message from query_search_messages" -gdb --batch-silent --return-child-result -x count-files.gdb \ +${TEST_GDB} --batch-silent --return-child-result -x count-files.gdb \ --args notmuch count --output=files '*' 2>OUTPUT 1>/dev/null cat < EXPECTED notmuch count: A Xapian exception occurred diff --git a/test/T070-insert.sh b/test/T070-insert.sh index 57472b91..7e04a23d 100755 --- a/test/T070-insert.sh +++ b/test/T070-insert.sh @@ -206,22 +206,22 @@ gen_insert_msg for code in FILE_NOT_EMAIL READ_ONLY_DATABASE UPGRADE_REQUIRED PATH_ERROR; do test_expect_code 1 "EXIT_FAILURE when add_message returns $code" \ - "gdb --batch-silent --return-child-result \ + "${TEST_GDB} --batch-silent --return-child-result \ -ex 'set args insert < $gen_msg_filename' \ -x index-file-$code.gdb notmuch" test_expect_code 0 "success exit with --keep when add_message returns $code" \ - "gdb --batch-silent --return-child-result \ + "${TEST_GDB} --batch-silent --return-child-result \ -ex 'set args insert --keep < $gen_msg_filename' \ -x index-file-$code.gdb notmuch" done for code in OUT_OF_MEMORY XAPIAN_EXCEPTION ; do test_expect_code 75 "EX_TEMPFAIL when add_message returns $code" \ - "gdb --batch-silent --return-child-result \ + "${TEST_GDB} --batch-silent --return-child-result \ -ex 'set args insert < $gen_msg_filename' \ -x index-file-$code.gdb notmuch" test_expect_code 0 "success exit with --keep when add_message returns $code" \ - "gdb --batch-silent --return-child-result \ + "${TEST_GDB} --batch-silent --return-child-result \ -ex 'set args insert --keep < $gen_msg_filename' \ -x index-file-$code.gdb notmuch" done diff --git a/test/T380-atomicity.sh b/test/T380-atomicity.sh index 845dfde7..c6a9fb98 100755 --- a/test/T380-atomicity.sh +++ b/test/T380-atomicity.sh @@ -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 - gdb -tty /dev/null -batch -x $TEST_DIRECTORY/atomicity.py notmuch 1>gdb.out 2>&1 + ${TEST_GDB} -tty /dev/null -batch -x $TEST_DIRECTORY/atomicity.py notmuch 1>gdb.out 2>&1 # Get the final, golden output notmuch search '*' > expected diff --git a/test/test-lib.sh b/test/test-lib.sh index f55d2c67..6f9468ae 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -80,6 +80,7 @@ if [[ ( -n "$TEST_EMACS" && -z "$TEST_EMACSCLIENT" ) || \ fi TEST_EMACS=${TEST_EMACS:-${EMACS:-emacs}} TEST_EMACSCLIENT=${TEST_EMACSCLIENT:-emacsclient} +TEST_GDB=${TEST_GDB:-gdb} TEST_CC=${TEST_CC:-cc} TEST_CFLAGS=${TEST_CFLAGS:-"-g -O0"} @@ -1379,7 +1380,7 @@ esac test_declare_external_prereq dtach test_declare_external_prereq emacs test_declare_external_prereq ${TEST_EMACSCLIENT} -test_declare_external_prereq gdb +test_declare_external_prereq ${TEST_GDB} test_declare_external_prereq gpg test_declare_external_prereq openssl test_declare_external_prereq gpgsm