Author: gropp Date: 2012-11-19 10:55:40 -0600 (Mon, 19 Nov 2012) New Revision: 10619 Modified: mpich2/trunk/test/mpi/runtests.in Log: Add warnings about the implicit run option for runtests and recognize additional programs to skip Modified: mpich2/trunk/test/mpi/runtests.in =================================================================== --- mpich2/trunk/test/mpi/runtests.in 2012-11-19 16:51:55 UTC (rev 10618) +++ mpich2/trunk/test/mpi/runtests.in 2012-11-19 16:55:40 UTC (rev 10619) @@ -206,7 +206,13 @@ # # Process any files if ($listfiles eq "") { - &ProcessImplicitList; + if ($batchRun) { + print STDERR "An implicit list of tests is not permitted in batch mode\n"; + exit(1); + } + else { + &ProcessImplicitList; + } } elsif (-d $listfiles) { print STDERR "Testing by directories not yet supported\n"; @@ -376,7 +382,7 @@ # test (use strict=false for tests that use non-standard extensions) if ($requiresStrict eq "false" && $testIsStrict eq "true") { next; } - if ($requiresMPIX eq "true" && $MPIHasMPIX eq "false") { next; } + if ($requiresMPIX eq "true" && $MPIHasMPIX eq "no") { next; } if ($np eq "") { $np = $np_default; } if ($np_max > 0 && $np > $np_max) { $np = $np_max; } @@ -420,6 +426,8 @@ sub ProcessImplicitList { # The default is to run every file in the current directory. # If there are no built programs, build and run every file + # WARNING: This assumes that anything executable should be run as + # an MPI test. $found_exec = 0; $found_src = 0; open (PGMS, "ls -1 |" ) || die "Cannot list directory\n"; @@ -428,6 +436,9 @@ $programname = $_; if (-d $programname) { next; } # Ignore directories if ($programname eq "runtests") { next; } # Ignore self + if ($programname eq "checktests") { next; } # Ignore helper + if ($programname eq "configure") { next; } # Ignore configure script + if ($programname eq "config.status") { next; } # Ignore configure helper if (-x $programname) { $found_exec++; } if ($programname =~ /\.[cf]$/) { $found_src++; } }