[PATCH] Demonstrate broken t6001 test case function

Junio discovered a problem where an actual test case break was hidden
because pipelines are not handled properly by the test infrastructure in
t6001.

This patch fixes the broken infrastructure (and demonstrates the break
explicitly).

A subsequent patch in this series will fix the test case so that it
doesn't fail.

Signed-off-by: Jon Seymour <jon.seymour@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
index 8ac77d997ba99fc564d40e62977fd8f65ef23b8e..a693c17dfaf0e5e84e3b5875a00b30d8e77f13a8 100755 (executable)
--- a/t/t6001-rev-list-merge-order.sh
+++ b/t/t6001-rev-list-merge-order.sh
@@ -85,13 +85,12 @@ check_output()
 {
        _name=$1
        shift 1
 {
        _name=$1
        shift 1

-       if "$@" | entag > $_name.actual
+       if eval "$*" | entag > $_name.actual

        then
                diff $_name.expected $_name.actual
        else
                return 1;
        fi
        then
                diff $_name.expected $_name.actual
        else
                return 1;
        fi

-       

 }
 
 # Turn a reasonable test description into a reasonable test name.
 }
 
 # Turn a reasonable test description into a reasonable test name.


@@ -114,7 +113,7 @@ test_output_expect_success()
         [ $# -eq 2 ] || error "usage: test_output_expect_success description test <<EOF ... EOF"
         _name=$(echo $_description | name_from_description)
        cat > $_name.expected
         [ $# -eq 2 ] || error "usage: test_output_expect_success description test <<EOF ... EOF"
         _name=$(echo $_description | name_from_description)
        cat > $_name.expected

-       test_expect_success "$_description" "check_output $_name $_test" 
+       test_expect_success "$_description" "check_output $_name \"$_test\"" 

 }
 
 # --- end of stuff to move ---
 }
 
 # --- end of stuff to move ---