From d47ca1912b97657ee89190bb126ef44cf143fe92 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Fri, 20 May 2011 20:47:15 -0400 Subject: [PATCH] tests: Fix invocation scripts for new site standard --- nodist/invoke_atsim | 14 +------------- nodist/invoke_iccr | 14 +------------- nodist/invoke_ncverilog | 14 +------------- nodist/invoke_vcs | 14 +------------- test_regress/driver.pl | 4 +++- 5 files changed, 7 insertions(+), 53 deletions(-) diff --git a/nodist/invoke_atsim b/nodist/invoke_atsim index d7d0aa88d..b7bdcd6cb 100755 --- a/nodist/invoke_atsim +++ b/nodist/invoke_atsim @@ -8,21 +8,9 @@ use strict; #====================================================================== # main -delete $ENV{MODULE_VERSION}; -_setup_modules(); -module('add','axiom-athdl'); +eval `modulecmd perl add axiom-athdl`; exec('atsim',@ARGV); -####################################################################### -# Modules package - -sub _setup_modules { - # Load the 'module' command into the environment - my $init = "$ENV{MODULESHOME}/init/perl"; - (-f $init) or die "%Error: Script not found: $init,"; - require $init; -} - ####################################################################### __END__ diff --git a/nodist/invoke_iccr b/nodist/invoke_iccr index 61ebf15b0..14e59fde1 100755 --- a/nodist/invoke_iccr +++ b/nodist/invoke_iccr @@ -8,21 +8,9 @@ use strict; #====================================================================== # main -delete $ENV{MODULE_VERSION}; -_setup_modules(); -module('add','cadence-ius'); +eval `modulecmd perl add cds-ius`; exec('iccr',@ARGV); -####################################################################### -# Modules package - -sub _setup_modules { - # Load the 'module' command into the environment - my $init = "$ENV{MODULESHOME}/init/perl"; - (-f $init) or die "%Error: Script not found: $init,"; - require $init; -} - ####################################################################### __END__ diff --git a/nodist/invoke_ncverilog b/nodist/invoke_ncverilog index cb50f4386..be31191c2 100755 --- a/nodist/invoke_ncverilog +++ b/nodist/invoke_ncverilog @@ -8,21 +8,9 @@ use strict; #====================================================================== # main -delete $ENV{MODULE_VERSION}; -_setup_modules(); -module('add','cadence-ius'); +eval `modulecmd perl add cds-ius`; exec('ncverilog',@ARGV); -####################################################################### -# Modules package - -sub _setup_modules { - # Load the 'module' command into the environment - my $init = "$ENV{MODULESHOME}/init/perl"; - (-f $init) or die "%Error: Script not found: $init,"; - require $init; -} - ####################################################################### __END__ diff --git a/nodist/invoke_vcs b/nodist/invoke_vcs index 358ff0c6a..86f5c6f53 100755 --- a/nodist/invoke_vcs +++ b/nodist/invoke_vcs @@ -8,21 +8,9 @@ use strict; #====================================================================== # main -delete $ENV{MODULE_VERSION}; -_setup_modules(); -module('add','synopsys-vcs'); +eval `modulecmd perl add synopsys-vcs`; exec('vcs',@ARGV); -####################################################################### -# Modules package - -sub _setup_modules { - # Load the 'module' command into the environment - my $init = "$ENV{MODULESHOME}/init/perl"; - (-f $init) or die "%Error: Script not found: $init,"; - require $init; -} - ####################################################################### __END__ diff --git a/test_regress/driver.pl b/test_regress/driver.pl index 6fe0c50c9..b85a346ca 100755 --- a/test_regress/driver.pl +++ b/test_regress/driver.pl @@ -304,8 +304,9 @@ sub new { ivrun_flags => [], # VCS vcs => 0, - vcs_flags => [split(/\s+/,"+cli -I +define+VCS+1 -q -sverilog -CFLAGS '-DVCS' ")], + vcs_flags => [split(/\s+/,"+vcs+lic+wait +cli -I +define+VCS+1 -q -sverilog -CFLAGS '-DVCS' ")], vcs_flags2 => [], # Overridden in some sim files + vcsrun_flags => [split(/\s+/,"+vcs+lic_wait")], # NC nc => 0, nc_flags => [split(/\s+/,"+licqueue +nowarn+LIBNOU +define+NC=1 -q +assert +sv -c ")], @@ -603,6 +604,7 @@ sub execute { #$fh->print("quit\n"); $fh->close; $self->_run(logfile=>"$self->{obj_dir}/vcs_sim.log", cmd=>["echo q | ".$run_env."./simv", + @{$param{vcsrun_flags}}, @{$param{all_run_flags}}, ], %param,