systemc: Make some tests use cout instead of cerr to report completion.

cerr goes to simerr, but we compare simout against the golden output.

Change-Id: I9270866a92dd06a23d47c1964dacc4872030f30d
Reviewed-on: https://gem5-review.googlesource.com/c/12470
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>

diff --git a/src/systemc/tests/systemc/bugs/bug_185/bug_185.cpp b/src/systemc/tests/systemc/bugs/bug_185/bug_185.cpp
index d314a35042537d3ea2e4be106db0e4c43c81ee7f..4fa4090a3aa1319ce91d40257e6ff8b76a0a7568 100644 (file)
--- a/src/systemc/tests/systemc/bugs/bug_185/bug_185.cpp
+++ b/src/systemc/tests/systemc/bugs/bug_185/bug_185.cpp
@@ -21,6 +21,6 @@ int sc_main(int argc, char* argv[])
        cout << "e = " << e << endl;
        cout << "f = " << f << endl;
 
-       cerr << "Program completed" << endl;
+       cout << "Program completed" << endl;
        return 0;
 }

diff --git a/src/systemc/tests/systemc/datatypes/int/misc/test02/test02.cpp b/src/systemc/tests/systemc/datatypes/int/misc/test02/test02.cpp
index d27e98062140995c586d928b4b812947033df492..c2fb36c03b53c8a7067a13d5dcf65c34a7beb77c 100644 (file)
--- a/src/systemc/tests/systemc/datatypes/int/misc/test02/test02.cpp
+++ b/src/systemc/tests/systemc/datatypes/int/misc/test02/test02.cpp
@@ -123,6 +123,6 @@ int sc_main(int, char**)
        TEST("0bus1111111011011100101110101001100001110110010101000011001000010000",
                  0xfedcba9876543210ll);
 
-       cerr << "Program completed" << endl;
+       cout << "Program completed" << endl;
        return 0;
 }

diff --git a/src/systemc/tests/systemc/datatypes/int/string_conversion/test03/test03.cpp b/src/systemc/tests/systemc/datatypes/int/string_conversion/test03/test03.cpp
index a075ba5252bef72710923a0d31534383f61e715e..0fe142f093f58e12400c35e1a67d5a96c8ba4c4d 100644 (file)
--- a/src/systemc/tests/systemc/datatypes/int/string_conversion/test03/test03.cpp
+++ b/src/systemc/tests/systemc/datatypes/int/string_conversion/test03/test03.cpp
@@ -37,7 +37,7 @@ int sc_main(int argc, char* argv[])
        TEST(sc_uint<8>)
        TEST(sc_lv<8>)
        TEST(sc_bv<8>)
-       cerr << "Program completed" << endl;
+       cout << "Program completed" << endl;
 
        return 0;
 }

diff --git a/src/systemc/tests/systemc/datatypes/misc/concat/test02/test02.cpp b/src/systemc/tests/systemc/datatypes/misc/concat/test02/test02.cpp
index 9fbde6ae676d8e13d9e0c1be6a9475ed98aacd2e..31f16a907d64b150d37753c05e0f55ef7aea8484 100644 (file)
--- a/src/systemc/tests/systemc/datatypes/misc/concat/test02/test02.cpp
+++ b/src/systemc/tests/systemc/datatypes/misc/concat/test02/test02.cpp
@@ -193,6 +193,6 @@ int sc_main( int argc, char* argv[] )
        x.clk(clock);
        sc_start(1000, SC_NS);
 
-       cerr << "Program completed\n";
+       cout << "Program completed\n";
        return 0;
 }

diff --git a/src/systemc/tests/systemc/datatypes/misc/concat/test05/test05.cpp b/src/systemc/tests/systemc/datatypes/misc/concat/test05/test05.cpp
index 8e2559ce9d03c898051d2c69dbd0df2765f56abf..87eaf121f1d48781d7cf07648bfe364c5d610ea8 100644 (file)
--- a/src/systemc/tests/systemc/datatypes/misc/concat/test05/test05.cpp
+++ b/src/systemc/tests/systemc/datatypes/misc/concat/test05/test05.cpp
@@ -89,6 +89,6 @@ int sc_main( int argc, char* argv[] )
        COMPARE( 97, sig_sc_int_b )
        COMPARE( 72, sig_sc_uint_b )
 
-       cerr << "Program completed" << endl;
+       cout << "Program completed" << endl;
        return 0;
 }

diff --git a/src/systemc/tests/systemc/kernel/dynamic_processes/sc_barrier/test01/test01.cpp b/src/systemc/tests/systemc/kernel/dynamic_processes/sc_barrier/test01/test01.cpp
index 5b8c8a8fe0b4ac8ee3ba380d67f3874db325b791..0e88f059ff877907ccfa2acc4b064b0330d055e1 100644 (file)
--- a/src/systemc/tests/systemc/kernel/dynamic_processes/sc_barrier/test01/test01.cpp
+++ b/src/systemc/tests/systemc/kernel/dynamic_processes/sc_barrier/test01/test01.cpp
@@ -41,7 +41,7 @@ int sc_main( int argc, char* argv[] )
 
        sc_start(1000, SC_NS);
 
