summaryrefslogtreecommitdiffstats
path: root/pts/test-resources
diff options
context:
space:
mode:
Diffstat (limited to 'pts/test-resources')
-rwxr-xr-xpts/test-resources/ramspeed/install.sh12
-rw-r--r--pts/test-resources/ramspeed/parse-results.php3
2 files changed, 8 insertions, 7 deletions
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, ' '));