From 7cc40d277b5762783debbdef8b25fd0f03cd8f4d Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sat, 5 Apr 2025 13:46:22 -0400 Subject: [PATCH] Tests: Cleanup some .out filenames. No test coverage change. --- ..._arg_coverage.out => t_assert_ctl_arg.coverage.out} | 0 test_regress/t/t_assert_ctl_arg.py | 2 +- test_regress/t/t_assert_ctl_arg_noinl.py | 2 +- test_regress/t/t_cover_lib.py | 10 +++++----- .../t/{t_cover_lib_1.out => t_cover_lib__1.out} | 0 ...er_instance.out => t_cover_lib__1_per_instance.out} | 0 .../t/{t_cover_lib_2.out => t_cover_lib__2.out} | 0 .../t/{t_cover_lib_3.out => t_cover_lib__3.out} | 0 .../t/{t_cover_lib_4.out => t_cover_lib__4.out} | 0 test_regress/t/t_cover_lib_legacy.py | 8 ++++---- test_regress/t/t_cover_toggle.py | 2 +- ...er_toggle_points.out => t_cover_toggle__points.out} | 0 test_regress/t/t_dpi_logic_bad.out | 4 ---- test_regress/t/t_forceable_net_cmt_trace.py | 2 +- ...ble_net_trace.vcd => t_forceable_net_trace.vcd.out} | 0 test_regress/t/t_forceable_net_vlt_trace.py | 2 +- test_regress/t/t_forceable_var_cmt_trace.py | 2 +- ...ble_var_trace.vcd => t_forceable_var_trace.vcd.out} | 0 test_regress/t/t_forceable_var_vlt_trace.py | 2 +- test_regress/t/t_randomize_array_unsup.out | 8 -------- test_regress/t/t_runflag_bad.py | 10 +++++----- .../t/{t_runflag_bad_a.out => t_runflag_bad__a.out} | 0 .../t/{t_runflag_bad_b.out => t_runflag_bad__b.out} | 0 .../t/{t_runflag_bad_c.out => t_runflag_bad__c.out} | 0 .../t/{t_runflag_bad_d.out => t_runflag_bad__d.out} | 0 .../t/{t_runflag_bad_e.out => t_runflag_bad__e.out} | 0 test_regress/t/t_sys_readmem_4state.py | 6 ++++-- ...em_4state_b.out => t_sys_readmem_4state__b.mem.out} | 0 ...em_4state_h.out => t_sys_readmem_4state__h.mem.out} | 0 test_regress/t/t_sys_readmem_assoc.py | 6 ++++-- ..._assoc_c_b.out => t_sys_readmem_assoc__c_b.mem.out} | 0 ..._assoc_w_h.out => t_sys_readmem_assoc__w_h.mem.out} | 0 test_regress/t/t_trace_cat_fst.py | 4 ++-- ...race_cat_fst_0000.out => t_trace_cat_fst__0000.out} | 0 ...race_cat_fst_0100.out => t_trace_cat_fst__0100.out} | 0 test_regress/t/t_trace_cat_renew.py | 4 ++-- ..._cat_renew_0000.out => t_trace_cat_renew__0000.out} | 0 ..._cat_renew_0100.out => t_trace_cat_renew__0100.out} | 0 test_regress/t/t_trace_cat_reopen.py | 4 ++-- ...at_reopen_0000.out => t_trace_cat_reopen__0000.out} | 0 ...at_reopen_0100.out => t_trace_cat_reopen__0100.out} | 0 test_regress/t/t_wrapper_context.py | 10 ++++++---- ...ontext_top0.out => t_wrapper_context__top0.dat.out} | 0 ...ontext_top1.out => t_wrapper_context__top1.dat.out} | 0 ...xt_trace0.out => t_wrapper_context__trace0.vcd.out} | 0 ...xt_trace1.out => t_wrapper_context__trace1.vcd.out} | 0 46 files changed, 41 insertions(+), 47 deletions(-) rename test_regress/t/{t_assert_ctl_arg_coverage.out => t_assert_ctl_arg.coverage.out} (100%) rename test_regress/t/{t_cover_lib_1.out => t_cover_lib__1.out} (100%) rename test_regress/t/{t_cover_lib_1_per_instance.out => t_cover_lib__1_per_instance.out} (100%) rename test_regress/t/{t_cover_lib_2.out => t_cover_lib__2.out} (100%) rename test_regress/t/{t_cover_lib_3.out => t_cover_lib__3.out} (100%) rename test_regress/t/{t_cover_lib_4.out => t_cover_lib__4.out} (100%) rename test_regress/t/{t_cover_toggle_points.out => t_cover_toggle__points.out} (100%) delete mode 100644 test_regress/t/t_dpi_logic_bad.out rename test_regress/t/{t_forceable_net_trace.vcd => t_forceable_net_trace.vcd.out} (100%) rename test_regress/t/{t_forceable_var_trace.vcd => t_forceable_var_trace.vcd.out} (100%) delete mode 100644 test_regress/t/t_randomize_array_unsup.out rename test_regress/t/{t_runflag_bad_a.out => t_runflag_bad__a.out} (100%) rename test_regress/t/{t_runflag_bad_b.out => t_runflag_bad__b.out} (100%) rename test_regress/t/{t_runflag_bad_c.out => t_runflag_bad__c.out} (100%) rename test_regress/t/{t_runflag_bad_d.out => t_runflag_bad__d.out} (100%) rename test_regress/t/{t_runflag_bad_e.out => t_runflag_bad__e.out} (100%) rename test_regress/t/{t_sys_readmem_4state_b.out => t_sys_readmem_4state__b.mem.out} (100%) rename test_regress/t/{t_sys_readmem_4state_h.out => t_sys_readmem_4state__h.mem.out} (100%) rename test_regress/t/{t_sys_readmem_assoc_c_b.out => t_sys_readmem_assoc__c_b.mem.out} (100%) rename test_regress/t/{t_sys_readmem_assoc_w_h.out => t_sys_readmem_assoc__w_h.mem.out} (100%) rename test_regress/t/{t_trace_cat_fst_0000.out => t_trace_cat_fst__0000.out} (100%) rename test_regress/t/{t_trace_cat_fst_0100.out => t_trace_cat_fst__0100.out} (100%) rename test_regress/t/{t_trace_cat_renew_0000.out => t_trace_cat_renew__0000.out} (100%) rename test_regress/t/{t_trace_cat_renew_0100.out => t_trace_cat_renew__0100.out} (100%) rename test_regress/t/{t_trace_cat_reopen_0000.out => t_trace_cat_reopen__0000.out} (100%) rename test_regress/t/{t_trace_cat_reopen_0100.out => t_trace_cat_reopen__0100.out} (100%) rename test_regress/t/{t_wrapper_context_top0.out => t_wrapper_context__top0.dat.out} (100%) rename test_regress/t/{t_wrapper_context_top1.out => t_wrapper_context__top1.dat.out} (100%) rename test_regress/t/{t_wrapper_context_trace0.out => t_wrapper_context__trace0.vcd.out} (100%) rename test_regress/t/{t_wrapper_context_trace1.out => t_wrapper_context__trace1.vcd.out} (100%) diff --git a/test_regress/t/t_assert_ctl_arg_coverage.out b/test_regress/t/t_assert_ctl_arg.coverage.out similarity index 100% rename from test_regress/t/t_assert_ctl_arg_coverage.out rename to test_regress/t/t_assert_ctl_arg.coverage.out diff --git a/test_regress/t/t_assert_ctl_arg.py b/test_regress/t/t_assert_ctl_arg.py index 812f7c3a0..85f803217 100755 --- a/test_regress/t/t_assert_ctl_arg.py +++ b/test_regress/t/t_assert_ctl_arg.py @@ -19,6 +19,6 @@ test.compile( test.execute(all_run_flags=["+verilator+error+limit+100"], expect_filename=test.golden_filename) -test.files_identical(test.coverage_filename, test.t_dir + "/t_assert_ctl_arg_coverage.out") +test.files_identical(test.coverage_filename, test.t_dir + "/t_assert_ctl_arg.coverage.out") test.passes() diff --git a/test_regress/t/t_assert_ctl_arg_noinl.py b/test_regress/t/t_assert_ctl_arg_noinl.py index b36df045f..a347a3b21 100755 --- a/test_regress/t/t_assert_ctl_arg_noinl.py +++ b/test_regress/t/t_assert_ctl_arg_noinl.py @@ -23,6 +23,6 @@ test.compile(make_top_shell=False, test.execute(all_run_flags=["+verilator+error+limit+100"], expect_filename=test.t_dir + "/t_assert_ctl_arg.out") -test.files_identical(test.coverage_filename, test.t_dir + "/t_assert_ctl_arg_coverage.out") +test.files_identical(test.coverage_filename, test.t_dir + "/t_assert_ctl_arg.coverage.out") test.passes() diff --git a/test_regress/t/t_cover_lib.py b/test_regress/t/t_cover_lib.py index e9df3352d..f2737198c 100755 --- a/test_regress/t/t_cover_lib.py +++ b/test_regress/t/t_cover_lib.py @@ -18,11 +18,11 @@ test.compile(v_flags2=["--coverage t/t_cover_lib_c.cpp"], make_main=False) test.execute() -test.files_identical_sorted(test.obj_dir + "/coverage1.dat", "t/t_cover_lib_1.out") -test.files_identical_sorted(test.obj_dir + "/coverage2.dat", "t/t_cover_lib_2.out") -test.files_identical_sorted(test.obj_dir + "/coverage3.dat", "t/t_cover_lib_3.out") -test.files_identical_sorted(test.obj_dir + "/coverage4.dat", "t/t_cover_lib_4.out") +test.files_identical_sorted(test.obj_dir + "/coverage1.dat", "t/t_cover_lib__1.out") +test.files_identical_sorted(test.obj_dir + "/coverage2.dat", "t/t_cover_lib__2.out") +test.files_identical_sorted(test.obj_dir + "/coverage3.dat", "t/t_cover_lib__3.out") +test.files_identical_sorted(test.obj_dir + "/coverage4.dat", "t/t_cover_lib__4.out") test.files_identical_sorted(test.obj_dir + "/coverage1_per_instance.dat", - "t/t_cover_lib_1_per_instance.out") + "t/t_cover_lib__1_per_instance.out") test.passes() diff --git a/test_regress/t/t_cover_lib_1.out b/test_regress/t/t_cover_lib__1.out similarity index 100% rename from test_regress/t/t_cover_lib_1.out rename to test_regress/t/t_cover_lib__1.out diff --git a/test_regress/t/t_cover_lib_1_per_instance.out b/test_regress/t/t_cover_lib__1_per_instance.out similarity index 100% rename from test_regress/t/t_cover_lib_1_per_instance.out rename to test_regress/t/t_cover_lib__1_per_instance.out diff --git a/test_regress/t/t_cover_lib_2.out b/test_regress/t/t_cover_lib__2.out similarity index 100% rename from test_regress/t/t_cover_lib_2.out rename to test_regress/t/t_cover_lib__2.out diff --git a/test_regress/t/t_cover_lib_3.out b/test_regress/t/t_cover_lib__3.out similarity index 100% rename from test_regress/t/t_cover_lib_3.out rename to test_regress/t/t_cover_lib__3.out diff --git a/test_regress/t/t_cover_lib_4.out b/test_regress/t/t_cover_lib__4.out similarity index 100% rename from test_regress/t/t_cover_lib_4.out rename to test_regress/t/t_cover_lib__4.out diff --git a/test_regress/t/t_cover_lib_legacy.py b/test_regress/t/t_cover_lib_legacy.py index 28ce6b5bf..54ac9630f 100755 --- a/test_regress/t/t_cover_lib_legacy.py +++ b/test_regress/t/t_cover_lib_legacy.py @@ -19,9 +19,9 @@ test.compile(v_flags2=["--coverage t/t_cover_lib_c.cpp"], make_main=False) test.execute() -test.files_identical_sorted(test.obj_dir + "/coverage1.dat", "t/t_cover_lib_1.out") -test.files_identical_sorted(test.obj_dir + "/coverage2.dat", "t/t_cover_lib_2.out") -test.files_identical_sorted(test.obj_dir + "/coverage3.dat", "t/t_cover_lib_3.out") -test.files_identical_sorted(test.obj_dir + "/coverage4.dat", "t/t_cover_lib_4.out") +test.files_identical_sorted(test.obj_dir + "/coverage1.dat", "t/t_cover_lib__1.out") +test.files_identical_sorted(test.obj_dir + "/coverage2.dat", "t/t_cover_lib__2.out") +test.files_identical_sorted(test.obj_dir + "/coverage3.dat", "t/t_cover_lib__3.out") +test.files_identical_sorted(test.obj_dir + "/coverage4.dat", "t/t_cover_lib__4.out") test.passes() diff --git a/test_regress/t/t_cover_toggle.py b/test_regress/t/t_cover_toggle.py index a023aa31c..98bb453ee 100755 --- a/test_regress/t/t_cover_toggle.py +++ b/test_regress/t/t_cover_toggle.py @@ -43,6 +43,6 @@ test.run(cmd=[ verilator_run=True) test.files_identical(test.obj_dir + "/annotated-points/" + test.name + ".v", - "t/" + test.name + "_points.out") + "t/" + test.name + "__points.out") test.passes() diff --git a/test_regress/t/t_cover_toggle_points.out b/test_regress/t/t_cover_toggle__points.out similarity index 100% rename from test_regress/t/t_cover_toggle_points.out rename to test_regress/t/t_cover_toggle__points.out diff --git a/test_regress/t/t_dpi_logic_bad.out b/test_regress/t/t_dpi_logic_bad.out deleted file mode 100644 index 452c462b6..000000000 --- a/test_regress/t/t_dpi_logic_bad.out +++ /dev/null @@ -1,4 +0,0 @@ -%Error: t/t_dpi_logic_bad.v:12:54: DPI function may not return type BASICDTYPE 'logic' (IEEE 1800-2023 35.5.5) - 12 | import "DPI-C" dpii_fa_bit = function logic [2:0] oth_f_int1(input time i); - | ^~~~~~~~~~ -%Error: Exiting due to diff --git a/test_regress/t/t_forceable_net_cmt_trace.py b/test_regress/t/t_forceable_net_cmt_trace.py index 1c67a9f77..50e909840 100755 --- a/test_regress/t/t_forceable_net_cmt_trace.py +++ b/test_regress/t/t_forceable_net_cmt_trace.py @@ -12,7 +12,7 @@ import vltest_bootstrap test.scenarios('simulator') test.pli_filename = "t/t_forceable_net.cpp" test.top_filename = "t/t_forceable_net.v" -test.golden_filename = "t/t_forceable_net_trace.vcd" +test.golden_filename = "t/t_forceable_net_trace.vcd.out" test.compile(make_top_shell=False, make_main=False, diff --git a/test_regress/t/t_forceable_net_trace.vcd b/test_regress/t/t_forceable_net_trace.vcd.out similarity index 100% rename from test_regress/t/t_forceable_net_trace.vcd rename to test_regress/t/t_forceable_net_trace.vcd.out diff --git a/test_regress/t/t_forceable_net_vlt_trace.py b/test_regress/t/t_forceable_net_vlt_trace.py index dfb289e37..f268112b8 100755 --- a/test_regress/t/t_forceable_net_vlt_trace.py +++ b/test_regress/t/t_forceable_net_vlt_trace.py @@ -12,7 +12,7 @@ import vltest_bootstrap test.scenarios('simulator') test.pli_filename = "t/t_forceable_net.cpp" test.top_filename = "t/t_forceable_net.v" -test.golden_filename = "t/t_forceable_net_trace.vcd" +test.golden_filename = "t/t_forceable_net_trace.vcd.out" test.compile(make_top_shell=False, make_main=False, diff --git a/test_regress/t/t_forceable_var_cmt_trace.py b/test_regress/t/t_forceable_var_cmt_trace.py index 2903764cf..47c930538 100755 --- a/test_regress/t/t_forceable_var_cmt_trace.py +++ b/test_regress/t/t_forceable_var_cmt_trace.py @@ -12,7 +12,7 @@ import vltest_bootstrap test.scenarios('simulator') test.pli_filename = "t/t_forceable_var.cpp" test.top_filename = "t/t_forceable_var.v" -test.golden_filename = "t/t_forceable_var_trace.vcd" +test.golden_filename = "t/t_forceable_var_trace.vcd.out" test.compile(make_top_shell=False, make_main=False, diff --git a/test_regress/t/t_forceable_var_trace.vcd b/test_regress/t/t_forceable_var_trace.vcd.out similarity index 100% rename from test_regress/t/t_forceable_var_trace.vcd rename to test_regress/t/t_forceable_var_trace.vcd.out diff --git a/test_regress/t/t_forceable_var_vlt_trace.py b/test_regress/t/t_forceable_var_vlt_trace.py index 65a829dbe..569ee7f09 100755 --- a/test_regress/t/t_forceable_var_vlt_trace.py +++ b/test_regress/t/t_forceable_var_vlt_trace.py @@ -12,7 +12,7 @@ import vltest_bootstrap test.scenarios('simulator') test.pli_filename = "t/t_forceable_var.cpp" test.top_filename = "t/t_forceable_var.v" -test.golden_filename = "t/t_forceable_var_trace.vcd" +test.golden_filename = "t/t_forceable_var_trace.vcd.out" test.compile(make_top_shell=False, make_main=False, diff --git a/test_regress/t/t_randomize_array_unsup.out b/test_regress/t/t_randomize_array_unsup.out deleted file mode 100644 index e65a4c03c..000000000 --- a/test_regress/t/t_randomize_array_unsup.out +++ /dev/null @@ -1,8 +0,0 @@ -%Error-UNSUPPORTED: t/t_randomize_array_unsup.v:28:8: Unsupported: CreateArrayForeachLoop currently does not support this data type. (Struct-Array unconstrained randomization is not fully supported) - 28 | rand simple_struct_t struct_array_2[]; - | ^~~~~~~~~~~~~~~ - ... For error description see https://verilator.org/warn/UNSUPPORTED?v=latest -%Error-UNSUPPORTED: t/t_randomize_array_unsup.v:29:8: Unsupported: CreateArrayForeachLoop currently does not support this data type. (Struct-Array unconstrained randomization is not fully supported) - 29 | rand simple_struct_t struct_array_1[3]; - | ^~~~~~~~~~~~~~~ -%Error: Exiting due to diff --git a/test_regress/t/t_runflag_bad.py b/test_regress/t/t_runflag_bad.py index fc3933b43..8a3c712a5 100755 --- a/test_regress/t/t_runflag_bad.py +++ b/test_regress/t/t_runflag_bad.py @@ -15,22 +15,22 @@ test.compile() test.execute(all_run_flags=["+verilator+bad+flag+testing"], fails=True, - expect_filename="t/" + test.name + "_a.out") + expect_filename="t/" + test.name + "__a.out") test.execute(all_run_flags=["+verilator+rand+reset+-1"], fails=True, - expect_filename="t/" + test.name + "_b.out") + expect_filename="t/" + test.name + "__b.out") test.execute(all_run_flags=["+verilator+rand+reset+3"], fails=True, - expect_filename="t/" + test.name + "_c.out") + expect_filename="t/" + test.name + "__c.out") test.execute(all_run_flags=["+verilator+prof+exec+window+0"], fails=True, - expect_filename="t/" + test.name + "_d.out") + expect_filename="t/" + test.name + "__d.out") test.execute(all_run_flags=["+verilator+prof+exec+window+1000000000000000000000000"], fails=True, - expect_filename="t/" + test.name + "_e.out") + expect_filename="t/" + test.name + "__e.out") test.passes() diff --git a/test_regress/t/t_runflag_bad_a.out b/test_regress/t/t_runflag_bad__a.out similarity index 100% rename from test_regress/t/t_runflag_bad_a.out rename to test_regress/t/t_runflag_bad__a.out diff --git a/test_regress/t/t_runflag_bad_b.out b/test_regress/t/t_runflag_bad__b.out similarity index 100% rename from test_regress/t/t_runflag_bad_b.out rename to test_regress/t/t_runflag_bad__b.out diff --git a/test_regress/t/t_runflag_bad_c.out b/test_regress/t/t_runflag_bad__c.out similarity index 100% rename from test_regress/t/t_runflag_bad_c.out rename to test_regress/t/t_runflag_bad__c.out diff --git a/test_regress/t/t_runflag_bad_d.out b/test_regress/t/t_runflag_bad__d.out similarity index 100% rename from test_regress/t/t_runflag_bad_d.out rename to test_regress/t/t_runflag_bad__d.out diff --git a/test_regress/t/t_runflag_bad_e.out b/test_regress/t/t_runflag_bad__e.out similarity index 100% rename from test_regress/t/t_runflag_bad_e.out rename to test_regress/t/t_runflag_bad__e.out diff --git a/test_regress/t/t_sys_readmem_4state.py b/test_regress/t/t_sys_readmem_4state.py index 3995ab993..42497e676 100755 --- a/test_regress/t/t_sys_readmem_4state.py +++ b/test_regress/t/t_sys_readmem_4state.py @@ -15,7 +15,9 @@ test.compile(verilator_flags2=["--x-initial unique"]) test.execute(all_run_flags=["+verilator+rand+reset+1"]) -test.files_identical(test.obj_dir + "/t_sys_readmem_4state_b.mem", "t/t_sys_readmem_4state_b.out") -test.files_identical(test.obj_dir + "/t_sys_readmem_4state_h.mem", "t/t_sys_readmem_4state_h.out") +test.files_identical(test.obj_dir + "/t_sys_readmem_4state_b.mem", + "t/t_sys_readmem_4state__b.mem.out") +test.files_identical(test.obj_dir + "/t_sys_readmem_4state_h.mem", + "t/t_sys_readmem_4state__h.mem.out") test.passes() diff --git a/test_regress/t/t_sys_readmem_4state_b.out b/test_regress/t/t_sys_readmem_4state__b.mem.out similarity index 100% rename from test_regress/t/t_sys_readmem_4state_b.out rename to test_regress/t/t_sys_readmem_4state__b.mem.out diff --git a/test_regress/t/t_sys_readmem_4state_h.out b/test_regress/t/t_sys_readmem_4state__h.mem.out similarity index 100% rename from test_regress/t/t_sys_readmem_4state_h.out rename to test_regress/t/t_sys_readmem_4state__h.mem.out diff --git a/test_regress/t/t_sys_readmem_assoc.py b/test_regress/t/t_sys_readmem_assoc.py index 78cda062b..3ce8d6049 100755 --- a/test_regress/t/t_sys_readmem_assoc.py +++ b/test_regress/t/t_sys_readmem_assoc.py @@ -15,7 +15,9 @@ test.compile() test.execute() -test.files_identical(test.obj_dir + "/t_sys_writemem_c_b.mem", "t/t_sys_readmem_assoc_c_b.out") -test.files_identical(test.obj_dir + "/t_sys_writemem_w_h.mem", "t/t_sys_readmem_assoc_w_h.out") +test.files_identical(test.obj_dir + "/t_sys_writemem_c_b.mem", + "t/t_sys_readmem_assoc__c_b.mem.out") +test.files_identical(test.obj_dir + "/t_sys_writemem_w_h.mem", + "t/t_sys_readmem_assoc__w_h.mem.out") test.passes() diff --git a/test_regress/t/t_sys_readmem_assoc_c_b.out b/test_regress/t/t_sys_readmem_assoc__c_b.mem.out similarity index 100% rename from test_regress/t/t_sys_readmem_assoc_c_b.out rename to test_regress/t/t_sys_readmem_assoc__c_b.mem.out diff --git a/test_regress/t/t_sys_readmem_assoc_w_h.out b/test_regress/t/t_sys_readmem_assoc__w_h.mem.out similarity index 100% rename from test_regress/t/t_sys_readmem_assoc_w_h.out rename to test_regress/t/t_sys_readmem_assoc__w_h.mem.out diff --git a/test_regress/t/t_trace_cat_fst.py b/test_regress/t/t_trace_cat_fst.py index 9f94e690c..f5ba2fd2e 100755 --- a/test_regress/t/t_trace_cat_fst.py +++ b/test_regress/t/t_trace_cat_fst.py @@ -17,7 +17,7 @@ test.compile(make_top_shell=False, test.execute() -test.fst_identical(test.obj_dir + "/simpart_0000.fst", "t/" + test.name + "_0000.out") -test.fst_identical(test.obj_dir + "/simpart_0100.fst", "t/" + test.name + "_0100.out") +test.fst_identical(test.obj_dir + "/simpart_0000.fst", "t/" + test.name + "__0000.out") +test.fst_identical(test.obj_dir + "/simpart_0100.fst", "t/" + test.name + "__0100.out") test.passes() diff --git a/test_regress/t/t_trace_cat_fst_0000.out b/test_regress/t/t_trace_cat_fst__0000.out similarity index 100% rename from test_regress/t/t_trace_cat_fst_0000.out rename to test_regress/t/t_trace_cat_fst__0000.out diff --git a/test_regress/t/t_trace_cat_fst_0100.out b/test_regress/t/t_trace_cat_fst__0100.out similarity index 100% rename from test_regress/t/t_trace_cat_fst_0100.out rename to test_regress/t/t_trace_cat_fst__0100.out diff --git a/test_regress/t/t_trace_cat_renew.py b/test_regress/t/t_trace_cat_renew.py index 8f81fd65e..e973db65f 100755 --- a/test_regress/t/t_trace_cat_renew.py +++ b/test_regress/t/t_trace_cat_renew.py @@ -19,7 +19,7 @@ test.compile(make_top_shell=False, test.execute() -test.vcd_identical(test.obj_dir + "/simpart_0000.vcd", "t/" + test.name + "_0000.out") -test.vcd_identical(test.obj_dir + "/simpart_0100.vcd", "t/" + test.name + "_0100.out") +test.vcd_identical(test.obj_dir + "/simpart_0000.vcd", "t/" + test.name + "__0000.out") +test.vcd_identical(test.obj_dir + "/simpart_0100.vcd", "t/" + test.name + "__0100.out") test.passes() diff --git a/test_regress/t/t_trace_cat_renew_0000.out b/test_regress/t/t_trace_cat_renew__0000.out similarity index 100% rename from test_regress/t/t_trace_cat_renew_0000.out rename to test_regress/t/t_trace_cat_renew__0000.out diff --git a/test_regress/t/t_trace_cat_renew_0100.out b/test_regress/t/t_trace_cat_renew__0100.out similarity index 100% rename from test_regress/t/t_trace_cat_renew_0100.out rename to test_regress/t/t_trace_cat_renew__0100.out diff --git a/test_regress/t/t_trace_cat_reopen.py b/test_regress/t/t_trace_cat_reopen.py index 8f81fd65e..e973db65f 100755 --- a/test_regress/t/t_trace_cat_reopen.py +++ b/test_regress/t/t_trace_cat_reopen.py @@ -19,7 +19,7 @@ test.compile(make_top_shell=False, test.execute() -test.vcd_identical(test.obj_dir + "/simpart_0000.vcd", "t/" + test.name + "_0000.out") -test.vcd_identical(test.obj_dir + "/simpart_0100.vcd", "t/" + test.name + "_0100.out") +test.vcd_identical(test.obj_dir + "/simpart_0000.vcd", "t/" + test.name + "__0000.out") +test.vcd_identical(test.obj_dir + "/simpart_0100.vcd", "t/" + test.name + "__0100.out") test.passes() diff --git a/test_regress/t/t_trace_cat_reopen_0000.out b/test_regress/t/t_trace_cat_reopen__0000.out similarity index 100% rename from test_regress/t/t_trace_cat_reopen_0000.out rename to test_regress/t/t_trace_cat_reopen__0000.out diff --git a/test_regress/t/t_trace_cat_reopen_0100.out b/test_regress/t/t_trace_cat_reopen__0100.out similarity index 100% rename from test_regress/t/t_trace_cat_reopen_0100.out rename to test_regress/t/t_trace_cat_reopen__0100.out diff --git a/test_regress/t/t_wrapper_context.py b/test_regress/t/t_wrapper_context.py index 8463741ab..d6fa7e7c0 100755 --- a/test_regress/t/t_wrapper_context.py +++ b/test_regress/t/t_wrapper_context.py @@ -20,10 +20,12 @@ test.compile( make_flags=['CPPFLAGS_ADD=-DVL_NO_LEGACY']) test.execute() -test.files_identical_sorted(test.obj_dir + "/coverage_top0.dat", "t/t_wrapper_context_top0.out") -test.files_identical_sorted(test.obj_dir + "/coverage_top1.dat", "t/t_wrapper_context_top1.out") +test.files_identical_sorted(test.obj_dir + "/coverage_top0.dat", + "t/t_wrapper_context__top0.dat.out") +test.files_identical_sorted(test.obj_dir + "/coverage_top1.dat", + "t/t_wrapper_context__top1.dat.out") -test.vcd_identical(test.obj_dir + "/trace0.vcd", "t/t_wrapper_context_trace0.out") -test.vcd_identical(test.obj_dir + "/trace1.vcd", "t/t_wrapper_context_trace1.out") +test.vcd_identical(test.obj_dir + "/trace0.vcd", "t/t_wrapper_context__trace0.vcd.out") +test.vcd_identical(test.obj_dir + "/trace1.vcd", "t/t_wrapper_context__trace1.vcd.out") test.passes() diff --git a/test_regress/t/t_wrapper_context_top0.out b/test_regress/t/t_wrapper_context__top0.dat.out similarity index 100% rename from test_regress/t/t_wrapper_context_top0.out rename to test_regress/t/t_wrapper_context__top0.dat.out diff --git a/test_regress/t/t_wrapper_context_top1.out b/test_regress/t/t_wrapper_context__top1.dat.out similarity index 100% rename from test_regress/t/t_wrapper_context_top1.out rename to test_regress/t/t_wrapper_context__top1.dat.out diff --git a/test_regress/t/t_wrapper_context_trace0.out b/test_regress/t/t_wrapper_context__trace0.vcd.out similarity index 100% rename from test_regress/t/t_wrapper_context_trace0.out rename to test_regress/t/t_wrapper_context__trace0.vcd.out diff --git a/test_regress/t/t_wrapper_context_trace1.out b/test_regress/t/t_wrapper_context__trace1.vcd.out similarity index 100% rename from test_regress/t/t_wrapper_context_trace1.out rename to test_regress/t/t_wrapper_context__trace1.vcd.out