From a51eb91659d759215422c73165ce2a46ccc7a662 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Wed, 13 Jun 2018 18:41:27 -0700 Subject: [PATCH] systemc: Remove references to internal constants from the tests. The tests were referring to constants defined in the Accellera systemc implementation which identified various log message types. This change replaces those (sometimes quite long) string constants with their actual value. This doesn't make that interface any more fragile since the constant value won't track between the Accellera version and this one, but it does make its fragility more explicit by using the value directly. If in the future we decide to hide the magical nature of those particular string constants, we could make them into our own constants in the implementation. Regardless, the tests shouldn't refer to internal details of the implementation. Change-Id: I116a7407fcac49367649b250683117f3ccf4f9ed Reviewed-on: https://gem5-review.googlesource.com/11181 Reviewed-by: Gabe Black Maintainer: Gabe Black --- .../systemc/bugs/constructor_throw/constructor_throw.cpp | 2 +- .../communication/sc_buffer/test02/sc_buffer_edge_reset.cpp | 5 +++-- .../communication/sc_signal/check_writer/test16/test16.cpp | 2 +- .../phase_callbacks/test04/register_phase_callbacks.cpp | 2 +- .../reset/method_reset_throw/sc_method_reset_throw.cpp | 4 +++- src/systemc/tests/systemc/kernel/sc_time/test19/test19.cpp | 4 ++-- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/systemc/tests/systemc/bugs/constructor_throw/constructor_throw.cpp b/src/systemc/tests/systemc/bugs/constructor_throw/constructor_throw.cpp index 560643bc1..5f5d99081 100644 --- a/src/systemc/tests/systemc/bugs/constructor_throw/constructor_throw.cpp +++ b/src/systemc/tests/systemc/bugs/constructor_throw/constructor_throw.cpp @@ -72,7 +72,7 @@ SC_MODULE(X) { SC_CTOR(X) { - SC_REPORT_ERROR(SC_ID_SET_TIME_RESOLUTION_,""); + SC_REPORT_ERROR("set time resolution failed",""); } }; diff --git a/src/systemc/tests/systemc/communication/sc_buffer/test02/sc_buffer_edge_reset.cpp b/src/systemc/tests/systemc/communication/sc_buffer/test02/sc_buffer_edge_reset.cpp index 98fe8a5bb..863e64ce7 100644 --- a/src/systemc/tests/systemc/communication/sc_buffer/test02/sc_buffer_edge_reset.cpp +++ b/src/systemc/tests/systemc/communication/sc_buffer/test02/sc_buffer_edge_reset.cpp @@ -73,8 +73,9 @@ SC_MODULE(print_edge) int sc_main(int, char*[]) { - sc_report_handler::set_actions( SC_ID_DISABLE_WILL_ORPHAN_PROCESS_ - , SC_DO_NOTHING ); + sc_report_handler::set_actions( "disable() or dont_initialize() " + "called on process with no static sensitivity, it will be " + "orphaned", SC_DO_NOTHING ); sc_signal sig_int; diff --git a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test16/test16.cpp b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test16/test16.cpp index a295b6540..2d7b07398 100644 --- a/src/systemc/tests/systemc/communication/sc_signal/check_writer/test16/test16.cpp +++ b/src/systemc/tests/systemc/communication/sc_signal/check_writer/test16/test16.cpp @@ -147,7 +147,7 @@ int sc_main( int, char*[] ) // report multiple writer errors as warnings sc_core::sc_report_handler::set_actions( - sc_core::SC_ID_MORE_THAN_ONE_SIGNAL_DRIVER_ + "sc_signal cannot have more than one driver" , sc_core::SC_DEFAULT_WARNING_ACTIONS ); diff --git a/src/systemc/tests/systemc/kernel/phase_callbacks/test04/register_phase_callbacks.cpp b/src/systemc/tests/systemc/kernel/phase_callbacks/test04/register_phase_callbacks.cpp index 5ed6dd4f9..a66c6a3f9 100644 --- a/src/systemc/tests/systemc/kernel/phase_callbacks/test04/register_phase_callbacks.cpp +++ b/src/systemc/tests/systemc/kernel/phase_callbacks/test04/register_phase_callbacks.cpp @@ -212,7 +212,7 @@ private: int sc_main(int, char*[]) { // don't run without callbacks enabled - sc_report_handler::set_actions( SC_ID_PHASE_CALLBACKS_UNSUPPORTED_ + sc_report_handler::set_actions( "simulation phase callbacks not enabled" , SC_DEFAULT_ERROR_ACTIONS ); phase_tracer pt; diff --git a/src/systemc/tests/systemc/kernel/process_control/reset/method_reset_throw/sc_method_reset_throw.cpp b/src/systemc/tests/systemc/kernel/process_control/reset/method_reset_throw/sc_method_reset_throw.cpp index c6596f0c7..ab7718a1e 100644 --- a/src/systemc/tests/systemc/kernel/process_control/reset/method_reset_throw/sc_method_reset_throw.cpp +++ b/src/systemc/tests/systemc/kernel/process_control/reset/method_reset_throw/sc_method_reset_throw.cpp @@ -93,7 +93,9 @@ protected: int sc_main (int, char*[]) { - sc_report_handler::set_actions( SC_ID_DISABLE_WILL_ORPHAN_PROCESS_, SC_DO_NOTHING ); + sc_report_handler::set_actions( "disable() or dont_initialize() " + "called on process with no static sensitivity, it will be orphaned", + SC_DO_NOTHING ); sctop top1("Top1"); sc_start(10, SC_NS); return 0; diff --git a/src/systemc/tests/systemc/kernel/sc_time/test19/test19.cpp b/src/systemc/tests/systemc/kernel/sc_time/test19/test19.cpp index c7a7f357c..4e62c1091 100644 --- a/src/systemc/tests/systemc/kernel/sc_time/test19/test19.cpp +++ b/src/systemc/tests/systemc/kernel/sc_time/test19/test19.cpp @@ -59,8 +59,8 @@ void check_time( const sc_time& t, sc_time_unit tu, const std::string & str ) int sc_main( int, char*[] ) { - sc_report_handler::set_actions( SC_ID_SET_TIME_RESOLUTION_, SC_DO_NOTHING ); - sc_report_handler::set_actions( SC_ID_TIME_CONVERSION_FAILED_, SC_DISPLAY ); + sc_report_handler::set_actions( "set time resolution failed", SC_DO_NOTHING ); + sc_report_handler::set_actions( "sc_time conversion failed", SC_DISPLAY ); unsigned resolutions[] = { 100, 10, 1 }; sc_time_unit resunit = SC_FS; -- 2.30.2