From 8d15276625e2ac562e35d9a01bc62669099b86ce Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Thu, 2 May 2019 19:02:40 -0400
Subject: [PATCH] Tests: Use golden_filename consistently.

---
 test_regress/t/t_clocker.pl                   | 2 +-
 test_regress/t/t_order_clkinst.pl             | 2 +-
 test_regress/t/t_preproc_def09.pl             | 2 +-
 test_regress/t/t_preproc_noline.pl            | 2 +-
 test_regress/t/t_preproc_persist.pl           | 2 +-
 test_regress/t/t_preproc_ttempty.pl           | 2 +-
 test_regress/t/t_trace_array_fst.pl           | 2 +-
 test_regress/t/t_trace_cat.pl                 | 2 +-
 test_regress/t/t_trace_complex.pl             | 2 +-
 test_regress/t/t_trace_complex_fst.pl         | 2 +-
 test_regress/t/t_trace_complex_params.pl      | 2 +-
 test_regress/t/t_trace_complex_params_fst.pl  | 2 +-
 test_regress/t/t_trace_complex_structs.pl     | 2 +-
 test_regress/t/t_trace_complex_structs_fst.pl | 2 +-
 test_regress/t/t_trace_ena_cc.pl              | 2 +-
 test_regress/t/t_trace_ena_sc.pl              | 2 +-
 test_regress/t/t_trace_fst.pl                 | 2 +-
 test_regress/t/t_trace_packed_struct_fst.pl   | 2 +-
 test_regress/t/t_trace_timescale.pl           | 2 +-
 test_regress/t/t_var_escape.pl                | 2 +-
 test_regress/t/t_var_nonamebegin.pl           | 2 +-
 test_regress/t/t_verilated_debug.pl           | 2 +-
 test_regress/t/t_vlcov_merge.pl               | 2 +-
 test_regress/t/t_vlcov_rank.pl                | 2 +-
 test_regress/t/t_xml_first.pl                 | 2 +-
 test_regress/t/t_xml_tag.pl                   | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/test_regress/t/t_clocker.pl b/test_regress/t/t_clocker.pl
