From 6e118c1d32b9a8ad674e765a52f861b2db5b34f5 Mon Sep 17 00:00:00 2001 From: Tristan Gingold Date: Wed, 16 Sep 2015 05:59:42 +0200 Subject: testsuite: run fst tests only if fst feature is present. --- testsuite/gna/bug011/testsuite.sh | 5 ++++- testsuite/gna/bug05/testsuite.sh | 7 +++++-- testsuite/testenv.sh | 6 ++++++ 3 files changed, 15 insertions(+), 3 deletions(-) (limited to 'testsuite') diff --git a/testsuite/gna/bug011/testsuite.sh b/testsuite/gna/bug011/testsuite.sh index 5823c99d5..0ad0ee761 100755 --- a/testsuite/gna/bug011/testsuite.sh +++ b/testsuite/gna/bug011/testsuite.sh @@ -3,7 +3,10 @@ . ../../testenv.sh analyze phonybench.vhdl -elab_simulate phonybench --stop-time=1sec --fst=pb.fst +elab phonybench +if ghdl_has_feature phonybench fst; then + elab_simulate phonybench --stop-time=1sec --fst=pb.fst +fi rm -f pb.fst pb.ghw diff --git a/testsuite/gna/bug05/testsuite.sh b/testsuite/gna/bug05/testsuite.sh index 42a3e39af..5343c9343 100755 --- a/testsuite/gna/bug05/testsuite.sh +++ b/testsuite/gna/bug05/testsuite.sh @@ -3,8 +3,11 @@ . ../../testenv.sh analyze repro.vhdl -elab_simulate tb --fst=tb.fst -elab_simulate tb --vcd=tb.vcd +elab tb +if ghdl_has_feature tb fst; then + simulate tb --fst=tb.fst +fi +simulate tb --vcd=tb.vcd clean rm -f tb.fst tb.vcd diff --git a/testsuite/testenv.sh b/testsuite/testenv.sh index e42d7fd97..ccce922b2 100644 --- a/testsuite/testenv.sh +++ b/testsuite/testenv.sh @@ -94,6 +94,12 @@ elab_simulate_failure () $@ --expect-failure } +# Check if a feature is present +ghdl_has_feature () +{ + $GHDL -r $GHDL_STD_FLAGS $GHDL_FLAGS $1 --has-feature=$2 +} + # Run a program run () { -- cgit v1.2.3