Configs: Fix for benchmarks that don't use getopt.

--HG--
extra : convert_revision : 6cbc7bb360c282821dd9da7814e0ac8b689f5d01

configs/splash2/run.py

@@ -78,7 +78,7 @@ if not options.numcpus:
 class Cholesky(LiveProcess):
     cwd = options.rootdir + '/kernels/cholesky'
     executable = options.rootdir + '/kernels/cholesky/CHOLESKY'
-    cmd = ['CHOLESKY', '-p', str(options.numcpus),
+    cmd = ['CHOLESKY', '-p' +  str(options.numcpus),
             options.rootdir + '/kernels/cholesky/inputs/tk23.O']
 
 class FFT(LiveProcess):
@@ -128,7 +128,7 @@ class Ocean_noncontig(LiveProcess):
 
 class Raytrace(LiveProcess):
     executable = options.rootdir + '/apps/raytrace/RAYTRACE'
-    cmd = ['RAYTRACE', '-p', str(options.numcpus),
+    cmd = ['RAYTRACE', '-p' + str(options.numcpus),
            options.rootdir + '/apps/raytrace/inputs/teapot.env']
     cwd = options.rootdir + '/apps/raytrace'
 
@@ -252,10 +252,10 @@ elif options.benchmark == 'WaterNSquared':
 elif options.benchmark == 'WaterSpatial':
     root.workload = Water_spatial()
 else:
-    panic("The --benchmark environment variable was set to something" \
+    print >> sys.stderr, """The --benchmark environment variable was set to something improper.
-          +" improper.\nUse Cholesky, FFT, LUContig, LUNoncontig, Radix" \
+Use Cholesky, FFT, LUContig, LUNoncontig, Radix, Barnes, FMM, OceanContig,
-          +", Barnes, FMM, OceanContig,\nOceanNoncontig, Raytrace," \
+OceanNoncontig, Raytrace, WaterNSquared, or WaterSpatial"""
-          +" WaterNSquared, or WaterSpatial\n")
+    sys.exit(1)
 
 # --------------------
 # Assign the workload to the cpus