From: Gabe Black <gabeblack@google.com>
Date: Wed, 5 Sep 2018 01:13:23 +0000 (-0700)
Subject: systemc: Make some tests use cout instead of cerr to report completion.
X-Git-Tag: v19.0.0.0~1661
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c7c04755491a38174d74b32e213ae48ebc931a10;p=gem5.git

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 d314a3504..4fa4090a3 100644
--- 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 d27e98062..c2fb36c03 100644
--- 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 a075ba525..0fe142f09 100644
--- 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 9fbde6ae6..31f16a907 100644
--- 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 8e2559ce9..87eaf121f 100644
--- 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 5b8c8a8fe..0e88f059f 100644
--- 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 29541f4f1..2fb48ce93 100644
--- 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 1431d7956..90c442569 100644
--- 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 0ca50e2f3..3dd15bad6 100644
--- 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 933b12499..668f53284 100644
--- 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 d39696b46..a11b30259 100644
--- 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 4891b991d..541cd964c 100644
--- 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 c4095aae3..474162c1a 100644
--- 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 2f4f3c285..eb3e5321d 100644
--- 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 e5cd39efe..9205ca7a1 100644
--- 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 4937b27ff..0d0f60cea 100644
--- 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 fe82205e0..92b90ffa9 100644
--- 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 1da5cefd1..55f9e9903 100644
--- 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 e02fae353..da97438bf 100644
--- 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;
 }