From d1593b668148a33354ba839760b40b0c637367c4 Mon Sep 17 00:00:00 2001 From: Werner Almesberger Date: Sat, 2 Jun 2012 20:42:49 -0300 Subject: [PATCH] b2/: insert a virtual empty hierarchy if test input starts with other file Also updated the regression tests that explicitly provided an empty hierarchy. --- b2/test/Common | 8 ++++++-- b2/test/curr | 4 ---- b2/test/inv | 5 ----- b2/test/prov | 3 --- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/b2/test/Common b/b2/test/Common index 74cd95d..6514d4f 100755 --- a/b2/test/Common +++ b/b2/test/Common @@ -13,13 +13,17 @@ run_boom() { - args="-N h <(sed -n '/^!-/q;p' _in)" + if [ "`sed -n '/^!-/p;q' _in`" ]; then + args="<(echo ';')" + else + args="-N h <(sed -n '/^!-/q;p' _in)" + fi for n in c x p i s b X; do for m in "" 1 2 3; do if grep ^!-$n$m\$ _in >/dev/null; then args="$args -N $n$m" args="$args -$n \ -<(sed -n '1,/^!-$n$m/d;/^!-/q;p' _in)" +<(sed -n '0,/^!-$n$m/d;/^!-/q;p' _in)" fi done done diff --git a/b2/test/curr b/b2/test/curr index 6a6ae3e..ac72c0b 100755 --- a/b2/test/curr +++ b/b2/test/curr @@ -4,7 +4,6 @@ ############################################################################### tst "currency: one currency" <