Tests: Update invoke_ scripts for more recent environment
This commit is contained in:
parent
3fc55bba8e
commit
bb6b825836
|
|
@ -10,7 +10,7 @@ use strict;
|
||||||
|
|
||||||
delete $ENV{MODULE_VERSION};
|
delete $ENV{MODULE_VERSION};
|
||||||
_setup_modules();
|
_setup_modules();
|
||||||
module('add','cadence_verif');
|
module('add','cadence-ius');
|
||||||
exec('iccr',@ARGV);
|
exec('iccr',@ARGV);
|
||||||
|
|
||||||
#######################################################################
|
#######################################################################
|
||||||
|
|
@ -18,7 +18,7 @@ exec('iccr',@ARGV);
|
||||||
|
|
||||||
sub _setup_modules {
|
sub _setup_modules {
|
||||||
# Load the 'module' command into the environment
|
# Load the 'module' command into the environment
|
||||||
my $init = "/sicortex/$ENV{DIRPROJECT_ARCH}/lib/Modules/default/init/perl";
|
my $init = "$ENV{MODULESHOME}/init/perl";
|
||||||
(-f $init) or die "%Error: Script not found: $init,";
|
(-f $init) or die "%Error: Script not found: $init,";
|
||||||
require $init;
|
require $init;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ use strict;
|
||||||
|
|
||||||
delete $ENV{MODULE_VERSION};
|
delete $ENV{MODULE_VERSION};
|
||||||
_setup_modules();
|
_setup_modules();
|
||||||
module('add','cadence_verif');
|
module('add','cadence-ius');
|
||||||
exec('ncverilog',@ARGV);
|
exec('ncverilog',@ARGV);
|
||||||
|
|
||||||
#######################################################################
|
#######################################################################
|
||||||
|
|
@ -18,7 +18,7 @@ exec('ncverilog',@ARGV);
|
||||||
|
|
||||||
sub _setup_modules {
|
sub _setup_modules {
|
||||||
# Load the 'module' command into the environment
|
# Load the 'module' command into the environment
|
||||||
my $init = "/sicortex/$ENV{DIRPROJECT_ARCH}/lib/Modules/default/init/perl";
|
my $init = "$ENV{MODULESHOME}/init/perl";
|
||||||
(-f $init) or die "%Error: Script not found: $init,";
|
(-f $init) or die "%Error: Script not found: $init,";
|
||||||
require $init;
|
require $init;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1158,6 +1158,10 @@ Run using Verilator.
|
||||||
|
|
||||||
Root directory name of SystemC kit.
|
Root directory name of SystemC kit.
|
||||||
|
|
||||||
|
=item VERILATOR_IVERILOG
|
||||||
|
|
||||||
|
Command to use to invoke Icarus Verilog.
|
||||||
|
|
||||||
=item VERILATOR_NCVERILOG
|
=item VERILATOR_NCVERILOG
|
||||||
|
|
||||||
Command to use to invoke ncverilog.
|
Command to use to invoke ncverilog.
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ VERILATOR_ROOT := $(shell pwd)/..
|
||||||
export VERILATOR_ROOT
|
export VERILATOR_ROOT
|
||||||
|
|
||||||
VERILATOR_NCVERILOG ?= ncverilog
|
VERILATOR_NCVERILOG ?= ncverilog
|
||||||
|
VERILATOR_VCS ?= vcs
|
||||||
|
|
||||||
# Pick up PERL and other variable settings
|
# Pick up PERL and other variable settings
|
||||||
include $(VERILATOR_ROOT)/include/verilated.mk
|
include $(VERILATOR_ROOT)/include/verilated.mk
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue