Tests: Add fst_identical.

test_regress/driver.pl

@@ -2075,11 +2075,20 @@ sub fst2vcd {
     if (!$out || $out !~ /Usage:/) { $self->skip("No fst2vcd installed\n"); return 1; }
 
     $cmd = qq{fst2vcd -e "$fn1" -o "$fn2"};
-    print "\t$cmd\n" if $::Debug;
+    print "\t$cmd\n";  # Always print to help debug race cases
     $out = `$cmd`;
     return 1;
 }
 
+sub fst_identical {
+    my $self = (ref $_[0]? shift : $Self);
+    my $fn1 = shift;
+    my $fn2 = shift;
+    my $tmp = $fn1.".vcd";
+    fst2vcd($fn1, $tmp);
+    return vcd_identical($tmp, $fn2);
+}
+
 sub _vcd_read {
     my $self = (ref $_[0]? shift : $Self);
     my $filename = shift;

test_regress/t/t_interface_ref_trace_fst.pl

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

test_regress/t/t_trace_array_fst.pl

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

test_regress/t/t_trace_complex_fst.pl

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

test_regress/t/t_trace_complex_fst_thread.pl

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

test_regress/t/t_trace_complex_params_fst.pl

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

test_regress/t/t_trace_complex_structs_fst.pl

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

test_regress/t/t_trace_fst.pl

@@ -14,8 +14,7 @@ execute(
     check_finished => 1,
 );
 
-fst2vcd($Self->trace_filename, "$Self->{obj_dir}/simx-fst2vcd.vcd");
+fst_identical($Self->trace_filename, $Self->{golden_filename});
-vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename});
 
 ok(1);
 1;

test_regress/t/t_trace_packed_struct_fst.pl

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

test_regress/t/t_trace_two_dumpfst_cc.pl

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

test_regress/t/t_trace_two_hdrfst_cc.pl

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

test_regress/t/t_trace_two_portfst_cc.pl

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