index 2335cdb17..cb64dcc32 100755
--- a/test_regress/t/t_clocker.pl
+++ b/test_regress/t/t_clocker.pl
@@ -17,7 +17,7 @@ execute(
     check_finished => 1,
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", "t/$Self->{name}.out");
+vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_order_clkinst.pl b/test_regress/t/t_order_clkinst.pl
index 4e593fe93..9eb9fc47d 100755
--- a/test_regress/t/t_order_clkinst.pl
+++ b/test_regress/t/t_order_clkinst.pl
@@ -19,7 +19,7 @@ compile(verilator_flags2 => ["--trace"]);
 
 execute(check_finished => 1);
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", "t/$Self->{name}.out");
+vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_preproc_def09.pl b/test_regress/t/t_preproc_def09.pl
index 35d35492b..ecb86adf2 100755
--- a/test_regress/t/t_preproc_def09.pl
+++ b/test_regress/t/t_preproc_def09.pl
@@ -19,7 +19,7 @@ compile(
     stdout_filename => $stdout_filename,
     );
 
-files_identical($stdout_filename, "t/$Self->{name}.out");
+files_identical($stdout_filename, $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_preproc_noline.pl b/test_regress/t/t_preproc_noline.pl
index 482a70a32..5272f1429 100755
--- a/test_regress/t/t_preproc_noline.pl
+++ b/test_regress/t/t_preproc_noline.pl
@@ -21,7 +21,7 @@ compile(
     stdout_filename => $stdout_filename,
     );
 
-files_identical($stdout_filename, "t/$Self->{name}.out");
+files_identical($stdout_filename, $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_preproc_persist.pl b/test_regress/t/t_preproc_persist.pl
index f0e6d86bb..9b1ed0bf6 100755
--- a/test_regress/t/t_preproc_persist.pl
+++ b/test_regress/t/t_preproc_persist.pl
@@ -24,7 +24,7 @@ compile(
     stdout_filename => $stdout_filename,
     );
 
-files_identical($stdout_filename, "t/$Self->{name}.out");
+files_identical($stdout_filename, $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_preproc_ttempty.pl b/test_regress/t/t_preproc_ttempty.pl
index 519ed2255..9ba0d307f 100755
--- a/test_regress/t/t_preproc_ttempty.pl
+++ b/test_regress/t/t_preproc_ttempty.pl
@@ -23,7 +23,7 @@ compile(
     stdout_filename => $stdout_filename,
     );
 
-files_identical($stdout_filename, "t/$Self->{name}.out");
+files_identical($stdout_filename, $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_trace_array_fst.pl b/test_regress/t/t_trace_array_fst.pl
index 36022e055..ac5674592 100755
--- a/test_regress/t/t_trace_array_fst.pl
+++ b/test_regress/t/t_trace_array_fst.pl
@@ -20,7 +20,7 @@ execute(
     );
 
 fst2vcd($Self->trace_filename, "$Self->{obj_dir}/simx-fst2vcd.vcd");
-vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", "t/$Self->{name}.out");
+vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_trace_cat.pl b/test_regress/t/t_trace_cat.pl
index 8ff497018..78e0ece59 100755
--- a/test_regress/t/t_trace_cat.pl
+++ b/test_regress/t/t_trace_cat.pl
@@ -22,7 +22,7 @@ execute(
 system("cat $Self->{obj_dir}/simpart*.vcd > $Self->{obj_dir}/simall.vcd");
 
 vcd_identical("$Self->{obj_dir}/simall.vcd",
-              "t/$Self->{name}.out");
+              $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_trace_complex.pl b/test_regress/t/t_trace_complex.pl
index fa1699b30..a48d29e99 100755
--- a/test_regress/t/t_trace_complex.pl
+++ b/test_regress/t/t_trace_complex.pl
@@ -27,7 +27,7 @@ file_grep     ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\(/);
 file_grep     ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\(/);
 file_grep     ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\(/);
 
-vcd_identical ("$Self->{obj_dir}/simx.vcd", "t/$Self->{name}.out");
+vcd_identical ("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_trace_complex_fst.pl b/test_regress/t/t_trace_complex_fst.pl
index fd69a15e2..5539602ff 100755
--- a/test_regress/t/t_trace_complex_fst.pl
+++ b/test_regress/t/t_trace_complex_fst.pl
@@ -20,7 +20,7 @@ execute(
     );
 
 fst2vcd($Self->trace_filename, "$Self->{obj_dir}/simx-fst2vcd.vcd");
-vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", "t/$Self->{name}.out");
+vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_trace_complex_params.pl b/test_regress/t/t_trace_complex_params.pl
index 48a06b82e..93d38780e 100755
--- a/test_regress/t/t_trace_complex_params.pl
+++ b/test_regress/t/t_trace_complex_params.pl
@@ -21,7 +21,7 @@ execute(
 
 file_grep     ("$Self->{obj_dir}/simx.vcd", qr/ PARAM /);
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", "t/$Self->{name}.out");
+vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_trace_complex_params_fst.pl b/test_regress/t/t_trace_complex_params_fst.pl
index f3e3b1d6a..4c7feca6d 100755
--- a/test_regress/t/t_trace_complex_params_fst.pl
+++ b/test_regress/t/t_trace_complex_params_fst.pl
@@ -20,7 +20,7 @@ execute(
     );
 
 fst2vcd($Self->trace_filename, "$Self->{obj_dir}/simx-fst2vcd.vcd");
-vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", "t/$Self->{name}.out");
+vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_trace_complex_structs.pl b/test_regress/t/t_trace_complex_structs.pl
index 7f0530dca..66a93a9c9 100755
--- a/test_regress/t/t_trace_complex_structs.pl
+++ b/test_regress/t/t_trace_complex_structs.pl
@@ -29,7 +29,7 @@ file_grep     ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arru\(/);
 file_grep     ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_arrp\(/);
 file_grep     ("$Self->{obj_dir}/simx.vcd", qr/ v_arru_strp\(/);
 
-vcd_identical ("$Self->{obj_dir}/simx.vcd", "t/$Self->{name}.out");
+vcd_identical ("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_trace_complex_structs_fst.pl b/test_regress/t/t_trace_complex_structs_fst.pl
index 54d0d82df..374f928a0 100755
--- a/test_regress/t/t_trace_complex_structs_fst.pl
+++ b/test_regress/t/t_trace_complex_structs_fst.pl
@@ -20,7 +20,7 @@ execute(
     );
 
 fst2vcd($Self->trace_filename, "$Self->{obj_dir}/simx-fst2vcd.vcd");
-vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", "t/$Self->{name}.out");
+vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_trace_ena_cc.pl b/test_regress/t/t_trace_ena_cc.pl
index 6310ec672..33dc0c3eb 100755
--- a/test_regress/t/t_trace_ena_cc.pl
+++ b/test_regress/t/t_trace_ena_cc.pl
@@ -25,7 +25,7 @@ if ($Self->{vlt_all}) {
     file_grep     ("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x);
     file_grep_not ("$Self->{obj_dir}/simx.vcd", qr/inside_sub/x);
 
-    vcd_identical("$Self->{obj_dir}/simx.vcd", "t/$Self->{name}.out");
+    vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
 }
 
 ok(1);
diff --git a/test_regress/t/t_trace_ena_sc.pl b/test_regress/t/t_trace_ena_sc.pl
index 6bf2be6ac..31b811fbe 100755
--- a/test_regress/t/t_trace_ena_sc.pl
+++ b/test_regress/t/t_trace_ena_sc.pl
@@ -27,7 +27,7 @@ else {
         # Note more checks in _cc.pl
         file_grep     ("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/x);
 
-        vcd_identical("$Self->{obj_dir}/simx.vcd", "t/$Self->{name}.out");
+        vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
     }
 }
 
diff --git a/test_regress/t/t_trace_fst.pl b/test_regress/t/t_trace_fst.pl
index c182f8614..a8dfc3cca 100755
--- a/test_regress/t/t_trace_fst.pl
+++ b/test_regress/t/t_trace_fst.pl
@@ -15,7 +15,7 @@ execute(
 );
 
 fst2vcd($Self->trace_filename, "$Self->{obj_dir}/simx-fst2vcd.vcd");
-vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", "t/$Self->{name}.out");
+vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_trace_packed_struct_fst.pl b/test_regress/t/t_trace_packed_struct_fst.pl
index c874f43d0..c9ad3c203 100755
--- a/test_regress/t/t_trace_packed_struct_fst.pl
+++ b/test_regress/t/t_trace_packed_struct_fst.pl
@@ -20,7 +20,7 @@ execute(
     );
 
 fst2vcd($Self->trace_filename, "$Self->{obj_dir}/simx-fst2vcd.vcd");
-vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", "t/$Self->{name}.out");
+vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_trace_timescale.pl b/test_regress/t/t_trace_timescale.pl
index 6d186b276..4185d5102 100755
--- a/test_regress/t/t_trace_timescale.pl
+++ b/test_regress/t/t_trace_timescale.pl
@@ -21,7 +21,7 @@ execute(
     );
 
 vcd_identical("$Self->{obj_dir}/simx.vcd",
-              "t/$Self->{name}.out");
+              $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_var_escape.pl b/test_regress/t/t_var_escape.pl
index a69c233c2..d734136aa 100755
--- a/test_regress/t/t_var_escape.pl
+++ b/test_regress/t/t_var_escape.pl
@@ -25,7 +25,7 @@ if ($Self->{vlt_all}) {
     file_grep     ("$Self->{obj_dir}/simx.vcd", qr/ other\.cyc /);
     file_grep     ("$Self->{obj_dir}/simx.vcd", qr/ module mod\.with_dot /);
     vcd_identical ("$Self->{obj_dir}/simx.vcd",
-                   "t/$Self->{name}.out");
+                   $Self->{golden_filename});
 }
 
 ok(1);
diff --git a/test_regress/t/t_var_nonamebegin.pl b/test_regress/t/t_var_nonamebegin.pl
index 1957c0219..4fc84b7fc 100755
--- a/test_regress/t/t_var_nonamebegin.pl
+++ b/test_regress/t/t_var_nonamebegin.pl
@@ -19,7 +19,7 @@ execute(
 
 if ($Self->{vlt_all}) {
     vcd_identical("$Self->{obj_dir}/simx.vcd",
-                  "t/$Self->{name}.out");
+                  $Self->{golden_filename});
 }
 ok(1);
 1;
diff --git a/test_regress/t/t_verilated_debug.pl b/test_regress/t/t_verilated_debug.pl
index 8258a7869..1e402e0bb 100755
--- a/test_regress/t/t_verilated_debug.pl
+++ b/test_regress/t/t_verilated_debug.pl
@@ -20,7 +20,7 @@ execute(
     );
 
 if (!$Self->{vltmt}) {  # vltmt output may vary between thread exec order
-    files_identical("$Self->{obj_dir}/vlt_sim.log", "t/$Self->{name}.out");
+    files_identical("$Self->{obj_dir}/vlt_sim.log", $Self->{golden_filename});
 }
 
 ok(1);
diff --git a/test_regress/t/t_vlcov_merge.pl b/test_regress/t/t_vlcov_merge.pl
index ee0a4ef0c..d7a011d6b 100755
--- a/test_regress/t/t_vlcov_merge.pl
+++ b/test_regress/t/t_vlcov_merge.pl
@@ -27,7 +27,7 @@ run(cmd => ["sort",
             "> $Self->{obj_dir}/coverage-sort.dat",
     ]);
 
-files_identical("$Self->{obj_dir}/coverage-sort.dat", "t/$Self->{name}.out");
+files_identical("$Self->{obj_dir}/coverage-sort.dat", $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_vlcov_rank.pl b/test_regress/t/t_vlcov_rank.pl
index e3468b6cd..8b367e852 100755
--- a/test_regress/t/t_vlcov_rank.pl
+++ b/test_regress/t/t_vlcov_rank.pl
@@ -20,7 +20,7 @@ run(cmd => ["../bin/verilator_coverage",
     tee => 0,
     );
 
-files_identical("$Self->{obj_dir}/vlcov.log", "t/$Self->{name}.out");
+files_identical("$Self->{obj_dir}/vlcov.log", $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_xml_first.pl b/test_regress/t/t_xml_first.pl
index fa8199153..12cd50808 100755
--- a/test_regress/t/t_xml_first.pl
+++ b/test_regress/t/t_xml_first.pl
@@ -18,7 +18,7 @@ compile(
     make_main => 0,
     );
 
-files_identical("$out_filename", "t/$Self->{name}.out");
+files_identical("$out_filename", $Self->{golden_filename});
 
 ok(1);
 1;
diff --git a/test_regress/t/t_xml_tag.pl b/test_regress/t/t_xml_tag.pl
index fa8199153..12cd50808 100755
--- a/test_regress/t/t_xml_tag.pl
+++ b/test_regress/t/t_xml_tag.pl
@@ -18,7 +18,7 @@ compile(
     make_main => 0,
     );
 
-files_identical("$out_filename", "t/$Self->{name}.out");
+files_identical("$out_filename", $Self->{golden_filename});
 
 ok(1);
 1;