Try to setup commands properly.

--HG--
extra : convert_revision : 9f4af3c5f52841b10e9f17c48470716703a1be67

diff --git a/tests/long/00.gzip/test.py b/tests/long/00.gzip/test.py
index 7a74a0b0af52686e3e7d300b51f6e51e3cef2e04..5c33376bdd66c882097e1a3b9faa2963a178c8ec 100644 (file)
--- a/tests/long/00.gzip/test.py
+++ b/tests/long/00.gzip/test.py
@@ -26,5 +26,6 @@
 #
 # Authors: Korey Sewell
 
-root.system.cpu.workload = LiveProcess(cmd = 'gzip smred.log 1',
-                                       executable = binpath('gzip'))
+process = LiveProcess(executable = binpath('gzip'))
+process.cmd = 'gzip ' + inputpath('gzip', 'smred.log') + ' 1'
+root.system.cpu.workload = process

diff --git a/tests/long/10.mcf/test.py b/tests/long/10.mcf/test.py
index af2536c7ec355279c542afc1bb7722ef36fd6da9..36d077c96e82f5a0fc91a7b4d4aca347da73e645 100644 (file)
--- a/tests/long/10.mcf/test.py
+++ b/tests/long/10.mcf/test.py
@@ -26,5 +26,6 @@
 #
 # Authors: Korey Sewell
 
-root.system.cpu.workload = LiveProcess(cmd = 'mcf lgred.in',
-                                       executable = binpath('mcf'))
+process = LiveProcess(executable = binpath('mcf'))
+process.cmd = 'mcf' + inputpath('mcf', 'lgred.in')
+root.system.cpu.workload = process

diff --git a/tests/long/20.parser/test.py b/tests/long/20.parser/test.py
index 0b142db259545e36ad2bae76d959c95216c769fd..7609087223e8700a65c74c396aacd61e835b1208 100644 (file)
--- a/tests/long/20.parser/test.py
+++ b/tests/long/20.parser/test.py
@@ -26,5 +26,7 @@
 #
 # Authors: Korey Sewell
 
-root.system.cpu.workload = LiveProcess(cmd = 'parser 2.1.dict -batch < lgred.in',
-                                       executable = binpath('parser'))
+process = LiveProcess(executable = binpath('parser'))
+process.cmd = 'parser 2.1.dict -batch'
+process.input = inputpath('parser', 'lgred.in')
+root.system.cpu.workload = process

diff --git a/tests/long/30.eon/test.py b/tests/long/30.eon/test.py
index b9f0c2b517c038948c68c0118f25ddd3a189eed5..d6bf3bb76068ce8d354aa859e84614c4e87e7b35 100644 (file)
--- a/tests/long/30.eon/test.py
+++ b/tests/long/30.eon/test.py
@@ -26,4 +26,10 @@
 #
 # Authors: Korey Sewell
 
-root.system.cpu.workload = LiveProcess(cmd = 'eon chair.control.cook chair.camera chair.surfaces chair.cook.ppm ppm pixels_out.cook',executable = binpath('eon'))
+process = LiveProcess(executable = binpath('eon'))
+process.cmd = 'eon' + inputpath('eon', 'chair.control.cook') + \
+              inputpath('eon', 'chair.camera') + \
+              inputpath('eon', 'chair.surfaces') + \
+              inputpath('eon', 'chair.cook.ppm') + 'ppm' \
+              + 'pixels_out.cook'
+root.system.cpu.workload = process

diff --git a/tests/long/40.perlbmk/test.py b/tests/long/40.perlbmk/test.py
index b5cd17251a5da0e9feff8bf7c3728feae6dc31b2..81c36bab3ec314fe14cea131f29fab8743a0a432 100644 (file)
--- a/tests/long/40.perlbmk/test.py
+++ b/tests/long/40.perlbmk/test.py
@@ -26,5 +26,6 @@
 #
 # Authors: Korey Sewell
 
-root.system.cpu.workload = LiveProcess(cmd = 'perlbmk -I./lib lgred.makerand.pl',
-                                       executable = binpath('perlbmk'))
+process = LiveProcess(executable = binpath('perlbmk'))
+process.cmd = 'perlbmk -I./lib' + inputpath('perlbmk', 'lgred.makerand.pl')
+root.system.cpu.workload = process

diff --git a/tests/long/50.vortex/test.py b/tests/long/50.vortex/test.py
index f531b8ac8e4fa29eec8712a974d713ca169471fe..f6d1e03df3130322ccfb2c059c0b2554afd5e99a 100644 (file)
--- a/tests/long/50.vortex/test.py
+++ b/tests/long/50.vortex/test.py
@@ -26,5 +26,6 @@
 #
 # Authors: Korey Sewell
 
-root.system.cpu.workload = LiveProcess(cmd = 'vortex smred.raw',
-                                       executable = binpath('vortex'))
+process = LiveProcess(executable = binpath('vortex'))
+process.cmd = 'vortex' + inputpath('smred.raw')
+root.system.cpu.workload = process

diff --git a/tests/long/60.bzip2/test.py b/tests/long/60.bzip2/test.py
index 3f16efa093398836a82573b882c372bd698f0454..e96d64656af45f6ee429a3f80039f6758b430897 100644 (file)
--- a/tests/long/60.bzip2/test.py
+++ b/tests/long/60.bzip2/test.py
@@ -26,5 +26,6 @@
 #
 # Authors: Korey Sewell
 
-root.system.cpu.workload = LiveProcess(cmd = 'bzip2 lgred.source',
-                                       executable = binpath('bzip2'))
+process = LiveProcess(executable = binpath('bzip2'))
+process.cmd = cmd = 'bzip2' + inputpath('bzip2', 'lgred.source')
+root.system.cpu.workload = process

diff --git a/tests/long/70.twolf/test.py b/tests/long/70.twolf/test.py
index 4ec7a3d03354d59999a961caa41a470ec8ca2304..be7a04f974f8403c47447e19b3d0b337069e8118 100644 (file)
--- a/tests/long/70.twolf/test.py
+++ b/tests/long/70.twolf/test.py
@@ -26,5 +26,6 @@
 #
 # Authors: Korey Sewell
 
-root.system.cpu.workload = LiveProcess(cmd = 'twolf smred/smred',
-                                       executable = binpath('twolf'))
+process = LiveProcess(executable = binpath('twolf'))
+process.cmd = 'twolf' + inputpath('twolf', 'smred/smred')
+root.system.cpu.workload = process