From 97b9f0c7dfb61ceb924a9344a2e2b5dbba10e828 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Sun, 15 Jan 2023 09:44:59 +0100 Subject: testsuite/gna: adjust error detection in issue#687 for simul --- testsuite/gna/issue687/testsuite.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/testsuite/gna/issue687/testsuite.sh b/testsuite/gna/issue687/testsuite.sh index 2c71a7534..07e58dab1 100755 --- a/testsuite/gna/issue687/testsuite.sh +++ b/testsuite/gna/issue687/testsuite.sh @@ -6,14 +6,18 @@ export GHDL_STD_FLAGS=--std=08 check_output() { - if ! grep -q "bound check failure" $1; then - echo "missing bound check failure" - exit 1 + if grep -q "bound check failure" $1; then + return 0 fi + if grep -q "mismatching vector length" $1; then + return 0 + fi + echo "missing bound check failure" + exit 1 } analyze ent.vhdl -elab_simulate_failure tb > tb.err +elab_simulate_failure tb > tb.err 2>&1 check_output tb.err clean @@ -24,19 +28,19 @@ elab_simulate tb clean analyze ent2.vhdl -elab_simulate_failure tb > tb.err +elab_simulate_failure tb > tb.err 2>&1 check_output tb.err clean analyze ent3.vhdl -elab_simulate_failure tb > tb.err +elab_simulate_failure tb > tb.err 2>&1 check_output tb.err clean analyze ent4.vhdl -elab_simulate_failure tb > tb.err +elab_simulate_failure tb > tb.err 2>&1 check_output tb.err clean -- cgit v1.2.3