X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=test%2Ftest-lib.sh;h=b89da572e439f57a9c813659b1c7a3c3d8522684;hb=93e699e5c86bb93b2992f4ab3a15680824b7ee2d;hp=42a45f158105f8c4885ff4ebed5512297d7e118a;hpb=92f318abe40c7e0ef449559728b3a6d160bd9325;p=notmuch

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 42a45f15..b89da572 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -117,6 +117,10 @@ add_gnupg_home ()
 	echo debug-quick-random >> "$GNUPGHOME"/gpg.conf
     fi
     echo no-emit-version >> "$GNUPGHOME"/gpg.conf
+
+    # Change this if we ship a new test key
+    FINGERPRINT="5AEAB11F5E33DCE875DDB75B6D92612D94E46381"
+    SELF_USERID="Notmuch Test Suite <test_suite@notmuchmail.org> (INSECURE!)"
 }
 
 # Each test should start with something like this, after copyright notices:
@@ -347,7 +351,7 @@ emacs_deliver_message ()
 # before sending, which is useful to doing things like attaching files
 # to the message and encrypting/signing.
 #
-# If any GNU-style long-arguments (like --quiet or --try-decrypt=true) are
+# If any GNU-style long-arguments (like --quiet or --decrypt=true) are
 # at the head of the argument list, they are sent directly to "notmuch
 # new" after message delivery
 emacs_fcc_message ()
@@ -621,6 +625,11 @@ notmuch_config_sanitize ()
     notmuch_dir_sanitize | notmuch_built_with_sanitize
 }
 
+notmuch_show_part ()
+{
+    awk '/^\014part}/{ f=0 }; { if (f) { print $0 } } /^\014part{ ID: '"$1"'/{ f=1 }'
+}
+
 # End of notmuch helper functions
 
 # Use test_set_prereq to tell that a particular prerequisite is available.
@@ -1003,7 +1012,7 @@ test_python() {
 }
 
 test_ruby() {
-    MAIL_DIR=$MAIL_DIR ruby -I $NOTMUCH_SRCDIR/bindings/ruby> OUTPUT
+    MAIL_DIR=$MAIL_DIR $NOTMUCH_RUBY -I $NOTMUCH_SRCDIR/bindings/ruby> OUTPUT
 }
 
 test_C () {
@@ -1066,23 +1075,10 @@ test_init_ () {
 }
 
 
-. "$NOTMUCH_SRCDIR/test/test-lib-common.sh" || exit 1
+# Where to run the tests
+TEST_DIRECTORY=$NOTMUCH_BUILDDIR/test
 
-if [ "${NOTMUCH_GMIME_MAJOR}" = 3 ]; then
-    test_subtest_broken_gmime_3 () {
-	test_subtest_known_broken
-    }
-    test_subtest_broken_gmime_2 () {
-	true
-    }
-else
-    test_subtest_broken_gmime_3 () {
-	true
-    }
-    test_subtest_broken_gmime_2 () {
-	test_subtest_known_broken
-    }
-fi
+. "$NOTMUCH_SRCDIR/test/test-lib-common.sh" || exit 1
 
 emacs_generate_script