From bb6b825836d32a4d8910f26b51ed3e17121441ff Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Fri, 13 Nov 2009 18:18:30 -0500
Subject: [PATCH] Tests: Update invoke_ scripts for more recent environment

---
 nodist/invoke_iccr      | 4 ++--
 nodist/invoke_ncverilog | 4 ++--
 test_regress/driver.pl  | 4 ++++
 test_verilated/Makefile | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/nodist/invoke_iccr b/nodist/invoke_iccr
index 093ff3227..e17d9093c 100755
--- a/nodist/invoke_iccr
+++ b/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;
 }
diff --git a/nodist/invoke_ncverilog b/nodist/invoke_ncverilog
index 0826f0277..50759e697 100755
--- a/nodist/invoke_ncverilog
+++ b/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;
 }
diff --git a/test_regress/driver.pl b/test_regress/driver.pl
index 0d6e26461..54a9c954b 100755
--- a/test_regress/driver.pl
+++ b/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.
diff --git a/test_verilated/Makefile b/test_verilated/Makefile
index 5949de6ec..0e181359c 100644
--- a/test_verilated/Makefile
+++ b/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