From 6f49f802b11bcaef6156157666106f76690b13ee Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Sat, 7 Mar 2020 16:59:46 -0500 Subject: [PATCH] Tests: Add fst_identical. --- test_regress/driver.pl | 11 ++++++++++- test_regress/t/t_interface_ref_trace_fst.pl | 3 +-- test_regress/t/t_trace_array_fst.pl | 3 +-- test_regress/t/t_trace_complex_fst.pl | 3 +-- test_regress/t/t_trace_complex_fst_thread.pl | 3 +-- test_regress/t/t_trace_complex_params_fst.pl | 3 +-- test_regress/t/t_trace_complex_structs_fst.pl | 3 +-- test_regress/t/t_trace_fst.pl | 3 +-- test_regress/t/t_trace_packed_struct_fst.pl | 3 +-- test_regress/t/t_trace_two_dumpfst_cc.pl | 3 +-- test_regress/t/t_trace_two_hdrfst_cc.pl | 3 +-- test_regress/t/t_trace_two_portfst_cc.pl | 3 +-- 12 files changed, 21 insertions(+), 23 deletions(-) diff --git a/test_regress/driver.pl b/test_regress/driver.pl index b2560964f..1cb2c5536 100755 --- a/test_regress/driver.pl +++ b/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; diff --git a/test_regress/t/t_interface_ref_trace_fst.pl b/test_regress/t/t_interface_ref_trace_fst.pl index 4f96ba39e..b94b6c15c 100755 --- a/test_regress/t/t_interface_ref_trace_fst.pl +++ b/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"); -vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename}); +fst_identical($Self->trace_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 ac5674592..71df415e7 100755 --- a/test_regress/t/t_trace_array_fst.pl +++ b/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"); -vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename}); +fst_identical($Self->trace_filename, $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 5539602ff..f44a661c8 100755 --- a/test_regress/t/t_trace_complex_fst.pl +++ b/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"); -vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename}); +fst_identical($Self->trace_filename, $Self->{golden_filename}); ok(1); 1; diff --git a/test_regress/t/t_trace_complex_fst_thread.pl b/test_regress/t/t_trace_complex_fst_thread.pl index 9430e48fb..f52f24b8a 100755 --- a/test_regress/t/t_trace_complex_fst_thread.pl +++ b/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"); -vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename}); +fst_identical($Self->trace_filename, $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 cd2aa2f9d..436680ea9 100755 --- a/test_regress/t/t_trace_complex_params_fst.pl +++ b/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"); -vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename}); +fst_identical($Self->trace_filename, $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 60f80c1cd..3a6b98aa1 100755 --- a/test_regress/t/t_trace_complex_structs_fst.pl +++ b/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"); -vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename}); +fst_identical($Self->trace_filename, $Self->{golden_filename}); ok(1); 1; diff --git a/test_regress/t/t_trace_fst.pl b/test_regress/t/t_trace_fst.pl index 54dde9646..5a10032c3 100755 --- a/test_regress/t/t_trace_fst.pl +++ b/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"); -vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename}); +fst_identical($Self->trace_filename, $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 c9ad3c203..259774eea 100755 --- a/test_regress/t/t_trace_packed_struct_fst.pl +++ b/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"); -vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename}); +fst_identical($Self->trace_filename, $Self->{golden_filename}); ok(1); 1; diff --git a/test_regress/t/t_trace_two_dumpfst_cc.pl b/test_regress/t/t_trace_two_dumpfst_cc.pl index f19d777c0..87ce59a99 100755 --- a/test_regress/t/t_trace_two_dumpfst_cc.pl +++ b/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"); - vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename}); + fst_identical($Self->trace_filename, $Self->{golden_filename}); } ok(1); diff --git a/test_regress/t/t_trace_two_hdrfst_cc.pl b/test_regress/t/t_trace_two_hdrfst_cc.pl index 514eca86d..ec1cd5937 100755 --- a/test_regress/t/t_trace_two_hdrfst_cc.pl +++ b/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"); - vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename}); + fst_identical($Self->trace_filename, $Self->{golden_filename}); } ok(1); diff --git a/test_regress/t/t_trace_two_portfst_cc.pl b/test_regress/t/t_trace_two_portfst_cc.pl index cb21e0f34..ce9131110 100755 --- a/test_regress/t/t_trace_two_portfst_cc.pl +++ b/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"); - vcd_identical("$Self->{obj_dir}/simx-fst2vcd.vcd", $Self->{golden_filename}); + fst_identical($Self->trace_filename, $Self->{golden_filename}); } ok(1);