diff options
author | rhaas <rhaas@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2014-05-01 15:12:13 +0000 |
---|---|---|
committer | rhaas <rhaas@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2014-05-01 15:12:13 +0000 |
commit | 42a4c8721ef990c51066802d3f52613a27256b1b (patch) | |
tree | 82fc80ca095ca6ba2c57ba2d43670af1f3c9d95d | |
parent | 11dcf811f007428a1472c0652f0b6c62ecbcefd7 (diff) |
set NPROCS to 1 when running tests without MPI
git-svn-id: http://svn.cactuscode.org/flesh/trunk@5112 17b73243-c579-4c4c-a9d2-2d5706c11dac
-rw-r--r-- | lib/sbin/RunTestUtils.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sbin/RunTestUtils.pl b/lib/sbin/RunTestUtils.pl index 26930ff3..18e8677c 100644 --- a/lib/sbin/RunTestUtils.pl +++ b/lib/sbin/RunTestUtils.pl @@ -589,7 +589,8 @@ sub FindRunCommand my $have_mpi = ParseExtras($config_data); my $nprocs = (defined ($ENV{'CCTK_TESTSUITE_RUN_PROCESSORS'}) ? - $ENV{'CCTK_TESTSUITE_RUN_PROCESSORS'} : 2); + $ENV{'CCTK_TESTSUITE_RUN_PROCESSORS'} : $have_mpi ? + 2 : 1); if ($have_mpi) { @@ -603,6 +604,7 @@ sub FindRunCommand { die("Cannot run on $nprocs processes without an MPI implementation\n"); } + $config_data->{'NPROCS'} = 1; } my $command; |