Changeset 2063 for trunk/tsuite/slow/run_parallel.pl

Timestamp:

05/14/08 07:35:20 (8 months ago)

Author:

peter

Message:

tsuite/slow/run_parallel.pl:
tsuite/auto/run_parallel.pl:

Make changes similar to r2049 to support default paths to executable (including sys_xxx directories).

Files:

• trunk/tsuite/slow/run_parallel.pl (modified) (4 diffs)

trunk/tsuite/slow/run_parallel.pl

@@ -10 +10 @@
 # run_parallel.pl cloudy.exe 16
 #
-# where the first parameter is the name of the Cloudy executable. It
-# should either be in your search path, or the full pathname should
-# be used. The second number is the number of processors to use. It
-# can be any number >= 0. However, using numbers larger than roughly
-# 16 will not give any speed advantage since the time will then be
-# set by the longest running test sims. The second number is optional
-# and will default to the number of processosrs on your computer
-# (this number is only correctly determined under Linux and Windows,
-# it will be set to 1 on other systems).
+# where the first parameter is the name of the Cloudy executable.
+# If the parameter is completely omitted (or a "." is entered), it
+# will default to "../../source/cloudy.exe". You can also supply the
+# name of one of the sys_xxx directories, in which case the path will
+# default to "../../source/sys_xxx/cloudy.exe". In all other cases
+# cloudy.exe should  either be in your search path, or the full pathname
+# should be used. The second number is the number of processors to use.
+# It can be any number >= 0. The second number is optional and will
+# default to the number of processosrs on your computer (this number is
+# only correctly determined under Linux and Windows, it will be set to
+# 1 on other systems).
 #
 # If the number of processors is set to 0, the script will exit after
@@ -34 +36 @@
 # Peter van Hoof
 
-if( "$ARGV[0]" eq "" ) {
-    print "The path to the cloudy binary must be supplied as the first parameter to this script...\n";
-    exit;
+if( -d "../../source/$ARGV[0]" ) {
+    $exe = "../../source/$ARGV[0]/cloudy.exe";
+}
+else {
+    $exe = "$ARGV[0]";
 }
 
@@ -70 +74 @@
 }
 
+if( $nproc > 0 && ! -e $exe ) {
+    print "No executable is found at ==$exe==\n";
+    print "A correct path to the cloudy binary must be supplied as the first parameter to this script.\n";
+    exit;
+}
+
 # clean up first
 if( -e "./clean_tsuite.pl" ) {
@@ -94 +104 @@
     }
     $rules = "$rules$output: $input\n";
-    $rules = "$rules\t$ARGV[0] < $input > $output 2> $output2\n"
+    $rules = "$rules\t$exe < $input > $output 2> $output2\n"
 }
 open( foo, ">Makefile" );