All test files, except for the recently added Emacs tests, do not have ".sh" extension. So remove it from the new test files for consistency. --- test/emacs-address-cleaning | 18 ++++++++++++++++++ test/emacs-address-cleaning.sh | 18 ------------------ test/emacs-test-functions | 9 +++++++++ test/emacs-test-functions.sh | 9 --------- test/notmuch-test | 4 ++-- 5 files changed, 29 insertions(+), 29 deletions(-) create mode 100755 test/emacs-address-cleaning delete mode 100755 test/emacs-address-cleaning.sh create mode 100755 test/emacs-test-functions delete mode 100755 test/emacs-test-functions.sh diff --git a/test/emacs-address-cleaning b/test/emacs-address-cleaning new file mode 100755 index 0000000..51018fe --- /dev/null +++ b/test/emacs-address-cleaning @@ -0,0 +1,18 @@ +#!/usr/bin/env bash + +test_description="emacs address cleaning" +. test-lib.sh + +test_begin_subtest "notmuch-test-address-clean part 1" +test_emacs_expect_t \ + '(load "emacs-address-cleaning.el") (notmuch-test-address-cleaning-1)' + +test_begin_subtest "notmuch-test-address-clean part 2" +test_emacs_expect_t \ + '(load "emacs-address-cleaning.el") (notmuch-test-address-cleaning-2)' + +test_begin_subtest "notmuch-test-address-clean part 3" +test_emacs_expect_t \ + '(load "emacs-address-cleaning.el") (notmuch-test-address-cleaning-3)' + +test_done diff --git a/test/emacs-address-cleaning.sh b/test/emacs-address-cleaning.sh deleted file mode 100755 index 51018fe..0000000 --- a/test/emacs-address-cleaning.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -test_description="emacs address cleaning" -. test-lib.sh - -test_begin_subtest "notmuch-test-address-clean part 1" -test_emacs_expect_t \ - '(load "emacs-address-cleaning.el") (notmuch-test-address-cleaning-1)' - -test_begin_subtest "notmuch-test-address-clean part 2" -test_emacs_expect_t \ - '(load "emacs-address-cleaning.el") (notmuch-test-address-cleaning-2)' - -test_begin_subtest "notmuch-test-address-clean part 3" -test_emacs_expect_t \ - '(load "emacs-address-cleaning.el") (notmuch-test-address-cleaning-3)' - -test_done diff --git a/test/emacs-test-functions b/test/emacs-test-functions new file mode 100755 index 0000000..0e1f9fc --- /dev/null +++ b/test/emacs-test-functions @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +test_description="emacs test function sanity" +. test-lib.sh + +test_begin_subtest "emacs test function sanity" +test_emacs_expect_t 't' + +test_done diff --git a/test/emacs-test-functions.sh b/test/emacs-test-functions.sh deleted file mode 100755 index 0e1f9fc..0000000 --- a/test/emacs-test-functions.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash - -test_description="emacs test function sanity" -. test-lib.sh - -test_begin_subtest "emacs test function sanity" -test_emacs_expect_t 't' - -test_done diff --git a/test/notmuch-test b/test/notmuch-test index 3f1740c..ced6b47 100755 --- a/test/notmuch-test +++ b/test/notmuch-test @@ -52,8 +52,8 @@ TESTS=" python hooks argument-parsing - emacs-test-functions.sh - emacs-address-cleaning.sh + emacs-test-functions + emacs-address-cleaning " TESTS=${NOTMUCH_TESTS:=$TESTS} -- 1.7.8.3