summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-12-29 14:24:06 -0500
committerMichael Larabel <michael@phx-laptop.(none)>2008-12-29 14:24:06 -0500
commit78bc858480125fcc641d3e1a2bd604d81eaae2c4 (patch)
tree9774e5ede0b675baf105b82fbd5e8096ba93d804
parentcfc08f6c7da74fdc79e2d3a56404a8dfaea38ae6 (diff)
downloadphoronix-test-suite-upstream-78bc858480125fcc641d3e1a2bd604d81eaae2c4.zip
phoronix-test-suite-upstream-78bc858480125fcc641d3e1a2bd604d81eaae2c4.tar.gz
phoronix-test-suite-upstream-78bc858480125fcc641d3e1a2bd604d81eaae2c4.tar.xz
pts: Switch ramspeed test profile to use $LOG_FILE
-rw-r--r--pts/test-profiles/ramspeed.xml2
-rwxr-xr-xpts/test-resources/ramspeed/install.sh12
-rw-r--r--pts/test-resources/ramspeed/parse-results.php3
3 files changed, 9 insertions, 8 deletions
diff --git a/pts/test-profiles/ramspeed.xml b/pts/test-profiles/ramspeed.xml
index 97e2aca..9ce570b 100644
--- a/pts/test-profiles/ramspeed.xml
+++ b/pts/test-profiles/ramspeed.xml
@@ -1,6 +1,6 @@
<PhoronixTestSuite>
<TestProfile>
- <Version>1.1.0</Version>
+ <Version>1.1.1</Version>
<TestType>Memory</TestType>
<SoftwareType>Utility</SoftwareType>
<License>FREE</License>
diff --git a/pts/test-resources/ramspeed/install.sh b/pts/test-resources/ramspeed/install.sh
index 5fe43ab..b4f4da2 100755
--- a/pts/test-resources/ramspeed/install.sh
+++ b/pts/test-resources/ramspeed/install.sh
@@ -5,23 +5,23 @@ tar -xvf ramspeed-2.5.2.tar.gz
echo "#!/bin/sh
rm -f *.result
-./ramspeed \$@ > \$LOG_FILE.result
+./ramspeed \$@ > \$LOG_FILE.result 2>&1
case \"\$1\" in
\"COPY\")
- cat \$LOG_FILE.result | grep \"Copy\"
+ cat \$LOG_FILE.result | grep \"Copy\" > \$LOG_FILE
;;
\"SCALE\")
- cat \$LOG_FILE.result | grep \"Scale\"
+ cat \$LOG_FILE.result | grep \"Scale\" > \$LOG_FILE
;;
\"ADD\")
- cat \$LOG_FILE.result | grep \"Add\"
+ cat \$LOG_FILE.result | grep \"Add\" > \$LOG_FILE
;;
\"TRIAD\")
- cat \$LOG_FILE.result | grep \"Triad\"
+ cat \$LOG_FILE.result | grep \"Triad\" > \$LOG_FILE
;;
\"AVERAGE\")
- cat \$LOG_FILE.result | grep \"AVERAGE\"
+ cat \$LOG_FILE.result | grep \"AVERAGE\" > \$LOG_FILE
;;
esac
" > ramspeed-benchmark
diff --git a/pts/test-resources/ramspeed/parse-results.php b/pts/test-resources/ramspeed/parse-results.php
index 0e06f7c..3c88835 100644
--- a/pts/test-resources/ramspeed/parse-results.php
+++ b/pts/test-resources/ramspeed/parse-results.php
@@ -1,6 +1,7 @@
<?php
-$arg = trim($argv[1]);
+$log_file = file_get_contents(getenv("LOG_FILE"));
+$arg = trim($log_file);
$arg = substr($arg, 0, strrpos($arg, "Mb/s") - 1);
echo substr($arg, strrpos($arg, ' '));