From 58a42834a64afdff84d5371e2811c9e409d5a302 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Tue, 8 Oct 2019 19:12:33 -0400
Subject: [PATCH] Tests: Remove some old makefile rules.

---
 include/verilated.mk.in                  | 1 -
 test_regress/Makefile_obj                | 9 +++++----
 test_regress/t/t_display_time.pl         | 3 +--
 test_regress/t/t_display_wide.pl         | 3 +--
 test_regress/t/t_verilated_all_newest.pl | 2 +-
 test_regress/t/t_verilated_threaded.pl   | 2 +-
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/include/verilated.mk.in b/include/verilated.mk.in
index ef284c5f4..efffb4b26 100644
--- a/include/verilated.mk.in
+++ b/include/verilated.mk.in
@@ -30,7 +30,6 @@ CFG_LDLIBS_THREADS = @CFG_LDLIBS_THREADS@
 ######################################################################
 # Programs
 
-SP_INCLUDER	= $(VERILATOR_INCLUDER)
 VERILATOR_COVERAGE = $(PERL) $(VERILATOR_ROOT)/bin/verilator_coverage
 VERILATOR_INCLUDER = $(PERL) $(VERILATOR_ROOT)/bin/verilator_includer
 
diff --git a/test_regress/Makefile_obj b/test_regress/Makefile_obj
index 04cd5ebfe..89061c672 100644
--- a/test_regress/Makefile_obj
+++ b/test_regress/Makefile_obj
@@ -21,6 +21,7 @@ endif
 
 include $(VM_PREFIX).mk
 
+# So t/t_foobar.cpp is found (due to test_regress using -Mdir)
 VPATH += ../../$(VM_USER_DIR)
 
 #######################################################################
@@ -58,10 +59,10 @@ endif
 
 .SUFFIXES:
 
-#Default compile, pick up OBJCACHE
-%.o:	%.cpp
-	$(OBJCACHE) $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $<
-
+#Default compile, using verilator.mk rules
+#%.o: %.cpp
+# 	$(OBJCACHE) $(CXX) $(CXXFLAGS) $(CPPFLAGS) $(OPT_FAST) -c -o $@ $<
+#
 #Default link, using normal make rules
 #$(VM_PREFIX): $(VK_GLOBAL_OBJS) $(VK_OBJS)
 #	$(LINK) $(LDFLAGS) -g $^ $(LOADLIBES) $(LDLIBS) -o $@ $(LIBS) 2>&1
diff --git a/test_regress/t/t_display_time.pl b/test_regress/t/t_display_time.pl
index 037ef9593..584f9a477 100755
--- a/test_regress/t/t_display_time.pl
+++ b/test_regress/t/t_display_time.pl
@@ -9,10 +9,9 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 scenarios(simulator => 1);
 
-$Self->{vl_time_multiplier} = 1000;
-
 compile(
     verilator_flags2 => ['-DVL_TIME_MULTIPLER=1000'],
+    make_flags => 'CPPFLAGS_ADD=-DVL_TIME_MULTIPLIER=1000',
     );
 
 execute(
diff --git a/test_regress/t/t_display_wide.pl b/test_regress/t/t_display_wide.pl
index 514e0bd6d..f09e06508 100755
--- a/test_regress/t/t_display_wide.pl
+++ b/test_regress/t/t_display_wide.pl
@@ -9,9 +9,8 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 scenarios(simulator => 1);
 
-$Self->{vl_time_multiplier} = 1000;
-
 compile(
+    make_flags => 'CPPFLAGS_ADD=-DVL_TIME_MULTIPLIER=1000',
     );
 
 execute(
diff --git a/test_regress/t/t_verilated_all_newest.pl b/test_regress/t/t_verilated_all_newest.pl
index a763d7ab2..40885f90e 100755
--- a/test_regress/t/t_verilated_all_newest.pl
+++ b/test_regress/t/t_verilated_all_newest.pl
@@ -15,7 +15,7 @@ my $root = "..";
 
 compile(
     # Can't use --coverage and --savable together, so cheat and compile inline
-    verilator_flags2 => ['--cc --coverage-toggle --coverage-line --coverage-user --trace --vpi $root/include/verilated_save.cpp'],
+    verilator_flags2 => ["--cc --coverage-toggle --coverage-line --coverage-user --trace --vpi $root/include/verilated_save.cpp"],
     make_flags => 'DRIVER_STD=newest',
     );
 
diff --git a/test_regress/t/t_verilated_threaded.pl b/test_regress/t/t_verilated_threaded.pl
index 6d49e77af..ddb4c822c 100755
--- a/test_regress/t/t_verilated_threaded.pl
+++ b/test_regress/t/t_verilated_threaded.pl
@@ -15,7 +15,7 @@ my $root = "..";
 
 compile(
     # Can't use --coverage and --savable together, so cheat and compile inline
-    verilator_flags2 => ['--cc --coverage-toggle --coverage-line --coverage-user --trace --threads 1 --vpi $root/include/verilated_save.cpp'],
+    verilator_flags2 => ["--cc --coverage-toggle --coverage-line --coverage-user --trace --threads 1 --vpi $root/include/verilated_save.cpp"],
     );
 
 execute(