Have tests pick up standard .mk so PERL is set based on configure

git-svn-id: file://localhost/svn/verilator/trunk/verilator@845 77ca24e4-aefa-0310-84f0-b9a241c72d87

bin/verilator

@@ -879,6 +879,10 @@ disadvantage of this approach is that include/verilatedos.h must
 self-detect the requirements of the target system, rather then using
 configure.
 
+The target system may also require edits to the Makefiles, the simple
+Makefiles produced by Verilator presume the target system is the same type
+as the build system.
+
 =head1 VERILOG 2001 SUPPORT
 
 Verilator supports the more common Verilog 2001 language features.  This

test_c/Makefile

@@ -12,20 +12,23 @@
 #
 #****************************************************************************/
 
+default: test_default
+
 # This must point to the root of the VERILATOR kit
 VERILATOR_ROOT := $(shell pwd)/..
 export VERILATOR_ROOT
 
-PERL = perl
+# Pick up PERL and other variable settings
+include $(VERILATOR_ROOT)/include/verilated.mk
 
 DEBUG_ON = --debug --trace-dups 
 #DEBUG = $(DEBUG_ON)
 VALGRIND_ON = $(DEBUG_ON) --gdb "valgrind -v --leak-check=yes"
 
 ######################################################################
-default: prep compile run
-debug:   prep_dbg compile run
-valgrind:   prep_vg compile run
+test_default:   prep     compile run
+test_debug:     prep_dbg compile run
+test_valgrind:  prep_vg  compile run
 
 VERILATOR_FLAGS = --cc -f $(VERILATOR_ROOT)/test_v/input.vc top.v
 #Note turning on traces requires SystemPerl to be installed

test_regress/Makefile

@@ -12,15 +12,17 @@
 #
 #****************************************************************************/
 
+default: test
+
 # This must point to the root of the VERILATOR kit
 VERILATOR_ROOT := $(shell pwd)/..
 export VERILATOR_ROOT
-PERL = perl
+
+# Pick up PERL and other variable settings
+include $(VERILATOR_ROOT)/include/verilated.mk
 
 ######################################################################
 
-default: test
-
 ifneq ($(VCS_HOME),)
 PRODUCTS += --vcs
 endif

test_regress/t/t_math_imm.v

@@ -85,7 +85,7 @@ module example (/*AUTOARG*/
    input [5:0] 	 LowMaskSel_Bot, HighMaskSel_Bot;
    output [63:0] LogicImm;
 
-   output [63:0] 	 LowLogicImm, HighLogicImm; //FIX
+   output [63:0] 	 LowLogicImm, HighLogicImm;
 
 
    wire [63:0] 	 LowLogicImm, HighLogicImm;

test_sc/Makefile

@@ -12,18 +12,21 @@
 #
 #****************************************************************************/
 
+default: test_default
+
 # This must point to the root of the VERILATOR kit
 VERILATOR_ROOT := $(shell pwd)/..
 export VERILATOR_ROOT
 
-PERL = perl
+# Pick up PERL and other variable settings
+include $(VERILATOR_ROOT)/include/verilated.mk
 
 DEBUG_ON = --debug
 
 ######################################################################
-default:  precopy prep        preproc compile run
-debug:    precopy prep_dbg    preproc compile run
-nopublic: precopy prep_dbg_np preproc compile run
+test_default:  precopy prep        preproc compile run
+test_debug:    precopy prep_dbg    preproc compile run
+test_nopublic: precopy prep_dbg_np preproc compile run
 
 V_FLAGS = -f $(VERILATOR_ROOT)/test_v/input.vc
 VERILATOR_FLAGS = --sc $(V_FLAGS) top.v

test_sp/Makefile

@@ -12,18 +12,21 @@
 #
 #****************************************************************************/
 
+default: test_default
+
 # This must point to the root of the VERILATOR kit
 VERILATOR_ROOT := $(shell pwd)/..
 export VERILATOR_ROOT
 
-PERL = perl
+# Pick up PERL and other variable settings
+include $(VERILATOR_ROOT)/include/verilated.mk
 
 DEBUG_ON = --debug --trace-dups --output-split 100
 
 ######################################################################
-default:  prep        preproc compile     run coverage
-debug:    prep_dbg    preproc compile_dbg run coverage
-nopublic: prep_dbg_np preproc compile_dbg run coverage
+test_default:  prep        preproc compile     run coverage
+test_debug:    prep_dbg    preproc compile_dbg run coverage
+test_nopublic: prep_dbg_np preproc compile_dbg run coverage
 
 V_FLAGS = -f $(VERILATOR_ROOT)/test_v/input.vc
 VERILATOR_FLAGS = --public --sp --coverage --stats --trace $(V_FLAGS) top.v

test_vcs/Makefile

@@ -12,16 +12,20 @@
 #
 #****************************************************************************/
 
+default: test
+
 # This must point to the root of the VERILATOR kit
 VERILATOR_ROOT := $(shell pwd)/..
 export VERILATOR_ROOT
 
+# Pick up PERL and other variable settings
+include $(VERILATOR_ROOT)/include/verilated.mk
+
 ######################################################################
 
 V_FILES := $(wildcard *.v ../test_v/*.v)
 
 ######################################################################
-default: test
 
 ifneq ($(VCS_HOME),)
 test::	vcs

test_verilated/Makefile

@@ -12,10 +12,14 @@
 #
 #****************************************************************************/
 
+default: test
+
 # This must point to the root of the VERILATOR kit
 VERILATOR_ROOT := $(shell pwd)/..
 export VERILATOR_ROOT
-PERL = perl
+
+# Pick up PERL and other variable settings
+include $(VERILATOR_ROOT)/include/verilated.mk
 
 VERILATOR_SW += 
 ifeq ($(VERILATOR_NO_DEBUG),)