t/t3700: convert two uses of negation operator '!' to use test_must_fail

drafnel · gitster · commit 460d562eab00 · 2010-07-20T11:37:26.000-07:00
These two lines use the negation '!' operator to negate the result of a
simple command.  Since these commands do not contain any pipes or other
complexities, the test_must_fail function can be used and is preferred
since it will additionally detect termination due to a signal.

This was noticed because the second use of '!' does not include a space
between the '!' and the opening parens.  Ksh interprets this as follows:

   !(pattern-list)
      Matches anything except one of the given patterns.

Ksh performs a file glob using the pattern-list and then tries to execute
the first file in the list.  If a space is added between the '!' and the
open parens, then Ksh will not interpret it as a pattern list, but in this
case, it is preferred to use test_must_fail, so lets do so.

Signed-off-by: Brandon Casey &lt;casey@nrlssc.navy.mil&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
@@ -268,7 +268,7 @@ test_expect_success 'git add --dry-run of existing changed file' "
 
 test_expect_success 'git add --dry-run of non-existing file' "
 	echo ignored-file >>.gitignore &&
-	! (git add --dry-run track-this ignored-file >actual 2>&1) &&
+	test_must_fail git add --dry-run track-this ignored-file >actual 2>&1 &&
 	echo \"fatal: pathspec 'ignored-file' did not match any files\" | test_cmp - actual
 "
 
@@ -281,7 +281,7 @@ add 'track-this'
 EOF
 
 test_expect_success 'git add --dry-run --ignore-missing of non-existing file' '
-	!(git add --dry-run --ignore-missing track-this ignored-file >actual 2>&1) &&
+	test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual 2>&1 &&
 	test_cmp expect actual
 '
 

Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ test_expect_success 'git add --dry-run of existing changed file' "`
`268`	`268`
`269`	`269`	`test_expect_success 'git add --dry-run of non-existing file' "`
`270`	`270`	`echo ignored-file >>.gitignore &&`
`271`		`- ! (git add --dry-run track-this ignored-file >actual 2>&1) &&`
	`271`	`+ test_must_fail git add --dry-run track-this ignored-file >actual 2>&1 &&`
`272`	`272`	`echo \"fatal: pathspec 'ignored-file' did not match any files\" \| test_cmp - actual`
`273`	`273`	`"`
`274`	`274`
`@@ -281,7 +281,7 @@ add 'track-this'`
`281`	`281`	`EOF`
`282`	`282`
`283`	`283`	`test_expect_success 'git add --dry-run --ignore-missing of non-existing file' '`
`284`		`- !(git add --dry-run --ignore-missing track-this ignored-file >actual 2>&1) &&`
	`284`	`+ test_must_fail git add --dry-run --ignore-missing track-this ignored-file >actual 2>&1 &&`
`285`	`285`	`test_cmp expect actual`
`286`	`286`	`'`
`287`	`287`