Gabe Black has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/12470 )
Change subject: systemc: Make some tests use cout instead of cerr to report
completion.
......................................................................
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 <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/systemc/tests/systemc/bugs/bug_185/bug_185.cpp
M src/systemc/tests/systemc/datatypes/int/misc/test02/test02.cpp
M
src/systemc/tests/systemc/datatypes/int/string_conversion/test03/test03.cpp
M src/systemc/tests/systemc/datatypes/misc/concat/test02/test02.cpp
M src/systemc/tests/systemc/datatypes/misc/concat/test05/test05.cpp
M
src/systemc/tests/systemc/kernel/dynamic_processes/sc_barrier/test01/test01.cpp
M
src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test01/test01.cpp
M
src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test02/test02.cpp
M
src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test04/test04.cpp
M
src/systemc/tests/systemc/kernel/dynamic_processes/sc_join/test05/test05.cpp
M
src/systemc/tests/systemc/kernel/module_method_after_sc_start/module_method_after_sc_start.cpp
M
src/systemc/tests/systemc/kernel/module_thread_after_sc_start/module_thread_after_sc_start.cpp
M src/systemc/tests/systemc/kernel/phase_callbacks/test01/test01.cpp
M src/systemc/tests/systemc/kernel/phase_callbacks/test02/test02.cpp
M src/systemc/tests/systemc/kernel/sc_elab_and_sim/sc_elab_and_sim.cpp
M src/systemc/tests/systemc/kernel/sc_main_main/sc_main_main.cpp
M src/systemc/tests/systemc/kernel/sc_object_manager/test01/test01.cpp
M src/systemc/tests/systemc/kernel/sc_process_b/test02/test02.cpp
M src/systemc/tests/systemc/kernel/sc_start/time_overflow/time_overflow.cpp
19 files changed, 19 insertions(+), 19 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
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 d314a35..4fa4090 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 @@
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 d27e980..c2fb36c 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 @@
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 a075ba5..0fe142f 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 @@
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 9fbde6a..31f16a9 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 @@
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 8e2559c..87eaf12 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 @@
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 5b8c8a8..0e88f05 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 @@
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 29541f4..2fb48ce 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 @@
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 1431d79..90c4425 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 @@
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 0ca50e2..3dd15ba 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 @@
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 933b124..668f532 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 @@
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 d39696b..a11b302 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 @@
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 4891b99..541cd96 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 @@
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 c4095aa..474162c 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 @@
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 2f4f3c2..eb3e532 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 @@
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 e5cd39e..9205ca7 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 @@
}
}
- 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 4937b27..0d0f60c 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 @@
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 fe82205..92b90ff 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 @@
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 1da5cef..55f9e99 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 @@
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 e02fae3..da97438 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 @@
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;
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/12470
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I9270866a92dd06a23d47c1964dacc4872030f30d
Gerrit-Change-Number: 12470
Gerrit-PatchSet: 7
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Matthias Jung <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
