summaryrefslogtreecommitdiff
path: root/t/t6001-rev-list-merge-order.sh
diff options
context:
space:
mode:
authorJon Seymour <jon.seymour@gmail.com>2005-06-30 02:41:55 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-30 03:53:10 (GMT)
commit2ba1beebd37a57ad07c283da67c82847f6cb2ef9 (patch)
treea26e62f8147c88a053f5cfc8b6ab0b99f15de830 /t/t6001-rev-list-merge-order.sh
parent99c2bc93000dfadc3ac26ddced23e50520cf30d0 (diff)
downloadgit-2ba1beebd37a57ad07c283da67c82847f6cb2ef9.zip
git-2ba1beebd37a57ad07c283da67c82847f6cb2ef9.tar.gz
git-2ba1beebd37a57ad07c283da67c82847f6cb2ef9.tar.bz2
[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>
Diffstat (limited to 't/t6001-rev-list-merge-order.sh')
-rwxr-xr-xt/t6001-rev-list-merge-order.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
index 8ac77d9..a693c17 100755
--- 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
- if "$@" | entag > $_name.actual
+ if eval "$*" | entag > $_name.actual
then
diff $_name.expected $_name.actual
else
return 1;
fi
-
}
# 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
- test_expect_success "$_description" "check_output $_name $_test"
+ test_expect_success "$_description" "check_output $_name \"$_test\""
}
# --- end of stuff to move ---