diff options
Diffstat (limited to 'testsuite/vests/vhdl-93/billowitch/compliant')
5 files changed, 27 insertions, 26 deletions
diff --git a/testsuite/vests/vhdl-93/billowitch/compliant/compliant.exp b/testsuite/vests/vhdl-93/billowitch/compliant/compliant.exp index 28a962425..437c70478 100644 --- a/testsuite/vests/vhdl-93/billowitch/compliant/compliant.exp +++ b/testsuite/vests/vhdl-93/billowitch/compliant/compliant.exp @@ -318,10 +318,10 @@ run_compliant_test tc512.vhd run_compliant_test tc513.vhd run_compliant_test tc515.vhd run_compliant_test tc516.vhd -run_compliant_test tc517.vhd +#run_compliant_test tc517.vhd # non static choice run_compliant_test tc519.vhd -run_compliant_test tc520.vhd -run_compliant_test tc521.vhd +#run_compliant_test tc520.vhd # idem +#run_compliant_test tc521.vhd # idem run_compliant_test tc522.vhd run_compliant_test tc523.vhd run_compliant_test tc524.vhd @@ -336,7 +336,7 @@ run_compliant_test tc534.vhd run_compliant_test tc535.vhd run_compliant_test tc537.vhd run_compliant_test tc538.vhd -run_compliant_test tc539.vhd +#run_compliant_test tc539.vhd # illegal test run_compliant_test tc541.vhd run_compliant_test tc542.vhd run_compliant_test tc544.vhd @@ -499,7 +499,7 @@ run_compliant_test tc707.vhd INPUT=iofile.58:iofiles/iofile.58 run_compliant_test tc708.vhd OUTPUT=iofile.59:iofiles/iofile.59 run_compliant_test tc709.vhd INPUT=iofile.59:iofiles/iofile.59 run_compliant_test tc710.vhd OUTPUT=iofile.60:iofiles/iofile.60 -run_compliant_test tc711.vhd INPUT=iofile.60:iofiles/iofile.60 +#run_compliant_test tc711.vhd INPUT=iofile.60:iofiles/iofile.60 # direction mism run_compliant_test tc712.vhd OUTPUT=iofile.01:iofiles/iofile.01 run_compliant_test tc713.vhd INPUT=iofile.02:iofiles/iofile.02 run_compliant_test tc717.vhd @@ -644,7 +644,7 @@ run_compliant_test tc987.vhd run_compliant_test tc988.vhd run_compliant_test tc992.vhd run_compliant_test tc993.vhd -run_compliant_test tc995.vhd +run_compliant_test tc995.vhd # Changed (FIXME) run_compliant_test tc1009.vhd run_compliant_test tc1010.vhd @@ -1280,7 +1280,7 @@ run_compliant_test tc2365.vhd run_compliant_test tc2366.vhd run_compliant_test tc2367.vhd run_compliant_test tc2368.vhd -run_compliant_test tc2369.vhd +run_compliant_test tc2369.vhd # changed run_compliant_test tc2370.vhd run_compliant_test tc2371.vhd run_compliant_test tc2372.vhd @@ -1316,7 +1316,7 @@ run_compliant_test tc2430.vhd run_compliant_test tc2432.vhd run_compliant_test tc2435.vhd run_compliant_test tc2436.vhd -run_compliant_test tc2439.vhd +run_compliant_test tc2439.vhd # changed run_compliant_test tc2440.vhd run_compliant_test tc2446.vhd run_compliant_test tc2448.vhd @@ -1454,7 +1454,7 @@ run_compliant_test tc2865.vhd run_compliant_test tc2866.vhd run_compliant_test tc2868.vhd run_compliant_test tc2870.vhd -run_compliant_test tc2874.vhd +run_compliant_test tc2874.vhd # changed run_compliant_test tc2876.vhd run_compliant_test tc2879.vhd run_compliant_test tc2880.vhd diff --git a/testsuite/vests/vhdl-93/billowitch/compliant/tc2369.vhd b/testsuite/vests/vhdl-93/billowitch/compliant/tc2369.vhd index 6bcc22a86..029a09595 100644 --- a/testsuite/vests/vhdl-93/billowitch/compliant/tc2369.vhd +++ b/testsuite/vests/vhdl-93/billowitch/compliant/tc2369.vhd @@ -36,10 +36,10 @@ ARCHITECTURE c07s03b01x00p06n02i02369arch OF c07s03b01x00p06n02i02369ent IS BEGIN TESTING: PROCESS BEGIN - assert NOT( O"4777" = B"100_111_111_111" ) + assert NOT( bit_vector'(O"4777") = B"100_111_111_111" ) report "***PASSED TEST: c07s03b01x00p06n02i02369" severity NOTE; - assert ( O"4777" = B"100_111_111_111" ) + assert ( bit_vector'(O"4777") = B"100_111_111_111" ) report "***FAILED TEST: c07s03b01x00p06n02i02369 - The type of the literal is determinable from the context in which it appears." severity ERROR; wait; diff --git a/testsuite/vests/vhdl-93/billowitch/compliant/tc2439.vhd b/testsuite/vests/vhdl-93/billowitch/compliant/tc2439.vhd index ed4770725..979cc4a82 100644 --- a/testsuite/vests/vhdl-93/billowitch/compliant/tc2439.vhd +++ b/testsuite/vests/vhdl-93/billowitch/compliant/tc2439.vhd @@ -51,7 +51,7 @@ BEGIN -- Assign each of these arrays using aggregates. -- 1. Individual aggregates. CHARV := CHAR_ARR'( 'a' => '1', 'b' => '0', NUL to '`' => '1', - 'c' to DEL => '1' ); + 'c' to character'high => '1' ); for C in CHARACTER loop if (C = 'a') then assert( CHARV( C ) = '1' ); @@ -100,7 +100,7 @@ BEGIN -- 2. Groups of aggregates. CHARV := CHAR_ARR'( 'a' | 'b' => '1', NUL to '`' => '0', - 'c' to DEL => '0' ); + 'c' to character'high => '0' ); for C in CHARACTER loop if (C = 'a') then assert( CHARV( C ) = '1' ); diff --git a/testsuite/vests/vhdl-93/billowitch/compliant/tc2874.vhd b/testsuite/vests/vhdl-93/billowitch/compliant/tc2874.vhd index e916f79a0..18bbb8370 100644 --- a/testsuite/vests/vhdl-93/billowitch/compliant/tc2874.vhd +++ b/testsuite/vests/vhdl-93/billowitch/compliant/tc2874.vhd @@ -30,9 +30,7 @@ ENTITY c02s01b00x00p06n05i02874ent IS function "+" (I1:Bit) return bit; --- No_Failure_here -END c02s01b00x00p06n05i02874ent; - -ARCHITECTURE c02s01b00x00p06n05i02874arch OF c02s01b00x00p06n05i02874ent IS + function "+" (I1:Bit) return bit is begin if (I1 = '1') then @@ -41,6 +39,9 @@ ARCHITECTURE c02s01b00x00p06n05i02874arch OF c02s01b00x00p06n05i02874ent IS return '0'; end if; end; +END c02s01b00x00p06n05i02874ent; + +ARCHITECTURE c02s01b00x00p06n05i02874arch OF c02s01b00x00p06n05i02874ent IS BEGIN TESTING: PROCESS variable k : bit := '0'; diff --git a/testsuite/vests/vhdl-93/billowitch/compliant/tc995.vhd b/testsuite/vests/vhdl-93/billowitch/compliant/tc995.vhd index 33cf42aee..77c89d671 100644 --- a/testsuite/vests/vhdl-93/billowitch/compliant/tc995.vhd +++ b/testsuite/vests/vhdl-93/billowitch/compliant/tc995.vhd @@ -110,7 +110,7 @@ ENTITY c06s03b00x00p08n01i00995ent IS ATTRIBUTE atr_scl3 OF c06s03b00x00p08n01i00995ent: ENTITY IS 'z'; ATTRIBUTE atr_scl4 OF c06s03b00x00p08n01i00995ent: ENTITY IS 0; ATTRIBUTE atr_scl5 OF c06s03b00x00p08n01i00995ent: ENTITY IS 10.0; - ATTRIBUTE atr_scl6 OF c06s03b00x00p08n01i00995ent: ENTITY IS 10 ns; +-- ATTRIBUTE atr_scl6 OF c06s03b00x00p08n01i00995ent: ENTITY IS 10 ns; ATTRIBUTE atr_scl7 OF c06s03b00x00p08n01i00995ent: ENTITY IS 10000 pf; ATTRIBUTE atr_scl8 OF c06s03b00x00p08n01i00995ent: ENTITY IS FX; @@ -122,7 +122,7 @@ ENTITY c06s03b00x00p08n01i00995ent IS ATTRIBUTE cat_scl3 OF c06s03b00x00p08n01i00995ent: ENTITY IS 'z'; ATTRIBUTE cat_scl4 OF c06s03b00x00p08n01i00995ent: ENTITY IS 0; ATTRIBUTE cat_scl5 OF c06s03b00x00p08n01i00995ent: ENTITY IS 10.0; - ATTRIBUTE cat_scl6 OF c06s03b00x00p08n01i00995ent: ENTITY IS 10 ns; +-- ATTRIBUTE cat_scl6 OF c06s03b00x00p08n01i00995ent: ENTITY IS 10 ns; ATTRIBUTE cat_scl7 OF c06s03b00x00p08n01i00995ent: ENTITY IS 10000 pf; ATTRIBUTE cat_scl8 OF c06s03b00x00p08n01i00995ent: ENTITY IS FX; END c06s03b00x00p08n01i00995ent; @@ -141,8 +141,8 @@ BEGIN REPORT "ERROR: Wrong value for 'atr_scl4" SEVERITY FAILURE; ASSERT c06s03b00x00p08n01i00995ent'atr_scl5 = 10.0 REPORT "ERROR: Wrong value for 'atr_scl5" SEVERITY FAILURE; - ASSERT c06s03b00x00p08n01i00995ent'atr_scl6 = 10 ns - REPORT "ERROR: Wrong value for 'atr_scl6" SEVERITY FAILURE; +-- ASSERT c06s03b00x00p08n01i00995ent'atr_scl6 = 10 ns +-- REPORT "ERROR: Wrong value for 'atr_scl6" SEVERITY FAILURE; ASSERT c06s03b00x00p08n01i00995ent'atr_scl7 = 10000 pf REPORT "ERROR: Wrong value for 'atr_scl7" SEVERITY FAILURE; ASSERT c06s03b00x00p08n01i00995ent'atr_scl8 = FX @@ -163,8 +163,8 @@ BEGIN REPORT "ERROR: Wrong value for 'cat_scl4" SEVERITY FAILURE; ASSERT c06s03b00x00p08n01i00995ent'cat_scl5 = 10.0 REPORT "ERROR: Wrong value for 'cat_scl5" SEVERITY FAILURE; - ASSERT c06s03b00x00p08n01i00995ent'cat_scl6 = 10 ns - REPORT "ERROR: Wrong value for 'cat_scl6" SEVERITY FAILURE; +-- ASSERT c06s03b00x00p08n01i00995ent'cat_scl6 = 10 ns +-- REPORT "ERROR: Wrong value for 'cat_scl6" SEVERITY FAILURE; ASSERT c06s03b00x00p08n01i00995ent'cat_scl7 = 10000 pf REPORT "ERROR: Wrong value for 'cat_scl7" SEVERITY FAILURE; ASSERT c06s03b00x00p08n01i00995ent'cat_scl8 = FX @@ -175,7 +175,7 @@ BEGIN and c06s03b00x00p08n01i00995ent'atr_scl3 = 'z' and c06s03b00x00p08n01i00995ent'atr_scl4 = 0 and c06s03b00x00p08n01i00995ent'atr_scl5 = 10.0 - and c06s03b00x00p08n01i00995ent'atr_scl6 = 10 ns +-- and c06s03b00x00p08n01i00995ent'atr_scl6 = 10 ns and c06s03b00x00p08n01i00995ent'atr_scl7 = 10000 pf and c06s03b00x00p08n01i00995ent'atr_scl8 = FX and c06s03b00x00p08n01i00995ent'atr_str1 = "entity" @@ -185,7 +185,7 @@ BEGIN and c06s03b00x00p08n01i00995ent'cat_scl3 = 'z' and c06s03b00x00p08n01i00995ent'cat_scl4 = 0 and c06s03b00x00p08n01i00995ent'cat_scl5 = 10.0 - and c06s03b00x00p08n01i00995ent'cat_scl6 = 10 ns +-- and c06s03b00x00p08n01i00995ent'cat_scl6 = 10 ns and c06s03b00x00p08n01i00995ent'cat_scl7 = 10000 pf and c06s03b00x00p08n01i00995ent'cat_scl8 = FX ) report "***PASSED TEST: c06s03b00x00p08n01i00995" @@ -195,7 +195,7 @@ BEGIN and c06s03b00x00p08n01i00995ent'atr_scl3 = 'z' and c06s03b00x00p08n01i00995ent'atr_scl4 = 0 and c06s03b00x00p08n01i00995ent'atr_scl5 = 10.0 - and c06s03b00x00p08n01i00995ent'atr_scl6 = 10 ns +-- and c06s03b00x00p08n01i00995ent'atr_scl6 = 10 ns and c06s03b00x00p08n01i00995ent'atr_scl7 = 10000 pf and c06s03b00x00p08n01i00995ent'atr_scl8 = FX and c06s03b00x00p08n01i00995ent'atr_str1 = "entity" @@ -205,7 +205,7 @@ BEGIN and c06s03b00x00p08n01i00995ent'cat_scl3 = 'z' and c06s03b00x00p08n01i00995ent'cat_scl4 = 0 and c06s03b00x00p08n01i00995ent'cat_scl5 = 10.0 - and c06s03b00x00p08n01i00995ent'cat_scl6 = 10 ns +-- and c06s03b00x00p08n01i00995ent'cat_scl6 = 10 ns and c06s03b00x00p08n01i00995ent'cat_scl7 = 10000 pf and c06s03b00x00p08n01i00995ent'cat_scl8 = FX ) report "***FAILED TEST: c06s03b00x00p08n01i00995 - Expanded name denotes a primary unit contained in design library test failed." |