Use test_cmp instead of diff -u in the test suite

Since diff -u isn't available everywhere, and the user might want to
use something else.

Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/t/t0002-status.sh b/t/t0002-status.sh
index 0a70f15c31389e8934a672ddb7e036c2680e28b4..436470943baed5e000eff4966cbde969faca652d 100755 (executable)
--- a/t/t0002-status.sh
+++ b/t/t0002-status.sh
@@ -20,7 +20,7 @@ cat > expected.txt <<EOF
 EOF
 test_expect_success 'Run status on empty' '
     stg status > output.txt &&
 EOF
 test_expect_success 'Run status on empty' '
     stg status > output.txt &&

-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt

 '
 
 cat > expected.txt <<EOF
 '
 
 cat > expected.txt <<EOF


@@ -29,7 +29,7 @@ EOF
 test_expect_success 'Status with an untracked file' '
     touch foo &&
     stg status > output.txt &&
 test_expect_success 'Status with an untracked file' '
     touch foo &&
     stg status > output.txt &&

-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt

 '
 rm -f foo
 
 '
 rm -f foo
 


@@ -38,7 +38,7 @@ EOF
 test_expect_success 'Status with an empty directory' '
     mkdir foo &&
     stg status > output.txt &&
 test_expect_success 'Status with an empty directory' '
     mkdir foo &&
     stg status > output.txt &&

-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt

 '
 
 cat > expected.txt <<EOF
 '
 
 cat > expected.txt <<EOF


@@ -47,7 +47,7 @@ EOF
 test_expect_success 'Status with an untracked file in a subdir' '
     touch foo/bar &&
     stg status > output.txt &&
 test_expect_success 'Status with an untracked file in a subdir' '
     touch foo/bar &&
     stg status > output.txt &&

-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt

 '
 
 cat > expected.txt <<EOF
 '
 
 cat > expected.txt <<EOF


@@ -56,7 +56,7 @@ EOF
 test_expect_success 'Status with an added file' '
     git add foo &&
     stg status > output.txt &&
 test_expect_success 'Status with an added file' '
     git add foo &&
     stg status > output.txt &&

-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt

 '
 
 cat > expected.txt <<EOF
 '
 
 cat > expected.txt <<EOF


@@ -64,7 +64,7 @@ foo/bar
 EOF
 test_expect_success 'Status with an added file and -n option' '
     stg status -n > output.txt &&
 EOF
 test_expect_success 'Status with an added file and -n option' '
     stg status -n > output.txt &&

-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt

 '
 
 cat > expected.txt <<EOF
 '
 
 cat > expected.txt <<EOF


@@ -73,7 +73,7 @@ test_expect_success 'Status after refresh' '
     stg new -m "first patch" &&
     stg refresh &&
     stg status > output.txt &&
     stg new -m "first patch" &&
     stg refresh &&
     stg status > output.txt &&

-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt

 '
 
 cat > expected.txt <<EOF
 '
 
 cat > expected.txt <<EOF


@@ -82,7 +82,7 @@ EOF
 test_expect_success 'Status after modification' '
     echo "wee" >> foo/bar &&
     stg status > output.txt &&
 test_expect_success 'Status after modification' '
     echo "wee" >> foo/bar &&
     stg status > output.txt &&

-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt

 '
 
 cat > expected.txt <<EOF
 '
 
 cat > expected.txt <<EOF


@@ -90,7 +90,7 @@ EOF
 test_expect_success 'Status after refresh' '
     stg new -m "second patch" && stg refresh &&
     stg status > output.txt &&
 test_expect_success 'Status after refresh' '
     stg new -m "second patch" && stg refresh &&
     stg status > output.txt &&

-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt

 '
 
 test_expect_success 'Add another file' '
 '
 
 test_expect_success 'Add another file' '


@@ -116,7 +116,7 @@ EOF
 test_expect_success 'Status after conflicting push' '
     ! stg push &&
     stg status > output.txt &&
 test_expect_success 'Status after conflicting push' '
     ! stg push &&
     stg status > output.txt &&

-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt

 '
 
 cat > expected.txt <<EOF
 '
 
 cat > expected.txt <<EOF


@@ -124,7 +124,7 @@ C foo/bar
 EOF
 test_expect_success 'Status of file' '
     stg status foo/bar > output.txt &&
 EOF
 test_expect_success 'Status of file' '
     stg status foo/bar > output.txt &&

-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt

 '
 
 cat > expected.txt <<EOF
 '
 
 cat > expected.txt <<EOF


@@ -132,7 +132,7 @@ C foo/bar
 EOF
 test_expect_success 'Status of dir' '
     stg status foo > output.txt &&
 EOF
 test_expect_success 'Status of dir' '
     stg status foo > output.txt &&

-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt

 '
 
 cat > expected.txt <<EOF
 '
 
 cat > expected.txt <<EOF


@@ -140,7 +140,7 @@ A fie
 EOF
 test_expect_success 'Status of other file' '
     stg status fie > output.txt &&
 EOF
 test_expect_success 'Status of other file' '
     stg status fie > output.txt &&

-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt

 '
 
 cat > expected.txt <<EOF
 '
 
 cat > expected.txt <<EOF


@@ -150,7 +150,7 @@ EOF
 test_expect_success 'Status after resolving the push' '
     stg resolved -a &&
     stg status > output.txt &&
 test_expect_success 'Status after resolving the push' '
     stg resolved -a &&
     stg status > output.txt &&

-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt

 '
 
 cat > expected.txt <<EOF
 '
 
 cat > expected.txt <<EOF


@@ -160,7 +160,7 @@ EOF
 test_expect_success 'Status after deleting a file' '
     rm foo/bar &&
     stg status > output.txt &&
 test_expect_success 'Status after deleting a file' '
     rm foo/bar &&
     stg status > output.txt &&

