From 9dbdab5a904fc2822b0f4a59dba18115ffabac64 Mon Sep 17 00:00:00 2001 From: "Anthony J. Bentley" Date: Sun, 3 Nov 2019 10:53:55 +0100 Subject: [PATCH] When check.sh was modified to run ngspice/sed without && in between, the change was not applied to the OpenBSD/SunOS branch. This leads to a test failure when ngspice returns nonzero, as in xpressn-1.cir, xpressn-2.cir, xpressn-3.cir, and bxpressn-1.cir. Attached patch makes the code like the Linux code, and all tests now pass on OpenBSD. --- tests/bin/check.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/bin/check.sh b/tests/bin/check.sh index 90209c164..72d7d8616 100644 --- a/tests/bin/check.sh +++ b/tests/bin/check.sh @@ -40,8 +40,8 @@ case $HOST_TYPE in rm -f $testname.test_tmp $testname.out_tmp ;; FreeBSD*|SunOS*|OpenBSD*) - $SPICE --batch $testdir/$testname.cir >$testname.test &&\ - sed -e '/^$/d' $testname.test | egrep -v "$FILTER" > $testname.test_tmp &&\ + $SPICE --batch $testdir/$testname.cir >$testname.test + sed -e '/^$/d' $testname.test | egrep -v "$FILTER" > $testname.test_tmp sed -e '/^$/d' $testdir/$testname.out | egrep -v "$FILTER" > $testname.out_tmp if diff -b -w $testname.out_tmp $testname.test_tmp; then rm $testname.test $testname.test_tmp $testname.out_tmp