Tests: Update invoke_ scripts for more recent environment

nodist/invoke_iccr

@@ -10,7 +10,7 @@ use strict;
 
 delete $ENV{MODULE_VERSION};
 _setup_modules();
-module('add','cadence_verif');
+module('add','cadence-ius');
 exec('iccr',@ARGV);
 
 #######################################################################
@@ -18,7 +18,7 @@ exec('iccr',@ARGV);
 
 sub _setup_modules {
     # 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,";
     require $init;
 }

nodist/invoke_ncverilog

@@ -10,7 +10,7 @@ use strict;
 
 delete $ENV{MODULE_VERSION};
 _setup_modules();
-module('add','cadence_verif');
+module('add','cadence-ius');
 exec('ncverilog',@ARGV);
 
 #######################################################################
@@ -18,7 +18,7 @@ exec('ncverilog',@ARGV);
 
 sub _setup_modules {
     # 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,";
     require $init;
 }

test_regress/driver.pl

@@ -1158,6 +1158,10 @@ Run using Verilator.
 
 Root directory name of SystemC kit.
 
+=item VERILATOR_IVERILOG
+
+Command to use to invoke Icarus Verilog.
+
 =item VERILATOR_NCVERILOG
 
 Command to use to invoke ncverilog.

test_verilated/Makefile

@@ -19,6 +19,7 @@ VERILATOR_ROOT := $(shell pwd)/..
 export VERILATOR_ROOT
 
 VERILATOR_NCVERILOG ?= ncverilog
+VERILATOR_VCS ?= vcs
 
 # Pick up PERL and other variable settings
 include $(VERILATOR_ROOT)/include/verilated.mk