-       cerr << "Program completed" << endl;
+       cout << "Program completed" << endl;
        return 0;
 }
 

diff --git a/src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test01/test01.cpp b/src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test01/test01.cpp
index 29541f4f1db5cb4fc7fb37827021b2c258fa7e38..2fb48ce9302a788505427d390ef056d0f392b360 100644 (file)
--- a/src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test01/test01.cpp
+++ b/src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test01/test01.cpp
@@ -77,7 +77,7 @@ int sc_main( int argc, char* argv[] )
 
        sc_start(1000, SC_NS);
 
-       cerr << "Program completed" << endl;
+       cout << "Program completed" << endl;
        return 0;
 }
 

diff --git a/src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test02/test02.cpp b/src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test02/test02.cpp
index 1431d795631cb0912fb4b913ae538ee7cf26ff9a..90c442569ce7af4ffa16a22e61f85eb5cc647893 100644 (file)
--- a/src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test02/test02.cpp
+++ b/src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test02/test02.cpp
@@ -78,7 +78,7 @@ int sc_main( int argc, char* argv[] )
 
        sc_start(1000, SC_NS);
 
-       cerr << "Program completed" << endl;
+       cout << "Program completed" << endl;
        return 0;
 }
 

diff --git a/src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test04/test04.cpp b/src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test04/test04.cpp
index 0ca50e2f3649cc9c3c75e53ee8d29477479ee451..3dd15bad62af924e78529f244ae2fed67aef30b0 100644 (file)
--- a/src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test04/test04.cpp
+++ b/src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test04/test04.cpp
@@ -85,7 +85,7 @@ int sc_main( int argc, char* argv[] )
 
        sc_start(1000, SC_NS);
 
-       cerr << "Program completed" << endl;
+       cout << "Program completed" << endl;
        return 0;
 }
 

diff --git a/src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test05/test05.cpp b/src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test05/test05.cpp
index 933b124997369612a124fa738eba40c2b93a92c0..668f53284af5846150d2abff045a319f262bd022 100644 (file)
--- a/src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test05/test05.cpp
+++ b/src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test05/test05.cpp
@@ -76,7 +76,7 @@ int sc_main( int argc, char* argv[] )
 
        sc_start(1000, SC_NS);
 
-       cerr << "Program completed" << endl;
+       cout << "Program completed" << endl;
        return 0;
 }
 

diff --git a/src/systemc/tests/systemc/kernel/module_method_after_sc_start/module_method_after_sc_start.cpp b/src/systemc/tests/systemc/kernel/module_method_after_sc_start/module_method_after_sc_start.cpp
index d39696b46de14dc0acde439147bbe1a77da7b825..a11b3025929426352635079786ace29762177165 100644 (file)
--- a/src/systemc/tests/systemc/kernel/module_method_after_sc_start/module_method_after_sc_start.cpp
+++ b/src/systemc/tests/systemc/kernel/module_method_after_sc_start/module_method_after_sc_start.cpp
@@ -33,7 +33,7 @@ int sc_main(int argc, char* arg[])
 
 
        sc_start(10, SC_NS);
-       cerr << "Program completed" << endl;
+       cout << "Program completed" << endl;
 
     return 0;
 }

diff --git a/src/systemc/tests/systemc/kernel/module_thread_after_sc_start/module_thread_after_sc_start.cpp b/src/systemc/tests/systemc/kernel/module_thread_after_sc_start/module_thread_after_sc_start.cpp
index 4891b991db74a22c96586132dd1d28cb1bef9c93..541cd964cefc7b0123bee88f2ae72a7185aaebee 100644 (file)
--- a/src/systemc/tests/systemc/kernel/module_thread_after_sc_start/module_thread_after_sc_start.cpp
+++ b/src/systemc/tests/systemc/kernel/module_thread_after_sc_start/module_thread_after_sc_start.cpp
@@ -33,7 +33,7 @@ int sc_main(int argc, char* arg[])
 
 
        sc_start(10, SC_NS);
-       cerr << "Program completed" << endl;
+       cout << "Program completed" << endl;
 
     return 0;
 }

diff --git a/src/systemc/tests/systemc/kernel/phase_callbacks/test01/test01.cpp b/src/systemc/tests/systemc/kernel/phase_callbacks/test01/test01.cpp
index c4095aae37131993708ac8a3afbf11686cb8c049..474162c1a186a1999ff99d3fca5f1c50ad73137f 100644 (file)
--- a/src/systemc/tests/systemc/kernel/phase_callbacks/test01/test01.cpp
+++ b/src/systemc/tests/systemc/kernel/phase_callbacks/test01/test01.cpp
@@ -50,7 +50,7 @@ int sc_main(int argc, char* argv[])
        if ( !sc_end_of_simulation_invoked() ) 
                 cout << __FILE__ << "(" << __LINE__ << "): bad end flag should be true" << endl;
 
-        cerr << "Program completed" << endl;
+        cout << "Program completed" << endl;
 
     return 0;
 }

