test: clean up some extra whitespace.

The extra space is mainly just untidy.

diff --git a/test/T030-config.sh b/test/T030-config.sh
index 883541d500798188714009b2ce703fe14450882f..32efa945a832908ebd5bc374531e8d1101076e53 100755 (executable)
--- a/test/T030-config.sh
+++ b/test/T030-config.sh
@@ -76,7 +76,7 @@ test_expect_equal "$(notmuch --config:alt-config config get user.name)" \
     "Another Name"
 
 test_begin_subtest "Top level --config<space>FILE option"
-test_expect_equal "$(notmuch --config  alt-config config get user.name)" \
+test_expect_equal "$(notmuch --config alt-config config get user.name)" \
     "Another Name"
 
 test_begin_subtest "Top level --config=FILE option changed the right file"

diff --git a/test/T050-new.sh b/test/T050-new.sh
index 882939fabc4264e73b946713d20a37eb9a743b65..76bda9592a453580a1ef88f7ab1f989b49cb50ea 100755 (executable)
--- a/test/T050-new.sh
+++ b/test/T050-new.sh
@@ -341,9 +341,9 @@ notmuch config set new.tags $OLDCONFIG
 
 
 test_begin_subtest "Xapian exception: read only files"
-chmod u-w  ${MAIL_DIR}/.notmuch/xapian/*.*
+chmod u-w ${MAIL_DIR}/.notmuch/xapian/*.*
 output=$(NOTMUCH_NEW --debug 2>&1 | sed 's/: .*$//' )
-chmod u+w  ${MAIL_DIR}/.notmuch/xapian/*.*
+chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.*
 test_expect_equal "$output" "A Xapian exception occurred opening database"
 
 
@@ -385,8 +385,8 @@ test_begin_subtest "reference loop does not crash"
 test_expect_code 0 "notmuch show --format=json id:mid-loop-12@example.org id:mid-loop-21@example.org > OUTPUT"
 
 test_begin_subtest "reference loop ordered by date"
-threadid=$(notmuch search --output=threads  id:mid-loop-12@example.org)
-notmuch show --format=mbox $threadid | grep '^Date'  > OUTPUT
+threadid=$(notmuch search --output=threads id:mid-loop-12@example.org)
+notmuch show --format=mbox $threadid | grep '^Date' > OUTPUT
 cat <<EOF > EXPECTED
 Date: Thu, 16 Jun 2016 22:14:41 -0400
 Date: Fri, 17 Jun 2016 22:14:41 -0400

diff --git a/test/T070-insert.sh b/test/T070-insert.sh
index 7341810ca1e0bde2c8502b8e222be0d1cbe00608..b37a9b672bbad63bc34751f14c7363a6e3f5650d 100755 (executable)
--- a/test/T070-insert.sh
+++ b/test/T070-insert.sh
@@ -247,7 +247,7 @@ notmuch config set new.tags $OLDCONFIG
 
 # DUPLICATE_MESSAGE_ID is not tested here, because it should actually pass.
 # pregenerate all of the test shims
-for code in  FILE_NOT_EMAIL READ_ONLY_DATABASE UPGRADE_REQUIRED PATH_ERROR OUT_OF_MEMORY XAPIAN_EXCEPTION; do
+for code in FILE_NOT_EMAIL READ_ONLY_DATABASE UPGRADE_REQUIRED PATH_ERROR OUT_OF_MEMORY XAPIAN_EXCEPTION; do
     make_shim shim-$code <<EOF
 #include <notmuch.h>
 #include <stdio.h>
@@ -264,7 +264,7 @@ done
 
 gen_insert_msg
 
-for code in  FILE_NOT_EMAIL READ_ONLY_DATABASE UPGRADE_REQUIRED PATH_ERROR; do
+for code in FILE_NOT_EMAIL READ_ONLY_DATABASE UPGRADE_REQUIRED PATH_ERROR; do
     test_begin_subtest "EXIT_FAILURE when index_file returns $code"
     test_expect_code 1 "notmuch_with_shim shim-$code insert < \"$gen_msg_filename\""
 

diff --git a/test/T140-excludes.sh b/test/T140-excludes.sh
index 0cacc41d9d573f6f98abfc43df18e819a2c7eff2..acab5381b94334bed54f1453eaf61a1e54807eba 100755 (executable)
--- a/test/T140-excludes.sh
+++ b/test/T140-excludes.sh
@@ -389,7 +389,7 @@ Subject: No messages excluded: single match: reply 4
 Subject: No messages excluded: single match: reply 5"
 
 test_begin_subtest "Show, exclude=false"
-output=$(notmuch show --exclude=false tag:test | notmuch_show_sanitize_all  | egrep "Subject:|message{")
+output=$(notmuch show --exclude=false tag:test | notmuch_show_sanitize_all | egrep "Subject:|message{")
 test_expect_equal "$output" "\fmessage{ id:XXXXX depth:0 match:1 excluded:1 filename:XXXXX
 Subject: All messages excluded: single match: reply 2
 \fmessage{ id:XXXXX depth:0 match:1 excluded:1 filename:XXXXX

diff --git a/test/T150-tagging.sh b/test/T150-tagging.sh
index 2f0b3531412db146e500eff1ea43235ab53284d2..c292b24e2490f6ab8b19536c6815b49c6b70a812 100755 (executable)
--- a/test/T150-tagging.sh
+++ b/test/T150-tagging.sh
@@ -90,7 +90,7 @@ thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; One (inbox tag5 unread)
 thread:XXX   2001-01-05 [1/1] Notmuch Test Suite; Two (inbox tag4 tag5 unread)"
 
 # generate a common input file for the next several tests.
-cat > batch.in  <<EOF
+cat > batch.in <<EOF
 # %40 is an @ in tag
 +%40 -tag5 +tag6 -- One
 +tag1 -tag1 -tag4 +tag4 -- Two
@@ -305,9 +305,9 @@ test_begin_subtest "Tag name beginning with -"
 test_expect_code 1 'notmuch tag +- One'
 
 test_begin_subtest "Xapian exception: read only files"
-chmod u-w  ${MAIL_DIR}/.notmuch/xapian/*.*
+chmod u-w ${MAIL_DIR}/.notmuch/xapian/*.*
 output=$(notmuch tag +something '*' 2>&1 | sed 's/: .*$//' )
-chmod u+w  ${MAIL_DIR}/.notmuch/xapian/*.*
+chmod u+w ${MAIL_DIR}/.notmuch/xapian/*.*
 test_expect_equal "$output" "A Xapian exception occurred opening database"
 
 test_done

diff --git a/test/T210-raw.sh b/test/T210-raw.sh
index 9a8b990c1c3fb4d923b5414a65198986a5412759..e1d50bf90a0a15881d1a7712b1fad813a13009ee 100755 (executable)
--- a/test/T210-raw.sh
+++ b/test/T210-raw.sh
@@ -61,7 +61,7 @@ for pow in {10..20}; do
     notmuch show --format=raw subject:$size > OUTPUT
     test_expect_equal_file mail/size-$size OUTPUT
     test_begin_subtest "return value, message of size $size"
-    test_expect_success  "notmuch show --format=raw subject:$size > /dev/null"
+    test_expect_success "notmuch show --format=raw subject:$size > /dev/null"
 done
 
 test_done

diff --git a/test/T230-reply-to-sender.sh b/test/T230-reply-to-sender.sh
index bbeaa2b9c875fae21440af832e649264b9a9c60e..38fbe96ad5ec5ef9a1fc9f96ffd3fa5acaab009f 100755 (executable)
--- a/test/T230-reply-to-sender.sh
+++ b/test/T230-reply-to-sender.sh
@@ -43,7 +43,7 @@ add_message '[from]="Sender <sender@example.com>"' \
             '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
             '[body]="Multiple recipients"'
 
-output=$(notmuch reply  --reply-to=sender  id:${gen_msg_id})
+output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>
@@ -60,7 +60,7 @@ add_message '[from]="Notmuch Test Suite <test_suite@notmuchmail.org>"' \
             '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
             '[body]="From Us, Multiple TO recipients"'
 
-output=$(notmuch reply  --reply-to=sender  id:${gen_msg_id})
+output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Recipient <recipient@example.com>, Someone Else <someone@example.com>
@@ -78,7 +78,7 @@ add_message '[from]="Sender <sender@example.com>"' \
             '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
             '[body]="reply with CC"'
 
-output=$(notmuch reply  --reply-to=sender id:${gen_msg_id})
+output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>
@@ -96,7 +96,7 @@ add_message '[from]="Notmuch Test Suite <test_suite@notmuchmail.org>"' \
             '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
             '[body]="reply with CC"'
 
-output=$(notmuch reply  --reply-to=sender id:${gen_msg_id})
+output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Recipient <recipient@example.com>
@@ -113,7 +113,7 @@ add_message '[from]="Notmuch Test Suite <test_suite@notmuchmail.org>"' \
             '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
             '[body]="reply with CC"'
 
-output=$(notmuch reply  --reply-to=sender id:${gen_msg_id})
+output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 Cc: Other Parties <cc@example.com>
@@ -130,7 +130,7 @@ add_message '[from]="Sender <sender@example.com>"' \
             '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
             '[body]="reply from alternate address"'
 
-output=$(notmuch reply  --reply-to=sender id:${gen_msg_id})
+output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite_other@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>
@@ -148,7 +148,7 @@ add_message '[from]="Sender <sender@example.com>"' \
             '[body]="support for reply-to"' \
             '[reply-to]="Sender <elsewhere@example.com>"'
 
-output=$(notmuch reply  --reply-to=sender id:${gen_msg_id})
+output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <elsewhere@example.com>
@@ -166,7 +166,7 @@ add_message '[from]="Sender <sender@example.com>"' \
             '[body]="support for reply-to with multiple recipients"' \
             '[reply-to]="Sender <elsewhere@example.com>"'
 
-output=$(notmuch reply  --reply-to=sender id:${gen_msg_id})
+output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <elsewhere@example.com>
@@ -184,7 +184,7 @@ add_message '[from]="Sender <sender@example.com>"' \
             '[body]="Un-munging Reply-To"' \
             '[reply-to]="Evil Munging List <list@example.com>"'
 
-output=$(notmuch reply  --reply-to=sender id:${gen_msg_id})
+output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: notmuch-reply-test
 To: Sender <sender@example.com>
@@ -198,7 +198,7 @@ test_begin_subtest "Message with header of exactly 200 bytes"
 add_message '[subject]="This subject is exactly 200 bytes in length. Other than its length there is not much of note here. Note that the length of 200 bytes includes the Subject: and Re: prefixes with two spaces"' \
             '[date]="Tue, 05 Jan 2010 15:43:56 -0000"' \
             '[body]="200-byte header"'
-output=$(notmuch reply  --reply-to=sender id:${gen_msg_id})
+output=$(notmuch reply --reply-to=sender id:${gen_msg_id})
 test_expect_equal "$output" "From: Notmuch Test Suite <test_suite@notmuchmail.org>
 Subject: Re: This subject is exactly 200 bytes in length. Other than its
  length there is not much of note here. Note that the length of 200 bytes

diff --git a/test/T240-dump-restore.sh b/test/T240-dump-restore.sh
index da7502c99a1ddcca4aa3a6aa5f80b8821d3f3395..105de130bf240c69a1f232159c23f6b7902e3811 100755 (executable)
--- a/test/T240-dump-restore.sh
+++ b/test/T240-dump-restore.sh
@@ -65,7 +65,7 @@ test_begin_subtest "Accumulate with new tags"
 test_expect_success \
   'notmuch restore --input=dump.expected &&
   notmuch restore --accumulate --input=dump-ABC_DEF.expected &&
-  notmuch dump >  OUTPUT.$test_count &&
+  notmuch dump > OUTPUT.$test_count &&
   notmuch restore --input=dump.expected &&
   test_cmp dump-ABC_DEF.expected OUTPUT.$test_count'
 
@@ -235,7 +235,7 @@ test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count
 test_begin_subtest 'format=batch-tag, checking encoded output'
 NOTMUCH_DUMP_TAGS --format=batch-tag -- from:cworth |\
         awk "{ print \"+$enc1 +$enc2 +$enc3 -- \" \$5 }" > EXPECTED.$test_count
-NOTMUCH_DUMP_TAGS --format=batch-tag -- from:cworth  > OUTPUT.$test_count
+NOTMUCH_DUMP_TAGS --format=batch-tag -- from:cworth > OUTPUT.$test_count
 test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count
 
 test_begin_subtest 'restoring sane tags'

diff --git a/test/T340-maildir-sync.sh b/test/T340-maildir-sync.sh
index 7416dd619e818a21d9fcecd2ba3de9af5962275c..a697317f426ccfdb9559230071f6f8960cda5d26 100755 (executable)
--- a/test/T340-maildir-sync.sh
+++ b/test/T340-maildir-sync.sh
@@ -174,7 +174,7 @@ thread:XXX   2001-01-05 [1/1(3)] Notmuch Test Suite; Duplicated message (inbox r
 test_begin_subtest "Tag changes modify flags of multiple files"
 notmuch tag -replied subject:"Duplicated message"
 (cd $MAIL_DIR/cur/; ls duplicated*) > actual
-test_expect_equal "$(< actual)"  "duplicated-message-another-copy:2,S
+test_expect_equal "$(< actual)" "duplicated-message-another-copy:2,S
 duplicated-message-copy:2,S
 duplicated-message:2,S"
 

diff --git a/test/T410-argument-parsing.sh b/test/T410-argument-parsing.sh
index b31d239a6f8330bfe8ec33018ce3d4598d83130b..d9aa8e2d01c811b77a0373cde8105e6e32e29965 100755 (executable)
--- a/test/T410-argument-parsing.sh
+++ b/test/T410-argument-parsing.sh
@@ -3,7 +3,7 @@ test_description="argument parsing"
 . $(dirname "$0")/test-lib.sh || exit 1
 
 test_begin_subtest "sanity check"
-$TEST_DIRECTORY/arg-test  pos1  --keyword=one --boolean --string=foo pos2 --int=7 --flag=one --flag=three > OUTPUT
+$TEST_DIRECTORY/arg-test pos1 --keyword=one --boolean --string=foo pos2 --int=7 --flag=one --flag=three > OUTPUT
 cat <<EOF > EXPECTED
 boolean 1
 keyword 1

diff --git a/test/T480-hex-escaping.sh b/test/T480-hex-escaping.sh
index 2c5bbb6313050f7590a244a14c7d5787a02c5bc5..b2eb80b901027ae2931d06f6ef9be33dac04722c 100755 (executable)
--- a/test/T480-hex-escaping.sh
+++ b/test/T480-hex-escaping.sh
@@ -14,13 +14,13 @@ test_expect_equal "$tag_enc1" "comic_swear=%24%26%5e%25%24%5e%25%5c%5c%2f%2f-+%2
 
 test_begin_subtest "round trip newlines"
 printf 'this\n tag\t has\n spaces\n' > EXPECTED.$test_count
-$TEST_DIRECTORY/hex-xcode --direction=encode  < EXPECTED.$test_count |\
+$TEST_DIRECTORY/hex-xcode --direction=encode < EXPECTED.$test_count |\
        $TEST_DIRECTORY/hex-xcode --direction=decode > OUTPUT.$test_count
 test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count
 
 test_begin_subtest "round trip 8bit chars"
 echo '%c3%91%c3%a5%c3%b0%c3%a3%c3%a5%c3%a9-%c3%8f%c3%8a' > EXPECTED.$test_count
-$TEST_DIRECTORY/hex-xcode --direction=decode  < EXPECTED.$test_count |\
+$TEST_DIRECTORY/hex-xcode --direction=decode < EXPECTED.$test_count |\
     $TEST_DIRECTORY/hex-xcode --direction=encode > OUTPUT.$test_count
 test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count
 
@@ -37,13 +37,13 @@ test_expect_equal "$tag_enc1" "comic_swear=%24%26%5e%25%24%5e%25%5c%5c%2f%2f-+%2
 
 test_begin_subtest "round trip newlines (in-place)"
 printf 'this\n tag\t has\n spaces\n' > EXPECTED.$test_count
-$TEST_DIRECTORY/hex-xcode --in-place --direction=encode  < EXPECTED.$test_count |\
+$TEST_DIRECTORY/hex-xcode --in-place --direction=encode < EXPECTED.$test_count |\
     $TEST_DIRECTORY/hex-xcode --in-place --direction=decode > OUTPUT.$test_count
 test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count
 
 test_begin_subtest "round trip 8bit chars (in-place)"
 echo '%c3%91%c3%a5%c3%b0%c3%a3%c3%a5%c3%a9-%c3%8f%c3%8a' > EXPECTED.$test_count
-$TEST_DIRECTORY/hex-xcode --in-place --direction=decode  < EXPECTED.$test_count |\
+$TEST_DIRECTORY/hex-xcode --in-place --direction=decode < EXPECTED.$test_count |\
     $TEST_DIRECTORY/hex-xcode --in-place --direction=encode > OUTPUT.$test_count
 test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count
 

diff --git a/test/T510-thread-replies.sh b/test/T510-thread-replies.sh
index 8b96a1db5111f36bf133a965b188c07e920af4a6..2859d29f37f7548c789e10c12311f406528b4bef 100755 (executable)
--- a/test/T510-thread-replies.sh
+++ b/test/T510-thread-replies.sh
@@ -178,7 +178,7 @@ test_expect_equal_json "$output" "$expected"
 add_email_corpus threading
 
 test_begin_subtest "reply to ghost"
-notmuch show --entire-thread=true id:000-real-root@example.org | grep ^Subject: | head -1  > OUTPUT
+notmuch show --entire-thread=true id:000-real-root@example.org | grep ^Subject: | head -1 > OUTPUT
 cat <<EOF > EXPECTED
 Subject: root message
 EOF

diff --git a/test/T562-lib-database.sh b/test/T562-lib-database.sh
index db251fe7fa7a786e289c9d229f0506849dfe667c..769fe86e6f8a347d86c9d49af17c26fd31ae94d5 100755 (executable)
--- a/test/T562-lib-database.sh
+++ b/test/T562-lib-database.sh
@@ -325,7 +325,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
         notmuch_tags_t *result;
         EXPECT0(notmuch_database_close (db));
         result = notmuch_database_get_all_tags (db);
-        printf("%d\n",  result == NULL);
+        printf("%d\n", result == NULL);
         stat = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
     }
 EOF
@@ -343,7 +343,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
         char *result;
         EXPECT0(notmuch_database_close (db));
         stat = notmuch_database_get_config (db, "foo", &result);
-        printf("%d\n",  stat == NOTMUCH_STATUS_SUCCESS);
+        printf("%d\n", stat == NOTMUCH_STATUS_SUCCESS);
     }
 EOF
 cat <<EOF > EXPECTED
@@ -358,7 +358,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
     {
         EXPECT0(notmuch_database_close (db));
         stat = notmuch_database_set_config (db, "foo", "bar");
-        printf("%d\n",  stat == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
+        printf("%d\n", stat == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
     }
 EOF
 cat <<EOF > EXPECTED
@@ -413,7 +413,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
         EXPECT0(notmuch_database_close (db));
         notmuch_decryption_policy_t policy = notmuch_indexopts_get_decrypt_policy (result);
         stat = notmuch_indexopts_set_decrypt_policy (result, policy);
-        printf("%d\n%d\n",  policy == NOTMUCH_DECRYPT_AUTO, stat == NOTMUCH_STATUS_SUCCESS);
+        printf("%d\n%d\n", policy == NOTMUCH_DECRYPT_AUTO, stat == NOTMUCH_STATUS_SUCCESS);
     }
 EOF
 cat <<EOF > EXPECTED

diff --git a/test/T566-lib-message.sh b/test/T566-lib-message.sh
index 0ba601f96f026cae28e833f5e0daebd8ae895642..ee55ef291d7a44c23a2728cf26c9af36be8f1107 100755 (executable)
--- a/test/T566-lib-message.sh
+++ b/test/T566-lib-message.sh
@@ -279,7 +279,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
         notmuch_status_t status;
         notmuch_bool_t out;
         status = notmuch_message_has_maildir_flag_st (message, 'S', &out);
-        printf("%d\n%d\n", message != NULL,  status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
+        printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
     }
 EOF
 cat <<EOF > EXPECTED
@@ -295,7 +295,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
     {
         notmuch_status_t status;
         status = notmuch_message_maildir_flags_to_tags (message);
-        printf("%d\n%d\n", message != NULL,  status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
+        printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
     }
 EOF
 cat <<EOF > EXPECTED
@@ -311,7 +311,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
     {
         notmuch_status_t status;
         status = notmuch_message_remove_all_tags (message);
-        printf("%d\n%d\n", message != NULL,  status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
+        printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
     }
 EOF
 cat <<EOF > EXPECTED
@@ -327,7 +327,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
     {
         notmuch_status_t status;
         status = notmuch_message_freeze (message);
-        printf("%d\n%d\n", message != NULL,  status == NOTMUCH_STATUS_SUCCESS);
+        printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_SUCCESS);
     }
 EOF
 cat <<EOF > EXPECTED
@@ -343,7 +343,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
     {
         notmuch_status_t status;
         status = notmuch_message_thaw (message);
-        printf("%d\n%d\n", message != NULL,  status == NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW);
+        printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_UNBALANCED_FREEZE_THAW);
     }
 EOF
 cat <<EOF > EXPECTED
@@ -358,7 +358,7 @@ test_begin_subtest "Handle destroying message with closed db"
 cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
     {
         notmuch_message_destroy (message);
-        printf("%d\n%d\n", message != NULL,  1);
+        printf("%d\n%d\n", message != NULL, 1);
     }
 EOF
 cat <<EOF > EXPECTED
@@ -374,7 +374,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
     {
         notmuch_database_t *db2;
         db2 = notmuch_message_get_database (message);
-        printf("%d\n%d\n", message != NULL,  db == db2);
+        printf("%d\n%d\n", message != NULL, db == db2);
     }
 EOF
 cat <<EOF > EXPECTED
@@ -390,7 +390,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
     {
         notmuch_status_t status;
         status = notmuch_message_reindex (message, NULL);
-        printf("%d\n%d\n", message != NULL,  status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
+        printf("%d\n%d\n", message != NULL, status == NOTMUCH_STATUS_XAPIAN_EXCEPTION);
     }
 EOF
 cat <<EOF > EXPECTED

diff --git a/test/T700-reindex.sh b/test/T700-reindex.sh
index 3d7c930d6bdb0fe557b665c76385e5343478d541..f51130e8f86d4ed8c4a80698b971305c34b4ae91 100755 (executable)
--- a/test/T700-reindex.sh
+++ b/test/T700-reindex.sh
@@ -34,11 +34,11 @@ notmuch dump > OUTPUT
 test_expect_equal_file initial-dump OUTPUT
 
 test_begin_subtest 'reindex preserves tags with special prefixes'
-notmuch tag +attachment2 +encrypted2 +signed2  '*'
+notmuch tag +attachment2 +encrypted2 +signed2 '*'
 notmuch dump > EXPECTED
 notmuch reindex '*'
 notmuch dump > OUTPUT
-notmuch tag -attachment2 -encrypted2 -signed2  '*'
+notmuch tag -attachment2 -encrypted2 -signed2 '*'
 test_expect_equal_file EXPECTED OUTPUT
 
 test_begin_subtest 'reindex moves a message between threads'

diff --git a/test/T750-gzip.sh b/test/T750-gzip.sh
index 7d550e666a85547cb1898e1f18c321f2e0ece668..4408d085a58031046d81148375695d55ce5eef25 100755 (executable)
--- a/test/T750-gzip.sh
+++ b/test/T750-gzip.sh
@@ -171,7 +171,7 @@ test_expect_equal_file EXPECTED OUTPUT
 add_email_corpus lkml
 test_begin_subtest "new doesn't run out of file descriptors with many gzipped files"
 ulimit -n 200
-find ${MAIL_DIR} -name .notmuch -prune -o  -type f -print0 | xargs -0 gzip --
+find ${MAIL_DIR} -name .notmuch -prune -o -type f -print0 | xargs -0 gzip --
 test_expect_success "notmuch new"
 
 test_done