diff options
author | Brian Drummond | 2013-12-24 16:54:03 +0000 |
---|---|---|
committer | Brian Drummond | 2013-12-24 16:54:03 +0000 |
commit | 663b942b97aa629489eb06b53ecb6682e9f5fbac (patch) | |
tree | 34286e5d5b448b49c50497f1406b43c7b1bf0cf7 /testsuite/vests/vhdl-93/clifton-labs/compliant | |
parent | 0a96f62124b33a501dafa2da71dc890aad386491 (diff) | |
download | ghdl-663b942b97aa629489eb06b53ecb6682e9f5fbac.tar.gz ghdl-663b942b97aa629489eb06b53ecb6682e9f5fbac.tar.bz2 ghdl-663b942b97aa629489eb06b53ecb6682e9f5fbac.zip |
Testsuite changes to elaborate and run tests marked run_compliant_test
Diffstat (limited to 'testsuite/vests/vhdl-93/clifton-labs/compliant')
4 files changed, 5 insertions, 3 deletions
diff --git a/testsuite/vests/vhdl-93/clifton-labs/compliant/compliant.exp b/testsuite/vests/vhdl-93/clifton-labs/compliant/compliant.exp index ba835c1..46223f1 100644 --- a/testsuite/vests/vhdl-93/clifton-labs/compliant/compliant.exp +++ b/testsuite/vests/vhdl-93/clifton-labs/compliant/compliant.exp @@ -43,7 +43,7 @@ foreach local_test_name [find ${subdir} *\.vhd*] { set output_file_name [lindex ${output_file_name} [expr [llength ${output_file_name}] - 1]] # set output_files_argument "INPUT=${output_file_name}:[pwd]/${output_files}" set output_files_argument "INPUT=${output_file_name}:${output_files}" - verbose "Ouput files glob: ${output_files_glob}, files found: ${output_files}, argument generated ${output_files_argument}" 2 + verbose "Output files glob: ${output_files_glob}, files found: ${output_files}, argument generated ${output_files_argument}" 2 } verbose "Running test at ./[string range ${local_test_name} [expr ${dir_prefix_length} - 2] end] ${input_files_argument} ${output_files_argument}" 2 diff --git a/testsuite/vests/vhdl-93/clifton-labs/compliant/functional/attributes/signal/simple-event-attribute.vhdl b/testsuite/vests/vhdl-93/clifton-labs/compliant/functional/attributes/signal/simple-event-attribute.vhdl index e3c5d30..e37fe34 100644 --- a/testsuite/vests/vhdl-93/clifton-labs/compliant/functional/attributes/signal/simple-event-attribute.vhdl +++ b/testsuite/vests/vhdl-93/clifton-labs/compliant/functional/attributes/signal/simple-event-attribute.vhdl @@ -13,7 +13,8 @@ begin -- s <= '1'; -- wait for 0 ns; assert s = '0' report "TEST FAILED - s has not changed to 0 yet!" severity failure; - wait for 10 ns; + --wait for 10 ns; + wait for 4 ns; assert s = '1' report "TEST FAILED - s has not changed to 1 yet!" severity failure; assert (s'event) report "TEST FAILED - 'event not tripped" severity failure; report "TEST PASSED"; diff --git a/testsuite/vests/vhdl-93/clifton-labs/compliant/functional/generics/entity-generic-defines-port-type.vhdl b/testsuite/vests/vhdl-93/clifton-labs/compliant/functional/generics/entity-generic-defines-port-type.vhdl index 2257c12..d77743a 100644 --- a/testsuite/vests/vhdl-93/clifton-labs/compliant/functional/generics/entity-generic-defines-port-type.vhdl +++ b/testsuite/vests/vhdl-93/clifton-labs/compliant/functional/generics/entity-generic-defines-port-type.vhdl @@ -35,6 +35,7 @@ begin -- only gdpt1_finished <= true; wait for 1 fs; report "TEST PASSED"; + wait; end process doit; end only; diff --git a/testsuite/vests/vhdl-93/clifton-labs/compliant/functional/statements/block-statements/simple-grouping-block.vhdl b/testsuite/vests/vhdl-93/clifton-labs/compliant/functional/statements/block-statements/simple-grouping-block.vhdl index c10bd22..0223d6d 100644 --- a/testsuite/vests/vhdl-93/clifton-labs/compliant/functional/statements/block-statements/simple-grouping-block.vhdl +++ b/testsuite/vests/vhdl-93/clifton-labs/compliant/functional/statements/block-statements/simple-grouping-block.vhdl @@ -20,7 +20,7 @@ begin -- only begin if delay_line_out = '1' then assert now = 1 ns report "TEST FAILED - delay did not happen as expected!" severity FAILURE; - assert not(now = 1 ns) report "TEST PASSED" severity FAILURE; + assert not(now = 1 ns) report "TEST PASSED" severity WARNING; end if; end process; end only; |