Exit cleanly from testbench on success

Signed-off-by: Anton Blanchard <anton@linux.ibm.com>

diff --git a/countzero_tb.vhdl b/countzero_tb.vhdl
index 21529defeb26c9a814a1c231a047849d82e1b65a..42f6048e7543d92f9490f9b8bfb204c04fc497a7 100644 (file)
--- a/countzero_tb.vhdl
+++ b/countzero_tb.vhdl
@@ -109,7 +109,6 @@ begin
             end loop;
         end loop;
 
-        assert false report "end of test" severity failure;
-        wait;
+       std.env.finish;
     end process;
 end behave;

diff --git a/dcache_tb.vhdl b/dcache_tb.vhdl
index 48c6877a52c303df5cd796a7b0d06c2bcf49dd8d..1e2e07b7be13c5495d6bec3962bd2e0a1f89bb24 100644 (file)
--- a/dcache_tb.vhdl
+++ b/dcache_tb.vhdl
@@ -133,8 +133,6 @@ begin
        wait until rising_edge(clk);
        wait until rising_edge(clk);
 
-        assert false report "end of test" severity failure;
-        wait;
-
+       std.env.finish;
     end process;
 end;

diff --git a/divider_tb.vhdl b/divider_tb.vhdl
index 95156a36c5e590c9c8be5c5913372f3d8288cc0a..01d1d8102364b45450de57d023b12f8a50fb7b0f 100644 (file)
--- a/divider_tb.vhdl
+++ b/divider_tb.vhdl
@@ -547,7 +547,6 @@ begin
             end loop;
         end loop;
 
-        assert false report "end of test" severity failure;
-        wait;
+        std.env.finish;
     end process;
 end behave;

diff --git a/fpga/soc_reset_tb.vhdl b/fpga/soc_reset_tb.vhdl
index 26c6b1e8d780125943cb7592b5c918485d31437d..6c5e1b98dc15257c558d550a5e73c408ecc743a1 100644 (file)
--- a/fpga/soc_reset_tb.vhdl
+++ b/fpga/soc_reset_tb.vhdl
@@ -124,7 +124,6 @@ begin
 
        wait for clk_period;
 
-        assert false report "end of test" severity failure;
-        wait;
+        std.env.finish;
     end process;
 end behave;

diff --git a/icache_tb.vhdl b/icache_tb.vhdl
index 09a644b5c2f33fac2174d3fd14fb536ee5be5c75..828a6102f6b64c6ebd0aeb191e4f055490586bad 100644 (file)
--- a/icache_tb.vhdl
+++ b/icache_tb.vhdl
@@ -147,8 +147,6 @@ begin
 
         i_out.req <= '0';
 
-        assert false report "end of test" severity failure;
-        wait;
-
+        std.env.finish;
     end process;
 end;

diff --git a/multiply_tb.vhdl b/multiply_tb.vhdl
index 8f1d795b7b045d97e65cda646481d712ea7bdb58..ee80de03b2067322de2dc410dabbe52c63586da6 100644 (file)
--- a/multiply_tb.vhdl
+++ b/multiply_tb.vhdl
@@ -247,7 +247,7 @@ begin
                 report "bad mulli expected " & to_hstring(behave_rt) & " got " & to_hstring(m2.write_reg_data);
         end loop;
 
-        assert false report "end of test" severity failure;
+        std.env.finish;
         wait;
     end process;
 end behave;

diff --git a/plru_tb.vhdl b/plru_tb.vhdl
index 18512e49ae9bd5e04b9b8c45af5450b4d7ff0488..1afbd65676fc86e5327fb76747abf7bf0990a7fb 100644 (file)
--- a/plru_tb.vhdl
+++ b/plru_tb.vhdl
@@ -103,7 +103,6 @@ begin
        wait for clk_period;
        report "lru:" & to_hstring(lru);
 
-        assert false report "end of test" severity failure;
-        wait;
+        std.env.finish;
     end process;
 end;

diff --git a/rotator_tb.vhdl b/rotator_tb.vhdl
index 62a09ce6d272685dfdc4b7ca88caca214a7a63de..123058c3e7f392a1f5846a7198e186b0e8ab70c8 100644 (file)
--- a/rotator_tb.vhdl
+++ b/rotator_tb.vhdl
@@ -291,7 +291,6 @@ begin
                report "bad extswsli expected " & to_hstring(behave_ra) & " got " & to_hstring(result);
         end loop;
 
-        assert false report "end of test" severity failure;
-        wait;
+        std.env.finish;
     end process;
 end behave;

diff --git a/wishbone_bram_tb.vhdl b/wishbone_bram_tb.vhdl
index be64db605d022b644870124e822a0c6cf61a9e0f..c4ffedd45d8d957a5bb6d1b167cab2641f6d074b 100644 (file)
--- a/wishbone_bram_tb.vhdl
+++ b/wishbone_bram_tb.vhdl
@@ -169,7 +169,6 @@ begin
         wait until rising_edge(clk);
         assert w_in.ack = '0';
 
-        assert false report "end of test" severity failure;
-        wait;
+        std.env.finish;
     end process;
 end behave;