Tests: Remove some old makefile rules.

This commit is contained in:
Wilson Snyder 2019-10-08 19:12:33 -04:00
parent 8c836e1222
commit 58a42834a6
6 changed files with 9 additions and 11 deletions

View File

@ -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

View File

@ -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

View File

@ -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(

View File

@ -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(

View File

@ -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',
);

View File

@ -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(