-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt

 '
 
 cat > expected.txt <<EOF
 '
 
 cat > expected.txt <<EOF


@@ -172,7 +172,7 @@ test_expect_success 'Status of disappeared newborn' '
     git add foo/bar &&
     rm foo/bar &&
     stg status > output.txt &&
     git add foo/bar &&
     rm foo/bar &&
     stg status > output.txt &&

-    diff -u expected.txt output.txt
+    test_cmp expected.txt output.txt

 '
 
 test_done
 '
 
 test_done

diff --git a/t/t1201-pull-trailing.sh b/t/t1201-pull-trailing.sh
index 46d9f825479c75608c99ad987e39c208e8459aa9..9d70fe02fcd499ae0c52602bb21a5af0ec18e47c 100755 (executable)
--- a/t/t1201-pull-trailing.sh
+++ b/t/t1201-pull-trailing.sh
@@ -55,7 +55,7 @@ test_expect_success \
 
 test_expect_success \
     'Check that all went well' \
 
 test_expect_success \
     'Check that all went well' \

-    "diff -u foo/file bar/file
+    "test_cmp foo/file bar/file

 "
 
 test_done
 "
 
 test_done

diff --git a/t/t2700-refresh.sh b/t/t2700-refresh.sh
index 9eae85ddbf770ad7d6360b3510142695921cc31d..3759d0e98e9a2c1a9c0bf56b908cfb66cc9d5089 100755 (executable)
--- a/t/t2700-refresh.sh
+++ b/t/t2700-refresh.sh
@@ -33,7 +33,7 @@ test_expect_success 'Refresh top patch' '
     stg status &&
     test -z "$(stg status)" &&
     stg patches foo3.txt > patches.txt &&
     stg status &&
     test -z "$(stg status)" &&
     stg patches foo3.txt > patches.txt &&

-    diff -u expected.txt patches.txt
+    test_cmp expected.txt patches.txt

 '
 
 cat > expected.txt <<EOF
 '
 
 cat > expected.txt <<EOF


@@ -47,7 +47,7 @@ test_expect_success 'Refresh middle patch' '
     stg status &&
     test -z "$(stg status)" &&
     stg patches foo2.txt > patches.txt &&
     stg status &&
     test -z "$(stg status)" &&
     stg patches foo2.txt > patches.txt &&

-    diff -u expected.txt patches.txt
+    test_cmp expected.txt patches.txt

 '
 
 cat > expected.txt <<EOF
 '
 
 cat > expected.txt <<EOF


@@ -61,7 +61,7 @@ test_expect_success 'Refresh bottom patch' '
     stg status &&
     test -z "$(stg status)" &&
     stg patches foo1.txt > patches.txt &&
     stg status &&
     test -z "$(stg status)" &&
     stg patches foo1.txt > patches.txt &&

-    diff -u expected.txt patches.txt
+    test_cmp expected.txt patches.txt

 '
 
 cat > expected.txt <<EOF
 '
 
 cat > expected.txt <<EOF


@@ -111,9 +111,9 @@ test_expect_success 'Refresh --index' '
     stg patches foo1.txt > patches.txt &&
     git diff HEAD^..HEAD > show.txt &&
     stg diff > diff.txt &&
     stg patches foo1.txt > patches.txt &&
     git diff HEAD^..HEAD > show.txt &&
     stg diff > diff.txt &&

-    diff -u expected.txt patches.txt &&
-    diff -u expected2.txt show.txt &&
-    diff -u expected3.txt diff.txt &&
+    test_cmp expected.txt patches.txt &&
+    test_cmp expected2.txt show.txt &&
+    test_cmp expected3.txt diff.txt &&

     stg new p5 -m "cleanup again" &&
     stg refresh
 '
     stg new p5 -m "cleanup again" &&
     stg refresh
 '

diff --git a/t/t2800-goto-subdir.sh b/t/t2800-goto-subdir.sh
index fcad7da52cd0dc21b67db7a82e37474d9d7744ef..28b82924137e896ed80bbb231d30e3adb5b93aa6 100755 (executable)
--- a/t/t2800-goto-subdir.sh
+++ b/t/t2800-goto-subdir.sh
@@ -27,9 +27,9 @@ EOF
 test_expect_success 'Goto in subdirectory (just pop)' '
     (cd foo && stg goto p1) &&
     cat foo/bar > actual.txt &&
 test_expect_success 'Goto in subdirectory (just pop)' '
     (cd foo && stg goto p1) &&
     cat foo/bar > actual.txt &&

-    diff -u expected1.txt actual.txt &&
+    test_cmp expected1.txt actual.txt &&

     ls foo > actual.txt &&
     ls foo > actual.txt &&

-    diff -u expected2.txt actual.txt
+    test_cmp expected2.txt actual.txt

 '
 
 test_expect_success 'Prepare conflicting goto' '
 '
 
 test_expect_success 'Prepare conflicting goto' '


@@ -51,9 +51,9 @@ test_expect_success 'Goto in subdirectory (conflicting push)' '
     (cd foo && stg goto p3) ;
     [ $? -eq 3 ] &&
     cat foo/bar > actual.txt &&
     (cd foo && stg goto p3) ;
     [ $? -eq 3 ] &&
     cat foo/bar > actual.txt &&

-    diff -u expected1.txt actual.txt &&
+    test_cmp expected1.txt actual.txt &&

     ls foo > actual.txt &&
     ls foo > actual.txt &&

-    diff -u expected2.txt actual.txt
+    test_cmp expected2.txt actual.txt

 '
 
 test_done
 '
 
 test_done