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@xxxxxxxxx>
---
This patch set:
* demonstrates and fixes some broken test infrastructure
* fixes a broken test case that was previously hidden by the broken
infrastructure
* simplifies the test case to remove an unnecessary sort.
Although all patches in the set touch the same file, I have broken it into
three smaller patches to highlight the 3 different changes.
This patch set patches assumes that this series has been applied:
[PATCH 1/2] Test case that demonstrates problem with --merge-order ^ processing
[PATCH 2/2] Fix for git-rev-list --merge-order B ^A (A,B share common base)
[rev 2]
t/t6001-rev-list-merge-order.sh | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
0b0041e1fdb1b25757b0c861a0832c54b922440b
diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
--- 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 ---
------------
|