summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-12-29 22:06:57 -0500
committerMichael Larabel <michael@phx-laptop.(none)>2008-12-29 22:06:57 -0500
commit2025164e1ae8b791a2cdf2ec4b0bcd55336f142f (patch)
tree9af3e5db26f82989c2df18f800d1f24aff23e268
parentb69fcfb7f641eb4e0f958cdc8c3d279c01f08980 (diff)
downloadphoronix-test-suite-upstream-2025164e1ae8b791a2cdf2ec4b0bcd55336f142f.zip
phoronix-test-suite-upstream-2025164e1ae8b791a2cdf2ec4b0bcd55336f142f.tar.gz
phoronix-test-suite-upstream-2025164e1ae8b791a2cdf2ec4b0bcd55336f142f.tar.xz
pts: Adjust more test profiles from using $argv to $LOG_FILE
-rw-r--r--CHANGE-LOG1
-rw-r--r--pts/test-profiles/compliance-acpi.xml2
-rw-r--r--pts/test-profiles/compliance-sensors.xml2
-rw-r--r--pts/test-profiles/ppracer.xml2
-rwxr-xr-xpts/test-resources/compliance-acpi/install.sh2
-rw-r--r--pts/test-resources/compliance-acpi/parse-results.php2
-rwxr-xr-xpts/test-resources/compliance-sensors/install.sh2
-rw-r--r--pts/test-resources/compliance-sensors/parse-results.php2
-rwxr-xr-xpts/test-resources/memory-bandwidth/install.sh8
-rw-r--r--pts/test-resources/memory-bandwidth/parse-results.php4
-rwxr-xr-xpts/test-resources/ppracer/install.sh2
-rw-r--r--pts/test-resources/ppracer/parse-results.php4
12 files changed, 19 insertions, 14 deletions
diff --git a/CHANGE-LOG b/CHANGE-LOG
index 4732a24..80384a8 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -23,6 +23,7 @@ Phoronix Test Suite (Git)
- pts: Add graphics-magick test profile for GraphicsMagick 1.3 image testing
- pts: Add graphics-magick to multicore test suite due to its use of OpenMP
- pts: Update lzma download link for compress-lzma test profile
+- pts: Adjust more test profiles from using $argv to $LOG_FILE
- pts_Graph: Tweak formatting of basic graph attributes
- bilde_renderer: Add and implement draw_polygon and draw_ellipse to drawing API
- bilde_renderer: When setting the image quality level to use with the render_image() function, base it on a 100-point scale
diff --git a/pts/test-profiles/compliance-acpi.xml b/pts/test-profiles/compliance-acpi.xml
index 9a782ad..bd4ce65 100644
--- a/pts/test-profiles/compliance-acpi.xml
+++ b/pts/test-profiles/compliance-acpi.xml
@@ -1,6 +1,6 @@
<PhoronixTestSuite>
<TestProfile>
- <Version>1.1.0</Version>
+ <Version>1.1.1</Version>
<TestType>System</TestType>
<SoftwareType>Benchmark</SoftwareType>
<License>FREE</License>
diff --git a/pts/test-profiles/compliance-sensors.xml b/pts/test-profiles/compliance-sensors.xml
index 940b9bc..a4be584 100644
--- a/pts/test-profiles/compliance-sensors.xml
+++ b/pts/test-profiles/compliance-sensors.xml
@@ -1,6 +1,6 @@
<PhoronixTestSuite>
<TestProfile>
- <Version>1.1.0</Version>
+ <Version>1.1.1</Version>
<TestType>System</TestType>
<SoftwareType>Benchmark</SoftwareType>
<License>FREE</License>
diff --git a/pts/test-profiles/ppracer.xml b/pts/test-profiles/ppracer.xml
index d5e4dfc..f8d6614 100644
--- a/pts/test-profiles/ppracer.xml
+++ b/pts/test-profiles/ppracer.xml
@@ -1,6 +1,6 @@
<PhoronixTestSuite>
<TestProfile>
- <Version>1.1.0</Version>
+ <Version>1.1.1</Version>
<TestType>Graphics</TestType>
<SoftwareType>Utility</SoftwareType>
<License>FREE</License>
diff --git a/pts/test-resources/compliance-acpi/install.sh b/pts/test-resources/compliance-acpi/install.sh
index ec17dda..d7eb14a 100755
--- a/pts/test-resources/compliance-acpi/install.sh
+++ b/pts/test-resources/compliance-acpi/install.sh
@@ -60,6 +60,6 @@ EOT
cat > compliance-acpi << 'EOT'
#!/bin/sh
-php acpi-checks
+php acpi-checks > $LOG_FILE
EOT
chmod +x compliance-acpi
diff --git a/pts/test-resources/compliance-acpi/parse-results.php b/pts/test-resources/compliance-acpi/parse-results.php
index 82509cf..f94a44c 100644
--- a/pts/test-resources/compliance-acpi/parse-results.php
+++ b/pts/test-resources/compliance-acpi/parse-results.php
@@ -1 +1 @@
-<?php echo trim($argv[1]); ?>
+<?php echo trim(file_get_contents(getenv("LOG_FILE"))); ?>
diff --git a/pts/test-resources/compliance-sensors/install.sh b/pts/test-resources/compliance-sensors/install.sh
index c88fb0c..ba1303d 100755
--- a/pts/test-resources/compliance-sensors/install.sh
+++ b/pts/test-resources/compliance-sensors/install.sh
@@ -75,6 +75,6 @@ EOT
cat > compliance-sensors << 'EOT'
#!/bin/sh
-php sensors-check
+php sensors-check > $LOG_FILE
EOT
chmod +x compliance-sensors
diff --git a/pts/test-resources/compliance-sensors/parse-results.php b/pts/test-resources/compliance-sensors/parse-results.php
index 82509cf..f94a44c 100644
--- a/pts/test-resources/compliance-sensors/parse-results.php
+++ b/pts/test-resources/compliance-sensors/parse-results.php
@@ -1 +1 @@
-<?php echo trim($argv[1]); ?>
+<?php echo trim(file_get_contents(getenv("LOG_FILE"))); ?>
diff --git a/pts/test-resources/memory-bandwidth/install.sh b/pts/test-resources/memory-bandwidth/install.sh
index 12c1a7c..d03ad58 100755
--- a/pts/test-resources/memory-bandwidth/install.sh
+++ b/pts/test-resources/memory-bandwidth/install.sh
@@ -10,16 +10,16 @@ echo "#!/bin/sh
case \"\$1\" in
\"TEST_L2READ\")
- ./bandwidth -l2read | grep \"L2 cache sequential read\"
+ ./bandwidth -l2read | grep \"L2 cache sequential read\" > \$LOG_FILE
;;
\"TEST_L2WRITE\")
- ./bandwidth -l2write | grep \"L2 cache sequential write\"
+ ./bandwidth -l2write | grep \"L2 cache sequential write\" > \$LOG_FILE
;;
\"TEST_READ\")
- ./bandwidth -read | grep \"Main memory sequential read\"
+ ./bandwidth -read | grep \"Main memory sequential read\" > \$LOG_FILE
;;
\"TEST_WRITE\")
- ./bandwidth -write | grep \"Main memory sequential write\"
+ ./bandwidth -write | grep \"Main memory sequential write\" > \$LOG_FILE
;;
esac
" > memory-bandwidth
diff --git a/pts/test-resources/memory-bandwidth/parse-results.php b/pts/test-resources/memory-bandwidth/parse-results.php
index a12beef..39af0a5 100644
--- a/pts/test-resources/memory-bandwidth/parse-results.php
+++ b/pts/test-resources/memory-bandwidth/parse-results.php
@@ -1,5 +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, ' '));
echo substr($arg, strrpos($arg, ' '));
diff --git a/pts/test-resources/ppracer/install.sh b/pts/test-resources/ppracer/install.sh
index c30e1b7..451cea8 100755
--- a/pts/test-resources/ppracer/install.sh
+++ b/pts/test-resources/ppracer/install.sh
@@ -77,5 +77,5 @@ tux_sphere_divisions = 15,
};\" > pts-config.nut
cd ppracer_/bin/
-./ppracer -c $THIS_DIR/pts-config.nut -a -f events/herring_run/snow_valley 2>&1" > ppracer
+./ppracer -c $THIS_DIR/pts-config.nut -a -f events/herring_run/snow_valley > \$LOG_FILE 2>&1" > ppracer
chmod +x ppracer
diff --git a/pts/test-resources/ppracer/parse-results.php b/pts/test-resources/ppracer/parse-results.php
index 00241a7..739dbeb 100644
--- a/pts/test-resources/ppracer/parse-results.php
+++ b/pts/test-resources/ppracer/parse-results.php
@@ -1,5 +1,7 @@
<?php
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "Average FPS:") + 13);
+$log_file = trim(file_get_contents(getenv("LOG_FILE")));
+$BENCHMARK_RESULTS = substr($log_file, strrpos($log_file, "Average FPS:") + 13);
echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "\n")));
+
?>