diff --git a/src/systemc/tests/systemc/kernel/phase_callbacks/test02/test02.cpp b/src/systemc/tests/systemc/kernel/phase_callbacks/test02/test02.cpp
index 2f4f3c285fd5669fd7229fa6686220fa63e92532..eb3e5321dcdf0163c9ffd5b033c399514fd61832 100644 (file)
--- a/src/systemc/tests/systemc/kernel/phase_callbacks/test02/test02.cpp
+++ b/src/systemc/tests/systemc/kernel/phase_callbacks/test02/test02.cpp
@@ -50,7 +50,7 @@ int sc_main(int argc, char* argv[])
        if ( !sc_end_of_simulation_invoked() ) 
                 cout << __FILE__ << "(" << __LINE__ << "): bad end flag should be true" << endl;
 
-        cerr << "Program completed" << endl;
+        cout << "Program completed" << endl;
 
     return 0;
 }

diff --git a/src/systemc/tests/systemc/kernel/sc_elab_and_sim/sc_elab_and_sim.cpp b/src/systemc/tests/systemc/kernel/sc_elab_and_sim/sc_elab_and_sim.cpp
index e5cd39efe1b2ae67720131ba455f45dbd82d9fa5..9205ca7a16731523bfaa17d64429b81f54d0c4cf 100644 (file)
--- a/src/systemc/tests/systemc/kernel/sc_elab_and_sim/sc_elab_and_sim.cpp
+++ b/src/systemc/tests/systemc/kernel/sc_elab_and_sim/sc_elab_and_sim.cpp
@@ -23,7 +23,7 @@ int sc_main(int argc, char* argv[])
                }
        }
 
-       cerr << "Program completed" << endl;
+       cout << "Program completed" << endl;
 
     return 0;
 }

diff --git a/src/systemc/tests/systemc/kernel/sc_main_main/sc_main_main.cpp b/src/systemc/tests/systemc/kernel/sc_main_main/sc_main_main.cpp
index 4937b27ffad83a8fafb47b08d08d3c507dc73254..0d0f60cea6532916decd6d9426d4d22342fb936c 100644 (file)
--- a/src/systemc/tests/systemc/kernel/sc_main_main/sc_main_main.cpp
+++ b/src/systemc/tests/systemc/kernel/sc_main_main/sc_main_main.cpp
@@ -36,7 +36,7 @@ int sc_main(int argc, char* argv[])
     sc_assert(strcmp(sc_argv()[2], "2") == 0);
     sc_assert(strcmp(sc_argv()[1], "1") == 0);
 
-    cerr << "Program completed" << endl;
+    cout << "Program completed" << endl;
 
     return 0;
 }

diff --git a/src/systemc/tests/systemc/kernel/sc_object_manager/test01/test01.cpp b/src/systemc/tests/systemc/kernel/sc_object_manager/test01/test01.cpp
index fe82205e0c6051b820383e67d84226120bed7f9e..92b90ffa90e1dbc8b458e39b22f8170dcf02e73b 100644 (file)
--- a/src/systemc/tests/systemc/kernel/sc_object_manager/test01/test01.cpp
+++ b/src/systemc/tests/systemc/kernel/sc_object_manager/test01/test01.cpp
@@ -99,6 +99,6 @@ int sc_main(int argc, char* argv[])
        sc_start(1, SC_NS);
 
 
-       cerr << "Program completed" << endl;
+       cout << "Program completed" << endl;
        return 0;
 }

diff --git a/src/systemc/tests/systemc/kernel/sc_process_b/test02/test02.cpp b/src/systemc/tests/systemc/kernel/sc_process_b/test02/test02.cpp
index 1da5cefd1880b0967fb3342abbf90a9efa9362b2..55f9e9903f1a8246bae9bc5b7716dfeb36429af0 100644 (file)
--- a/src/systemc/tests/systemc/kernel/sc_process_b/test02/test02.cpp
+++ b/src/systemc/tests/systemc/kernel/sc_process_b/test02/test02.cpp
@@ -26,6 +26,6 @@ int sc_main(int argc,char **argv)
        tb.m_clk(clock);
        sc_start(2, SC_NS);
 
-       cerr << "Program completed" << endl;
+       cout << "Program completed" << endl;
     return (0); 
 } 

diff --git a/src/systemc/tests/systemc/kernel/sc_start/time_overflow/time_overflow.cpp b/src/systemc/tests/systemc/kernel/sc_start/time_overflow/time_overflow.cpp
index e02fae3538152fedee6f72bec3174aebdf971910..da97438bfc18a8c512f84e4e2fb2aec15da8e77c 100644 (file)
--- a/src/systemc/tests/systemc/kernel/sc_start/time_overflow/time_overflow.cpp
+++ b/src/systemc/tests/systemc/kernel/sc_start/time_overflow/time_overflow.cpp
@@ -45,7 +45,7 @@ int sc_main(int argc, char* argv[])
     sc_start();
     cout << sc_time_stamp() << ": Issuing sc_start(10, SC_NS)" << endl;
     sc_start(10, SC_NS);
-    cerr << sc_time_stamp() << ": Program completed" << endl;
+    cout << sc_time_stamp() << ": Program completed" << endl;
     return 0;
 }