diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/long/00.gzip/test.py | 5 | ||||
| -rw-r--r-- | tests/long/10.mcf/test.py | 5 | ||||
| -rw-r--r-- | tests/long/20.parser/test.py | 6 | ||||
| -rw-r--r-- | tests/long/30.eon/test.py | 8 | ||||
| -rw-r--r-- | tests/long/40.perlbmk/test.py | 5 | ||||
| -rw-r--r-- | tests/long/50.vortex/test.py | 5 | ||||
| -rw-r--r-- | tests/long/60.bzip2/test.py | 5 | ||||
| -rw-r--r-- | tests/long/70.twolf/test.py | 5 |
8 files changed, 29 insertions, 15 deletions
diff --git a/tests/long/00.gzip/test.py b/tests/long/00.gzip/test.py index 7a74a0b0a..5c33376bd 100644 --- 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 af2536c7e..36d077c96 100644 --- 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 0b142db25..760908722 100644 --- 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 b9f0c2b51..d6bf3bb76 100644 --- 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 b5cd17251..81c36bab3 100644 --- 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 f531b8ac8..f6d1e03df 100644 --- 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 3f16efa09..e96d64656 100644 --- 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 4ec7a3d03..be7a04f97 100644 --- 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 |