From 1166728a8d055420dc49f610de92f92018da5a24 Mon Sep 17 00:00:00 2001 From: Geza Lore Date: Mon, 19 Jul 2021 17:46:17 +0100 Subject: [PATCH] Tests: make t_trace_*two* tests less sensitive to file names No functional change intended --- test_regress/t/t_trace_two_cc.cpp | 7 +------ test_regress/t/t_trace_two_dump_cc.pl | 5 +++++ test_regress/t/t_trace_two_dump_sc.pl | 5 +++++ test_regress/t/t_trace_two_dumpfst_cc.pl | 5 +++++ test_regress/t/t_trace_two_hdr_cc.pl | 5 +++++ test_regress/t/t_trace_two_hdr_sc.pl | 5 +++++ test_regress/t/t_trace_two_hdrfst_cc.pl | 5 +++++ test_regress/t/t_trace_two_port_cc.pl | 5 +++++ test_regress/t/t_trace_two_port_sc.pl | 5 +++++ test_regress/t/t_trace_two_portfst_cc.pl | 5 +++++ test_regress/t/t_trace_two_sc.cpp | 7 +------ 11 files changed, 47 insertions(+), 12 deletions(-) diff --git a/test_regress/t/t_trace_two_cc.cpp b/test_regress/t/t_trace_two_cc.cpp index 02c639418..238877e5f 100644 --- a/test_regress/t/t_trace_two_cc.cpp +++ b/test_regress/t/t_trace_two_cc.cpp @@ -21,12 +21,7 @@ // clang-format on // Compile in place -#include "Vt_trace_two_b.cpp" -#include "Vt_trace_two_b__Syms.cpp" -#include "Vt_trace_two_b___024root.cpp" -#include "Vt_trace_two_b___024root__Slow.cpp" -#include "Vt_trace_two_b__Trace.cpp" -#include "Vt_trace_two_b__Trace__Slow.cpp" +#include "Vt_trace_two_b__ALL.cpp" VM_PREFIX* ap; Vt_trace_two_b* bp; diff --git a/test_regress/t/t_trace_two_dump_cc.pl b/test_regress/t/t_trace_two_dump_cc.pl index 0b20803a9..d4643e039 100755 --- a/test_regress/t/t_trace_two_dump_cc.pl +++ b/test_regress/t/t_trace_two_dump_cc.pl @@ -21,6 +21,11 @@ compile( verilator_flags2 => ['-trace'], ); +run( + logfile => "$Self->{obj_dir}/make_first_ALL.log", + cmd => ["make", "-C", "$Self->{obj_dir}", "-f", "Vt_trace_two_b.mk", "Vt_trace_two_b__ALL.cpp"] + ); + compile( make_main => 0, top_filename => 't_trace_two_a.v', diff --git a/test_regress/t/t_trace_two_dump_sc.pl b/test_regress/t/t_trace_two_dump_sc.pl index 311848fe7..dd789a58b 100755 --- a/test_regress/t/t_trace_two_dump_sc.pl +++ b/test_regress/t/t_trace_two_dump_sc.pl @@ -24,6 +24,11 @@ else { verilator_flags2 => ['-sc -trace'], ); + run( + logfile => "$Self->{obj_dir}/make_first_ALL.log", + cmd => ["make", "-C", "$Self->{obj_dir}", "-f", "Vt_trace_two_b.mk", "Vt_trace_two_b__ALL.cpp"] + ); + compile( make_main => 0, top_filename => 't_trace_two_a.v', diff --git a/test_regress/t/t_trace_two_dumpfst_cc.pl b/test_regress/t/t_trace_two_dumpfst_cc.pl index 37f00db1c..4c1b2c968 100755 --- a/test_regress/t/t_trace_two_dumpfst_cc.pl +++ b/test_regress/t/t_trace_two_dumpfst_cc.pl @@ -21,6 +21,11 @@ compile( verilator_flags2 => ['--trace-fst --trace-threads 1 -DTEST_FST'], ); +run( + logfile => "$Self->{obj_dir}/make_first_ALL.log", + cmd => ["make", "-C", "$Self->{obj_dir}", "-f", "Vt_trace_two_b.mk", "Vt_trace_two_b__ALL.cpp"] + ); + compile( make_main => 0, top_filename => 't_trace_two_a.v', diff --git a/test_regress/t/t_trace_two_hdr_cc.pl b/test_regress/t/t_trace_two_hdr_cc.pl index 352e12450..f0c386bbb 100755 --- a/test_regress/t/t_trace_two_hdr_cc.pl +++ b/test_regress/t/t_trace_two_hdr_cc.pl @@ -21,6 +21,11 @@ compile( verilator_flags2 => ['-trace'], ); +run( + logfile => "$Self->{obj_dir}/make_first_ALL.log", + cmd => ["make", "-C", "$Self->{obj_dir}", "-f", "Vt_trace_two_b.mk", "Vt_trace_two_b__ALL.cpp"] + ); + compile( make_main => 0, top_filename => 't_trace_two_a.v', diff --git a/test_regress/t/t_trace_two_hdr_sc.pl b/test_regress/t/t_trace_two_hdr_sc.pl index b62a58aef..8374fcfee 100755 --- a/test_regress/t/t_trace_two_hdr_sc.pl +++ b/test_regress/t/t_trace_two_hdr_sc.pl @@ -24,6 +24,11 @@ else { verilator_flags2 => ['-sc -trace'], ); + run( + logfile => "$Self->{obj_dir}/make_first_ALL.log", + cmd => ["make", "-C", "$Self->{obj_dir}", "-f", "Vt_trace_two_b.mk", "Vt_trace_two_b__ALL.cpp"] + ); + compile( make_main => 0, top_filename => 't_trace_two_a.v', diff --git a/test_regress/t/t_trace_two_hdrfst_cc.pl b/test_regress/t/t_trace_two_hdrfst_cc.pl index cbdae9a87..af0d8307f 100755 --- a/test_regress/t/t_trace_two_hdrfst_cc.pl +++ b/test_regress/t/t_trace_two_hdrfst_cc.pl @@ -21,6 +21,11 @@ compile( verilator_flags2 => ['--trace-fst --trace-threads 1'], ); +run( + logfile => "$Self->{obj_dir}/make_first_ALL.log", + cmd => ["make", "-C", "$Self->{obj_dir}", "-f", "Vt_trace_two_b.mk", "Vt_trace_two_b__ALL.cpp"] + ); + compile( make_main => 0, top_filename => 't_trace_two_a.v', diff --git a/test_regress/t/t_trace_two_port_cc.pl b/test_regress/t/t_trace_two_port_cc.pl index c35b91acb..7e348f19b 100755 --- a/test_regress/t/t_trace_two_port_cc.pl +++ b/test_regress/t/t_trace_two_port_cc.pl @@ -21,6 +21,11 @@ compile( verilator_flags2 => ['-trace'], ); +run( + logfile => "$Self->{obj_dir}/make_first_ALL.log", + cmd => ["make", "-C", "$Self->{obj_dir}", "-f", "Vt_trace_two_b.mk", "Vt_trace_two_b__ALL.cpp"] + ); + compile( make_main => 0, top_filename => 't_trace_two_a.v', diff --git a/test_regress/t/t_trace_two_port_sc.pl b/test_regress/t/t_trace_two_port_sc.pl index 84676c3a8..e62e64a3b 100755 --- a/test_regress/t/t_trace_two_port_sc.pl +++ b/test_regress/t/t_trace_two_port_sc.pl @@ -24,6 +24,11 @@ else { verilator_flags2 => ['-sc -trace'], ); + run( + logfile => "$Self->{obj_dir}/make_first_ALL.log", + cmd => ["make", "-C", "$Self->{obj_dir}", "-f", "Vt_trace_two_b.mk", "Vt_trace_two_b__ALL.cpp"] + ); + compile( make_main => 0, top_filename => 't_trace_two_a.v', diff --git a/test_regress/t/t_trace_two_portfst_cc.pl b/test_regress/t/t_trace_two_portfst_cc.pl index 689296b42..676bfb508 100755 --- a/test_regress/t/t_trace_two_portfst_cc.pl +++ b/test_regress/t/t_trace_two_portfst_cc.pl @@ -21,6 +21,11 @@ compile( verilator_flags2 => ['--trace-fst --trace-threads 1'], ); +run( + logfile => "$Self->{obj_dir}/make_first_ALL.log", + cmd => ["make", "-C", "$Self->{obj_dir}", "-f", "Vt_trace_two_b.mk", "Vt_trace_two_b__ALL.cpp"] + ); + compile( make_main => 0, top_filename => 't_trace_two_a.v', diff --git a/test_regress/t/t_trace_two_sc.cpp b/test_regress/t/t_trace_two_sc.cpp index 7547853d5..bd4f0ad77 100644 --- a/test_regress/t/t_trace_two_sc.cpp +++ b/test_regress/t/t_trace_two_sc.cpp @@ -17,12 +17,7 @@ // clang-format on // Compile in place -#include "Vt_trace_two_b.cpp" -#include "Vt_trace_two_b___024root.cpp" -#include "Vt_trace_two_b___024root__Slow.cpp" -#include "Vt_trace_two_b__Syms.cpp" -#include "Vt_trace_two_b__Trace.cpp" -#include "Vt_trace_two_b__Trace__Slow.cpp" +#include "Vt_trace_two_b__ALL.cpp" // General headers #include "verilated.h"