Code

Make test case number unique
authorJohannes Sixt <j6t@kdbg.org>
Thu, 27 Aug 2009 07:38:27 +0000 (09:38 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Aug 2009 23:45:12 +0000 (16:45 -0700)
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t4037-whitespace-status.sh [deleted file]
t/t4040-whitespace-status.sh [new file with mode: 0755]

diff --git a/t/t4037-whitespace-status.sh b/t/t4037-whitespace-status.sh
deleted file mode 100755 (executable)
index a30b03b..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-test_description='diff --exit-code with whitespace'
-. ./test-lib.sh
-
-test_expect_success setup '
-       mkdir a b &&
-       echo >c &&
-       echo >a/d &&
-       echo >b/e &&
-       git add . &&
-       test_tick &&
-       git commit -m initial &&
-       echo " " >a/d &&
-       test_tick &&
-       git commit -a -m second &&
-       echo "  " >a/d &&
-       echo " " >b/e &&
-       git add a/d
-'
-
-test_expect_success 'diff-tree --exit-code' '
-       test_must_fail git diff --exit-code HEAD^ HEAD &&
-       test_must_fail git diff-tree --exit-code HEAD^ HEAD
-'
-
-test_expect_success 'diff-tree -b --exit-code' '
-       git diff -b --exit-code HEAD^ HEAD &&
-       git diff-tree -b -p --exit-code HEAD^ HEAD &&
-       git diff-tree -b --exit-code HEAD^ HEAD
-'
-
-test_expect_success 'diff-index --cached --exit-code' '
-       test_must_fail git diff --cached --exit-code HEAD &&
-       test_must_fail git diff-index --cached --exit-code HEAD
-'
-
-test_expect_success 'diff-index -b -p --cached --exit-code' '
-       git diff -b --cached --exit-code HEAD &&
-       git diff-index -b -p --cached --exit-code HEAD
-'
-
-test_expect_success 'diff-index --exit-code' '
-       test_must_fail git diff --exit-code HEAD &&
-       test_must_fail git diff-index --exit-code HEAD
-'
-
-test_expect_success 'diff-index -b -p --exit-code' '
-       git diff -b --exit-code HEAD &&
-       git diff-index -b -p --exit-code HEAD
-'
-
-test_expect_success 'diff-files --exit-code' '
-       test_must_fail git diff --exit-code &&
-       test_must_fail git diff-files --exit-code
-'
-
-test_expect_success 'diff-files -b -p --exit-code' '
-       git diff -b --exit-code &&
-       git diff-files -b -p --exit-code
-'
-
-test_done
diff --git a/t/t4040-whitespace-status.sh b/t/t4040-whitespace-status.sh
new file mode 100755 (executable)
index 0000000..a30b03b
--- /dev/null
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+test_description='diff --exit-code with whitespace'
+. ./test-lib.sh
+
+test_expect_success setup '
+       mkdir a b &&
+       echo >c &&
+       echo >a/d &&
+       echo >b/e &&
+       git add . &&
+       test_tick &&
+       git commit -m initial &&
+       echo " " >a/d &&
+       test_tick &&
+       git commit -a -m second &&
+       echo "  " >a/d &&
+       echo " " >b/e &&
+       git add a/d
+'
+
+test_expect_success 'diff-tree --exit-code' '
+       test_must_fail git diff --exit-code HEAD^ HEAD &&
+       test_must_fail git diff-tree --exit-code HEAD^ HEAD
+'
+
+test_expect_success 'diff-tree -b --exit-code' '
+       git diff -b --exit-code HEAD^ HEAD &&
+       git diff-tree -b -p --exit-code HEAD^ HEAD &&
+       git diff-tree -b --exit-code HEAD^ HEAD
+'
+
+test_expect_success 'diff-index --cached --exit-code' '
+       test_must_fail git diff --cached --exit-code HEAD &&
+       test_must_fail git diff-index --cached --exit-code HEAD
+'
+
+test_expect_success 'diff-index -b -p --cached --exit-code' '
+       git diff -b --cached --exit-code HEAD &&
+       git diff-index -b -p --cached --exit-code HEAD
+'
+
+test_expect_success 'diff-index --exit-code' '
+       test_must_fail git diff --exit-code HEAD &&
+       test_must_fail git diff-index --exit-code HEAD
+'
+
+test_expect_success 'diff-index -b -p --exit-code' '
+       git diff -b --exit-code HEAD &&
+       git diff-index -b -p --exit-code HEAD
+'
+
+test_expect_success 'diff-files --exit-code' '
+       test_must_fail git diff --exit-code &&
+       test_must_fail git diff-files --exit-code
+'
+
+test_expect_success 'diff-files -b -p --exit-code' '
+       git diff -b --exit-code &&
+       git diff-files -b -p --exit-code
+'
+
+test_done