Tests: Cleanup trace_filename use. No test functionality change.

test_regress/t/t_clocker.pl

@@ -17,7 +17,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_cover_line_trace.pl

@@ -28,7 +28,7 @@ run(cmd => ["$ENV{VERILATOR_ROOT}/bin/verilator_coverage",
     );
 
 files_identical("$Self->{obj_dir}/annotated/t_cover_line.v", "t/t_cover_line.out");
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_cover_sva_trace.pl

@@ -19,7 +19,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_force_release_net_trace.pl

@@ -19,7 +19,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_force_release_var_trace.pl

@@ -19,7 +19,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_forceable_net_cmt_trace.pl

@@ -27,7 +27,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_forceable_net_vlt_trace.pl

@@ -27,7 +27,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_forceable_var_cmt_trace.pl

@@ -27,7 +27,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_forceable_var_vlt_trace.pl

@@ -27,7 +27,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_hier_block_trace_vcd.pl

@@ -29,7 +29,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_hier_trace.pl

@@ -18,7 +18,7 @@ execute(
     all_run_flags => ['-j 4'],
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_hier_trace_noinl.pl

@@ -20,7 +20,7 @@ execute(
     all_run_flags => ['-j 4'],
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_lib_nolib.pl

@@ -27,9 +27,9 @@ execute(
 
 if ($Self->{vlt} && $Self->{trace}) {
     # We can see the ports of the secret module
-    file_grep("$Self->{obj_dir}/simx.vcd", qr/accum_in/);
+    file_grep($Self->trace_filename, qr/accum_in/);
     # and we can see what's inside (because we didn't use --protect-lib)
-    file_grep("$Self->{obj_dir}/simx.vcd", qr/secret_/);
+    file_grep($Self->trace_filename, qr/secret_/);
 }
 
 ok(1);

test_regress/t/t_lib_prot.pl

@@ -64,9 +64,9 @@ while (1) {
 
     if ($Self->{vlt} && $Self->{trace}) {
         # We can see the ports of the secret module
-        file_grep("$Self->{obj_dir}/simx.vcd", qr/accum_in/);
+        file_grep($Self->trace_filename, qr/accum_in/);
         # but we can't see what's inside
-        file_grep_not("$Self->{obj_dir}/simx.vcd", qr/secret_/);
+        file_grep_not($Self->trace_filename, qr/secret_/);
     }
 
     ok(1);

test_regress/t/t_lib_prot_clk_gated.pl

@@ -67,9 +67,9 @@ while (1) {
 
     if ($Self->{vlt} && $Self->{trace}) {
         # We can see the ports of the secret module
-        file_grep("$Self->{obj_dir}/simx.vcd", qr/accum_in/);
+        file_grep($Self->trace_filename, qr/accum_in/);
         # but we can't see what's inside
-        file_grep_not("$Self->{obj_dir}/simx.vcd", qr/secret_/);
+        file_grep_not($Self->trace_filename, qr/secret_/);
     }
 
     ok(1);

test_regress/t/t_lib_prot_shared.pl

@@ -70,9 +70,9 @@ while (1) {
 
     if ($Self->{vlt} && $Self->{trace}) {
         # We can see the ports of the secret module
-        file_grep("$Self->{obj_dir}/simx.vcd", qr/accum_in/);
+        file_grep($Self->trace_filename, qr/accum_in/);
         # but we can't see what's inside
-        file_grep_not("$Self->{obj_dir}/simx.vcd", qr/secret_/);
+        file_grep_not($Self->trace_filename, qr/secret_/);
     }
 
     ok(1);

test_regress/t/t_order_clkinst.pl

@@ -20,7 +20,7 @@ compile(verilator_flags2 => ["--trace"]);
 
 execute();
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_split_var_2_trace.pl

@@ -22,7 +22,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 file_grep($Self->{stats}, qr/SplitVar,\s+Split packed variables\s+(\d+)/, 12);
 file_grep($Self->{stats}, qr/SplitVar,\s+Split unpacked arrays\s+(\d+)/, 27);
 

test_regress/t/t_time_vpi_1ms10ns.pl

@@ -24,7 +24,7 @@ execute(
     expect_filename => $Self->{golden_filename},
     );
 
-file_grep("$Self->{obj_dir}/simx.vcd", qr!timescale +10ns!);
+file_grep($Self->trace_filename, qr!timescale +10ns!);
 
 ok(1);
 

test_regress/t/t_time_vpi_1ns1ns.pl

@@ -24,7 +24,7 @@ execute(
     expect_filename => $Self->{golden_filename},
     );
 
-file_grep("$Self->{obj_dir}/simx.vcd", qr!timescale +1ns!);
+file_grep($Self->trace_filename, qr!timescale +1ns!);
 
 ok(1);
 

test_regress/t/t_trace_abort.pl

@@ -18,7 +18,7 @@ execute(
     fails => 1,
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_abort_fst.pl

@@ -20,7 +20,7 @@ execute(
     fails => 1,
     );
 
-fst_identical("$Self->{obj_dir}/simx.fst", $Self->{golden_filename});
+fst_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_abort_fst_sc.pl

@@ -23,7 +23,7 @@ else {
         fails => 1,
         );
 
-    fst_identical("$Self->{obj_dir}/simx.fst", $Self->{golden_filename});
+    fst_identical($Self->trace_filename, $Self->{golden_filename});
 }
 ok(1);
 1;

test_regress/t/t_trace_ascendingrange.pl

@@ -21,7 +21,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_ascendingrange_fst.pl

@@ -23,7 +23,7 @@ compile(
 execute(
     );
 
-fst_identical("$Self->{obj_dir}/simx.fst", $Self->{golden_filename});
+fst_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_ascendingrange_fst_sc.pl

@@ -27,7 +27,7 @@ else {
     execute(
         );
 
-    fst_identical("$Self->{obj_dir}/simx.fst", $Self->{golden_filename});
+    fst_identical($Self->trace_filename, $Self->{golden_filename});
 }
 
 ok(1);

test_regress/t/t_trace_binary.pl

@@ -20,7 +20,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_class.pl

@@ -18,7 +18,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_complex.pl

@@ -17,17 +17,17 @@ compile(
 execute(
     );
 
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/);
-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\[/);
+file_grep($Self->trace_filename, qr/ v_strp /);
+file_grep($Self->trace_filename, qr/ v_strp_strp /);
+file_grep($Self->trace_filename, qr/ v_arrp /);
+file_grep($Self->trace_filename, qr/ v_arrp_arrp /);
+file_grep($Self->trace_filename, qr/ v_arrp_strp /);
+file_grep($Self->trace_filename, qr/ v_arru\[/);
+file_grep($Self->trace_filename, qr/ v_arru_arru\[/);
+file_grep($Self->trace_filename, qr/ v_arru_arrp\[/);
+file_grep($Self->trace_filename, qr/ v_arru_strp\[/);
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_complex_params.pl

@@ -19,9 +19,9 @@ compile(
 execute(
     );
 
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ PARAM /);
+file_grep($Self->trace_filename, qr/ PARAM /);
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_complex_portable.pl

@@ -22,17 +22,17 @@ compile(
 execute(
     );
 
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/);
-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\[/);
+file_grep($Self->trace_filename, qr/ v_strp /);
+file_grep($Self->trace_filename, qr/ v_strp_strp /);
+file_grep($Self->trace_filename, qr/ v_arrp /);
+file_grep($Self->trace_filename, qr/ v_arrp_arrp /);
+file_grep($Self->trace_filename, qr/ v_arrp_strp /);
+file_grep($Self->trace_filename, qr/ v_arru\[/);
+file_grep($Self->trace_filename, qr/ v_arru_arru\[/);
+file_grep($Self->trace_filename, qr/ v_arru_arrp\[/);
+file_grep($Self->trace_filename, qr/ v_arru_strp\[/);
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_complex_structs.pl

@@ -19,17 +19,17 @@ compile(
 execute(
     );
 
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /);
-file_grep_not("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /);
-file_grep_not("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/);
-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\[/);
+file_grep($Self->trace_filename, qr/ v_strp /);
+file_grep($Self->trace_filename, qr/ v_strp_strp /);
+file_grep($Self->trace_filename, qr/ v_arrp /);
+file_grep_not($Self->trace_filename, qr/ v_arrp_arrp /);
+file_grep_not($Self->trace_filename, qr/ v_arrp_strp /);
+file_grep($Self->trace_filename, qr/ v_arru\[/);
+file_grep($Self->trace_filename, qr/ v_arru_arru\[/);
+file_grep($Self->trace_filename, qr/ v_arru_arrp\[/);
+file_grep($Self->trace_filename, qr/ v_arru_strp\[/);
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_complex_threads_1.pl

@@ -20,17 +20,17 @@ compile(
 execute(
     );
 
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_strp_strp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_arrp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arrp_strp /);
-file_grep("$Self->{obj_dir}/simx.vcd", qr/ v_arru\[/);
-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\[/);
+file_grep($Self->trace_filename, qr/ v_strp /);
+file_grep($Self->trace_filename, qr/ v_strp_strp /);
+file_grep($Self->trace_filename, qr/ v_arrp /);
+file_grep($Self->trace_filename, qr/ v_arrp_arrp /);
+file_grep($Self->trace_filename, qr/ v_arrp_strp /);
+file_grep($Self->trace_filename, qr/ v_arru\[/);
+file_grep($Self->trace_filename, qr/ v_arru_arru\[/);
+file_grep($Self->trace_filename, qr/ v_arru_arrp\[/);
+file_grep($Self->trace_filename, qr/ v_arru_strp\[/);
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_dumpvars_dyn_fst_0.pl

@@ -20,7 +20,7 @@ compile(
 execute(
     );
 
-fst_identical("$Self->{obj_dir}/simx.fst", $Self->{golden_filename});
+fst_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_dumpvars_dyn_fst_1.pl

@@ -20,7 +20,7 @@ compile(
 execute(
     );
 
-fst_identical("$Self->{obj_dir}/simx.fst", $Self->{golden_filename});
+fst_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_dumpvars_dyn_vcd_0.pl

@@ -20,7 +20,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_dumpvars_dyn_vcd_1.pl

@@ -20,7 +20,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_empty.pl

@@ -17,7 +17,7 @@ compile(
 execute(
     );
 
-file_grep_not("$Self->{obj_dir}/simx.vcd", qr/var/);
+file_grep_not($Self->trace_filename, qr/var/);
 
 ok(1);
 1;

test_regress/t/t_trace_ena_cc.pl

@@ -22,10 +22,10 @@ execute(
 if ($Self->{vlt_all}) {
     file_grep("$Self->{obj_dir}/V$Self->{name}__Trace__0__Slow.cpp", qr/c_trace_on\"/);
     file_grep_not("$Self->{obj_dir}/V$Self->{name}__Trace__0__Slow.cpp", qr/_trace_off\"/);
-    file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
-    file_grep_not("$Self->{obj_dir}/simx.vcd", qr/inside_sub/);
+    file_grep($Self->trace_filename, qr/\$enddefinitions/);
+    file_grep_not($Self->trace_filename, qr/inside_sub/);
 
-    vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+    vcd_identical($Self->trace_filename, $Self->{golden_filename});
 }
 
 ok(1);

test_regress/t/t_trace_ena_sc.pl

@@ -25,9 +25,9 @@ else {
 
     if ($Self->{vlt_all}) {
         # Note more checks in _cc.pl
-        file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
+        file_grep($Self->trace_filename, qr/\$enddefinitions/);
 
-        vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+        vcd_identical($Self->trace_filename, $Self->{golden_filename});
     }
 }
 

test_regress/t/t_trace_off_cc.pl

@@ -20,7 +20,7 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-    !-r "$Self->{obj_dir}/simx.vcd" or error("Tracing should be off\n");
+    !-r $Self->trace_filename or error("Tracing should be off\n");
 }
 
 ok(1);

test_regress/t/t_trace_off_sc.pl

@@ -20,7 +20,7 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-    !-r "$Self->{obj_dir}/simx.vcd" or error("Tracing should be off\n");
+    !-r $Self->trace_filename or error("Tracing should be off\n");
 }
 
 ok(1);

test_regress/t/t_trace_primitive.pl

@@ -18,7 +18,7 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-   file_grep("$Self->{obj_dir}/simx.vcd", "sub_t_i");
+   file_grep($Self->trace_filename, "sub_t_i");
 };
 
 ok(1);

test_regress/t/t_trace_public_func.pl

@@ -22,7 +22,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_public_func_vlt.pl

@@ -22,7 +22,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_public_sig.pl

@@ -22,10 +22,10 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 # vcd_identical doesn't detect "$var a.b;" vs "$scope module a; $var b;"
-file_grep("$Self->{obj_dir}/simx.vcd", qr/module glbl/);
+file_grep($Self->trace_filename, qr/module glbl/);
 
 ok(1);
 1;

test_regress/t/t_trace_public_sig_vlt.pl

@@ -28,10 +28,10 @@ if ($Self->{vlt_all}) {
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 # vcd_identical doesn't detect "$var a.b;" vs "$scope module a; $var b;"
-file_grep("$Self->{obj_dir}/simx.vcd", qr/module glbl/);
+file_grep($Self->trace_filename, qr/module glbl/);
 
 ok(1);
 1;

test_regress/t/t_trace_scope_vlt.pl

@@ -19,7 +19,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_timescale.pl

@@ -17,7 +17,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd",
+vcd_identical($Self->trace_filename,
               $Self->{golden_filename});
 
 ok(1);

test_regress/t/t_trace_timing1.pl

@@ -21,7 +21,7 @@ compile(
 execute(
     );
 
-vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+vcd_identical($Self->trace_filename, $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_two_dump_cc.pl

@@ -37,8 +37,8 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
-    vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+    file_grep($Self->trace_filename, qr/\$enddefinitions/);
+    vcd_identical($Self->trace_filename, $Self->{golden_filename});
 }
 
 ok(1);

test_regress/t/t_trace_two_dump_sc.pl

@@ -41,8 +41,8 @@ else {
         );
 
     if ($Self->{vlt_all}) {
-        file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
-        vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+        file_grep($Self->trace_filename, qr/\$enddefinitions/);
+        vcd_identical($Self->trace_filename, $Self->{golden_filename});
     }
 }
 

test_regress/t/t_trace_two_hdr_cc.pl

@@ -37,8 +37,8 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
-    vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+    file_grep($Self->trace_filename, qr/\$enddefinitions/);
+    vcd_identical($Self->trace_filename, $Self->{golden_filename});
 }
 
 ok(1);

test_regress/t/t_trace_two_hdr_sc.pl

@@ -41,8 +41,8 @@ else {
         );
 
     if ($Self->{vlt_all}) {
-        file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
-        vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+        file_grep($Self->trace_filename, qr/\$enddefinitions/);
+        vcd_identical($Self->trace_filename, $Self->{golden_filename});
     }
 }
 

test_regress/t/t_trace_two_port_cc.pl

@@ -37,8 +37,8 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
-    vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+    file_grep($Self->trace_filename, qr/\$enddefinitions/);
+    vcd_identical($Self->trace_filename, $Self->{golden_filename});
 }
 
 ok(1);

test_regress/t/t_trace_two_port_sc.pl

@@ -41,8 +41,8 @@ else {
         );
 
     if ($Self->{vlt_all}) {
-        file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
-        vcd_identical("$Self->{obj_dir}/simx.vcd", $Self->{golden_filename});
+        file_grep($Self->trace_filename, qr/\$enddefinitions/);
+        vcd_identical($Self->trace_filename, $Self->{golden_filename});
     }
 }
 

test_regress/t/t_var_escape.pl

@@ -19,12 +19,12 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-    file_grep("$Self->{obj_dir}/simx.vcd", qr/\$enddefinitions/);
+    file_grep($Self->trace_filename, qr/\$enddefinitions/);
     my $sig = quotemeta("bra[ket]slash/dash-colon:9");
-    file_grep("$Self->{obj_dir}/simx.vcd", qr/ $sig/);
-    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", $Self->{golden_filename});
+    file_grep($Self->trace_filename, qr/ $sig/);
+    file_grep($Self->trace_filename, qr/ other\.cyc /);
+    file_grep($Self->trace_filename, qr/ module mod\.with_dot /);
+    vcd_identical($Self->trace_filename, $Self->{golden_filename});
 }
 
 ok(1);

test_regress/t/t_var_nonamebegin.pl

@@ -19,7 +19,7 @@ execute(
     );
 
 if ($Self->{vlt_all}) {
-    vcd_identical("$Self->{obj_dir}/simx.vcd",
+    vcd_identical($Self->trace_filename,
                   $Self->{golden_filename});
 }
 ok(1);