pts: Move over all relevent tests to using the new universal micro-timer

functionality

55 files changed, 87 insertions, 202 deletions

diff --git a/pts/test-resources/build-apache/install.sh b/pts/test-resources/build-apache/install.sh
index 91240a5..f25f87c 100755
--- a/pts/test-resources/build-apache/install.sh
+++ b/pts/test-resources/build-apache/install.sh
@@ -6,6 +6,9 @@ tar -xvf httpd-2.2.8.tar.gz
 cd httpd-2.2.8/
 ./configure > /dev/null
 sleep 3
-/usr/bin/time -f \"Apache Build Time: %e Seconds\" make -s -j \$NUM_CPU_JOBS 2>&1 | grep Seconds" > time-compile-apache
+
+\$TIMER_START
+make -s -j \$NUM_CPU_JOBS 2>&1
+\$TIMER_STOP" > time-compile-apache
 
 chmod +x time-compile-apache
diff --git a/pts/test-resources/build-apache/parse-results.php b/pts/test-resources/build-apache/parse-results.php
deleted file mode 100644
index 39cdace..0000000
--- a/pts/test-resources/build-apache/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "Apache Build Time:") + 18);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/build-imagemagick/install.sh b/pts/test-resources/build-imagemagick/install.sh
index 1935972..0b68420 100755
--- a/pts/test-resources/build-imagemagick/install.sh
+++ b/pts/test-resources/build-imagemagick/install.sh
@@ -13,6 +13,8 @@ tar -xjf image-magick.tar.bz2
 cd ImageMagick-6.4.0/
 ./configure > /dev/null
 sleep 3
-/usr/bin/time -f \"ImageMagick Build Time: %e Seconds\" make -s -j \$NUM_CPU_JOBS 2>&1 | grep Seconds" > time-compile-imagemagick
+\$TIMER_START
+make -s -j \$NUM_CPU_JOBS 2>&1
+\$TIMER_STOP" > time-compile-imagemagick
 
 chmod +x time-compile-imagemagick
diff --git a/pts/test-resources/build-imagemagick/parse-results.php b/pts/test-resources/build-imagemagick/parse-results.php
deleted file mode 100644
index 33579d7..0000000
--- a/pts/test-resources/build-imagemagick/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "ImageMagick Build Time:") + 23);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/build-linux-kernel/install.sh b/pts/test-resources/build-linux-kernel/install.sh
index 9c4e070..209cad7 100755
--- a/pts/test-resources/build-linux-kernel/install.sh
+++ b/pts/test-resources/build-linux-kernel/install.sh
@@ -24,6 +24,8 @@ esac
 
 cd linux-2.6.25/
 sleep 3
-/usr/bin/time -f \"Kernel Build Time: %e Seconds\" make -s -j \$NUM_CPU_JOBS 2>&1 | grep Seconds" > time-compile-kernel
+\$TIMER_START
+make -s -j \$NUM_CPU_JOBS 2>&1
+\$TIMER_STOP" > time-compile-kernel
 
 chmod +x time-compile-kernel
diff --git a/pts/test-resources/build-linux-kernel/parse-results.php b/pts/test-resources/build-linux-kernel/parse-results.php
deleted file mode 100644
index cba4bb1..0000000
--- a/pts/test-resources/build-linux-kernel/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "Kernel Build Time:") + 18);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/build-mplayer/install.sh b/pts/test-resources/build-mplayer/install.sh
index bca5143..db0c132 100755
--- a/pts/test-resources/build-mplayer/install.sh
+++ b/pts/test-resources/build-mplayer/install.sh
@@ -13,7 +13,9 @@ tar -xjf MPlayer-1.0rc2.tar.bz2
 cd MPlayer-1.0rc2/
 ./configure > /dev/null
 sleep 3
-/usr/bin/time -f \"MPlayer Build Time: %e Seconds\" make -j \$NUM_CPU_JOBS 2>&1 | grep Seconds" > time-compile-mplayer
+\$TIMER_START
+make -j \$NUM_CPU_JOBS 2>&1
+\$TIMER_STOP" > time-compile-mplayer
 
 chmod +x time-compile-mplayer
 
diff --git a/pts/test-resources/build-mplayer/parse-results.php b/pts/test-resources/build-mplayer/parse-results.php
deleted file mode 100644
index 36a1d3d..0000000
--- a/pts/test-resources/build-mplayer/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "MPlayer Build Time:") + 19);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/build-php/install.sh b/pts/test-resources/build-php/install.sh
index 4789c23..9b4d605 100755
--- a/pts/test-resources/build-php/install.sh
+++ b/pts/test-resources/build-php/install.sh
@@ -25,6 +25,8 @@ tar -xjf php-5.2.5.tar.bz2
 cd php-5.2.5/
 ./configure --with-libxml-dir=$THIS_DIR/libxml2 > /dev/null
 sleep 3
-/usr/bin/time -f \"PHP Build Time: %e Seconds\" make -s -j \$NUM_CPU_JOBS 2>&1 | grep Seconds" > time-compile-php
+\$TIMER_START
+make -s -j \$NUM_CPU_JOBS 2>&1
+\$TIMER_STOP" > time-compile-php
 
 chmod +x time-compile-php
diff --git a/pts/test-resources/build-php/parse-results.php b/pts/test-resources/build-php/parse-results.php
deleted file mode 100644
index c108ce9..0000000
--- a/pts/test-resources/build-php/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "PHP Build Time:") + 15);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/compress-gzip/install.sh b/pts/test-resources/compress-gzip/install.sh
index a773ef4..7f208de 100755
--- a/pts/test-resources/compress-gzip/install.sh
+++ b/pts/test-resources/compress-gzip/install.sh
@@ -1,14 +1,10 @@
 #!/bin/sh
 
-cat > gzip_process <<EOT
-#!/bin/sh
-cat compressfile | gzip -c > /dev/null
-EOT
-chmod +x gzip_process
-
 cat > compress-gzip <<EOT
 #!/bin/sh
-/usr/bin/time -f "Gzip Compress Time: %e Seconds" ./gzip_process 2>&1
+\$TIMER_START
+cat compressfile | gzip -c > /dev/null 2>&1
+\$TIMER_STOP
 EOT
 chmod +x compress-gzip 
 
diff --git a/pts/test-resources/compress-gzip/parse-results.php b/pts/test-resources/compress-gzip/parse-results.php
deleted file mode 100644
index 6a06944..0000000
--- a/pts/test-resources/compress-gzip/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "Gzip Compress Time:") + 19);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/compress-lzma/install.sh b/pts/test-resources/compress-lzma/install.sh
index b7dee60..c6c9d7b 100755
--- a/pts/test-resources/compress-lzma/install.sh
+++ b/pts/test-resources/compress-lzma/install.sh
@@ -11,15 +11,10 @@ make install
 cd ..
 rm -rf lzma-4.32.6
 
-cat > lzma_process <<EOT
-#!/bin/sh
-./lzma_/bin/lzma -q -c ./compressfile > /dev/null
-EOT
-chmod +x lzma_process
-
-
 cat > compress-lzma <<EOT
 #!/bin/sh
-/usr/bin/time -f "LZMA Compress Time: %e Seconds" ./lzma_process 2>&1
+\$TIMER_START
+./lzma_/bin/lzma -q -c ./compressfile > /dev/null 2>&1
+\$TIMER_STOP
 EOT
 chmod +x compress-lzma
diff --git a/pts/test-resources/compress-lzma/parse-results.php b/pts/test-resources/compress-lzma/parse-results.php
deleted file mode 100644
index 7bdba56..0000000
--- a/pts/test-resources/compress-lzma/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "LZMA Compress Time:") + 19);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/compress-pbzip2/install.sh b/pts/test-resources/compress-pbzip2/install.sh
index f4bd2d1..2702858 100755
--- a/pts/test-resources/compress-pbzip2/install.sh
+++ b/pts/test-resources/compress-pbzip2/install.sh
@@ -12,16 +12,11 @@ make pbzip2-static
 
 cd ..
 
-cat > pbzip2_process <<EOT
-#!/bin/sh
-cd pbzip2-1.0.2/
-./pbzip2 -c -p\$NUM_CPU_CORES -r -5 ../compressfile > /dev/null
-EOT
-chmod +x pbzip2_process
-
-
 cat > compress-pbzip2 <<EOT
 #!/bin/sh
-/usr/bin/time -f "PBZIP2 Compress Time: %e Seconds" ./pbzip2_process 2>&1
+cd pbzip2-1.0.2/
+\$TIMER_START
+./pbzip2 -c -p\$NUM_CPU_CORES -r -5 ../compressfile > /dev/null 2>&1
+\$TIMER_STOP
 EOT
 chmod +x compress-pbzip2
diff --git a/pts/test-resources/compress-pbzip2/parse-results.php b/pts/test-resources/compress-pbzip2/parse-results.php
deleted file mode 100644
index c4edb05..0000000
--- a/pts/test-resources/compress-pbzip2/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "PBZIP2 Compress Time:") + 21);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/encode-ape/install.sh b/pts/test-resources/encode-ape/install.sh
index de29ddd..72322c4 100755
--- a/pts/test-resources/encode-ape/install.sh
+++ b/pts/test-resources/encode-ape/install.sh
@@ -12,10 +12,7 @@ cd ..
 rm -rf mac-3.99-u4-b5-s4/
 
 echo "#!/bin/sh
-./ape_/bin/mac \$TEST_EXTENDS/pts-trondheim.wav /dev/null -c4000 1>/dev/null 2>/dev/null
-exit 0" > ape_process
-chmod +x ape_process
-
-echo "#!/bin/sh
-/usr/bin/time -f \"WAV To APE Encode Time: %e Seconds\" ./ape_process 2>&1" > encode-ape
+\$TIMER_START
+./ape_/bin/mac \$TEST_EXTENDS/pts-trondheim.wav /dev/null -c4000 > /dev/null 2>&1
+\$TIMER_STOP" > encode-ape
 chmod +x encode-ape
diff --git a/pts/test-resources/encode-ape/parse-results.php b/pts/test-resources/encode-ape/parse-results.php
deleted file mode 100644
index aa6a626..0000000
--- a/pts/test-resources/encode-ape/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "WAV To APE Encode Time:") + 23);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/encode-flac/install.sh b/pts/test-resources/encode-flac/install.sh
index 3c04634..5ea69c8 100755
--- a/pts/test-resources/encode-flac/install.sh
+++ b/pts/test-resources/encode-flac/install.sh
@@ -12,5 +12,7 @@ cd ..
 rm -rf flac-1.2.1/
 
 echo "#!/bin/sh
-/usr/bin/time -f \"WAV To FLAC Encode Time: %e Seconds\" ./flac_/bin/flac -s --best --totally-silent \$TEST_EXTENDS/pts-trondheim.wav -f -o /dev/null 2>&1" > flac
+\$TIMER_START
+./flac_/bin/flac -s --best --totally-silent \$TEST_EXTENDS/pts-trondheim.wav -f -o /dev/null 2>&1
+\$TIMER_STOP" > flac
 chmod +x flac
diff --git a/pts/test-resources/encode-flac/parse-results.php b/pts/test-resources/encode-flac/parse-results.php
deleted file mode 100644
index 81eef11..0000000
--- a/pts/test-resources/encode-flac/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "WAV To FLAC Encode Time:") + 24);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/encode-mp3/install.sh b/pts/test-resources/encode-mp3/install.sh
index 6dc7d86..bda13f3 100755
--- a/pts/test-resources/encode-mp3/install.sh
+++ b/pts/test-resources/encode-mp3/install.sh
@@ -12,5 +12,7 @@ cd ..
 rm -rf lame-398/
 
 echo "#!/bin/sh
-/usr/bin/time -f \"WAV To MP3 Encode Time: %e Seconds\" ./lame_/bin/lame --silent -h \$TEST_EXTENDS/pts-trondheim.wav /dev/null 2>&1" > lame
+\$TIMER_START
+./lame_/bin/lame --silent -h \$TEST_EXTENDS/pts-trondheim.wav /dev/null 2>&1
+\$TIMER_STOP" > lame
 chmod +x lame
diff --git a/pts/test-resources/encode-mp3/parse-results.php b/pts/test-resources/encode-mp3/parse-results.php
deleted file mode 100644
index 050b158..0000000
--- a/pts/test-resources/encode-mp3/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "WAV To MP3 Encode Time:") + 23);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/encode-ogg/parse-results.php b/pts/test-resources/encode-ogg/parse-results.php
deleted file mode 100644
index 06bbde7..0000000
--- a/pts/test-resources/encode-ogg/parse-results.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-echo getenv("TIMER_RESULT");
-?>
diff --git a/pts/test-resources/encode-wavpack/install.sh b/pts/test-resources/encode-wavpack/install.sh
index c329416..b827c57 100755
--- a/pts/test-resources/encode-wavpack/install.sh
+++ b/pts/test-resources/encode-wavpack/install.sh
@@ -12,9 +12,7 @@ cd ..
 rm -rf wavpack-4.41.0/
 
 echo "#!/bin/sh
-./wavpack_/bin/wavpack -q -r -hhx2 -o - \$TEST_EXTENDS/pts-trondheim.wav >/dev/null" > wavpack_process
-chmod +x wavpack_process
-
-echo "#!/bin/sh
-/usr/bin/time -f \"WAV To WavPack Encode Time: %e Seconds\" ./wavpack_process 2>&1" > encode-wavpack
+\$TIMER_START
+./wavpack_/bin/wavpack -q -r -hhx2 -o - \$TEST_EXTENDS/pts-trondheim.wav > /dev/null 2>&1
+\$TIMER_STOP" > encode-wavpack
 chmod +x encode-wavpack
diff --git a/pts/test-resources/encode-wavpack/parse-results.php b/pts/test-resources/encode-wavpack/parse-results.php
deleted file mode 100644
index 726aa00..0000000
--- a/pts/test-resources/encode-wavpack/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "WAV To WavPack Encode Time:") + 27);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/espeak/install.sh b/pts/test-resources/espeak/install.sh
index f9b0848..a5be612 100755
--- a/pts/test-resources/espeak/install.sh
+++ b/pts/test-resources/espeak/install.sh
@@ -13,5 +13,7 @@ rm -rf espeak-1.37-source/
 
 echo "#!/bin/sh
 cd espeak_/bin/
-LD_LIBRARY_PATH=$THIS_DIR/espeak_/lib/:\$LD_LIBRARY_PATH /usr/bin/time -f \"eSpeak Synthesis Time: %e Seconds\" ./espeak -f ../../gutenberg-science.txt -w /dev/null 2>&1" > espeak
+\$TIMER_START
+LD_LIBRARY_PATH=$THIS_DIR/espeak_/lib/:\$LD_LIBRARY_PATH ./espeak -f ../../gutenberg-science.txt -w /dev/null 2>&1
+\$TIMER_STOP" > espeak
 chmod +x espeak
diff --git a/pts/test-resources/espeak/parse-results.php b/pts/test-resources/espeak/parse-results.php
deleted file mode 100644
index ed5277f..0000000
--- a/pts/test-resources/espeak/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "eSpeak Synthesis Time:") + 22);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/ffmpeg/install.sh b/pts/test-resources/ffmpeg/install.sh
index 4989cb3..096c4ad 100755
--- a/pts/test-resources/ffmpeg/install.sh
+++ b/pts/test-resources/ffmpeg/install.sh
@@ -9,9 +9,7 @@ cd ..
 
 echo "#!/bin/sh
 
-echo \"#!/bin/sh
-./ffmpeg-may27-2008/ffmpeg -i \$TEST_EXTENDS/pts-trondheim.avi -y -target ntsc-vcd /dev/null\" > encode-process
-chmod +x encode-process
-
-/usr/bin/time -f \"Encoding Time: %e Seconds\" ./encode-process 2>&1 | grep Seconds" > ffmpeg
+\$TIMER_START
+./ffmpeg-may27-2008/ffmpeg -i \$TEST_EXTENDS/pts-trondheim.avi -y -target ntsc-vcd /dev/null 2>&1
+\$TIMER_STOP" > ffmpeg
 chmod +x ffmpeg
diff --git a/pts/test-resources/ffmpeg/parse-results.php b/pts/test-resources/ffmpeg/parse-results.php
deleted file mode 100644
index ac864bb..0000000
--- a/pts/test-resources/ffmpeg/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "Encoding Time:") + 14);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/fio/install.sh b/pts/test-resources/fio/install.sh
index 24c7743..235163d 100755
--- a/pts/test-resources/fio/install.sh
+++ b/pts/test-resources/fio/install.sh
@@ -7,6 +7,8 @@ cd ..
 
 echo "#!/bin/sh
 cd fio/
-/usr/bin/time -f \"Total fio Run-Time: %e Seconds\" ./fio \$@ 2>&1
+\$TIMER_START
+./fio \$@ 2>&1
+\$TIMER_STOP
 rm -f iometer.1.0" > fio-run
 chmod +x fio-run
diff --git a/pts/test-resources/fio/parse-results.php b/pts/test-resources/fio/parse-results.php
deleted file mode 100644
index 6977e14..0000000
--- a/pts/test-resources/fio/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "Total fio Run-Time:") + 19);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/gnupg/install.sh b/pts/test-resources/gnupg/install.sh
index 03b4a0d..4c50cf0 100755
--- a/pts/test-resources/gnupg/install.sh
+++ b/pts/test-resources/gnupg/install.sh
@@ -14,5 +14,7 @@ rm -rf gnupg-1.4.9/
 echo trondheim-pts-1234567890 > passphrase
 
 echo "#!/bin/sh
-/usr/bin/time -f \"Encryption Time: %e Seconds\" ./gnupg_/bin/gpg -c --no-options --passphrase-file passphrase -o /dev/null 1gbfile 2>&1" > gnupg
+\$TIMER_START
+./gnupg_/bin/gpg -c --no-options --passphrase-file passphrase -o /dev/null 1gbfile 2>&1
+\$TIMER_STOP" > gnupg
 chmod +x gnupg
diff --git a/pts/test-resources/gnupg/parse-results.php b/pts/test-resources/gnupg/parse-results.php
deleted file mode 100644
index e4d1849..0000000
--- a/pts/test-resources/gnupg/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "Encryption Time:") + 16);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/hmmer/install.sh b/pts/test-resources/hmmer/install.sh
index 1d1aa63..b1aebe0 100755
--- a/pts/test-resources/hmmer/install.sh
+++ b/pts/test-resources/hmmer/install.sh
@@ -23,7 +23,9 @@ chmod +x hmmpfam
 
 cat>hmmer<<EOT
 #!/bin/sh
-/usr/bin/time -f "Pfam search time: %e seconds" ./hmmpfam 2>&1 | grep seconds
+\$TIMER_START
+./hmmpfam 2>&1
+\$TIMER_STOP
 EOT
 chmod +x hmmer
 
diff --git a/pts/test-resources/hmmer/parse-results.php b/pts/test-resources/hmmer/parse-results.php
deleted file mode 100644
index 84612ea..0000000
--- a/pts/test-resources/hmmer/parse-results.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "Pfam search time:") + 18);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "seconds")));
-?>
diff --git a/pts/test-resources/mafft/install.sh b/pts/test-resources/mafft/install.sh
index 79ecb4a..2cb20d8 100755
--- a/pts/test-resources/mafft/install.sh
+++ b/pts/test-resources/mafft/install.sh
@@ -27,6 +27,8 @@ chmod +x align
 
 cat>mafft<<EOT
 #!/bin/sh
-/usr/bin/time -f "Sequence Alignment Time: %e Seconds" ./align 2>&1 | grep Seconds
+\$TIMER_START
+./align 2>&1
+\$TIMER_STOP
 EOT
-chmod +x mafft
\ No newline at end of file
+chmod +x mafft
diff --git a/pts/test-resources/mafft/parse-results.php b/pts/test-resources/mafft/parse-results.php
deleted file mode 100644
index 84f126b..0000000
--- a/pts/test-resources/mafft/parse-results.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "Sequence Alignment Time:") + 25);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/mencoder/install.sh b/pts/test-resources/mencoder/install.sh
index fcaf87c..1d5b049 100755
--- a/pts/test-resources/mencoder/install.sh
+++ b/pts/test-resources/mencoder/install.sh
@@ -14,9 +14,7 @@ rm -rf MPlayer-1.0rc2/
 
 echo "#!/bin/sh
 
-echo \"#!/bin/sh
-./mplayer_/bin/mencoder \$TEST_EXTENDS/pts-trondheim.avi -o /dev/null -ovc lavc -oac copy -lavcopts vcodec=mpeg4:threads=\$NUM_CPU_CORES:mbd=2:trell=1:v4mv=1:vstrict=1\" > encode-process
-chmod +x encode-process
-
-/usr/bin/time -f \"Encoding Time: %e Seconds\" ./encode-process 2>&1 | grep Seconds" > mencoder
+\$TIMER_START
+./mplayer_/bin/mencoder \$TEST_EXTENDS/pts-trondheim.avi -o /dev/null -ovc lavc -oac copy -lavcopts vcodec=mpeg4:threads=\$NUM_CPU_CORES:mbd=2:trell=1:v4mv=1:vstrict=1
+\$TIMER_STOP" > mencoder
 chmod +x mencoder
diff --git a/pts/test-resources/mencoder/parse-results.php b/pts/test-resources/mencoder/parse-results.php
deleted file mode 100644
index ac864bb..0000000
--- a/pts/test-resources/mencoder/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "Encoding Time:") + 14);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/mrbayes/install.sh b/pts/test-resources/mrbayes/install.sh
index 2d58129..c4c7a25 100755
--- a/pts/test-resources/mrbayes/install.sh
+++ b/pts/test-resources/mrbayes/install.sh
@@ -46,7 +46,9 @@ chmod +x mb
 
 cat>mrbayes<<EOT
 #!/bin/sh
-/usr/bin/time -f "MrBayes Analysis Time: %e Seconds" ./mb 2>&1 | grep Seconds
+\$TIMER_START
+./mb 2>&1
+\$TIMER_STOP
 EOT
 chmod +x mrbayes
 
diff --git a/pts/test-resources/mrbayes/parse-results.php b/pts/test-resources/mrbayes/parse-results.php
deleted file mode 100644
index 9cfb05f..0000000
--- a/pts/test-resources/mrbayes/parse-results.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "MrBayes Analysis Time:") + 23);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/pts-graph/install.sh b/pts/test-resources/pts-graph/install.sh
index aacaba7..acad21e 100755
--- a/pts/test-resources/pts-graph/install.sh
+++ b/pts/test-resources/pts-graph/install.sh
@@ -4,5 +4,7 @@ tar -xvf pts-graph-benchmark-1.tar.gz
 
 echo "#!/bin/sh
 
-/usr/bin/time -f \"pts_Graph Time: %e Seconds\" php pts-graph-benchmark/pts_graph_benchmark.php 2>&1" > pts-graph
+\$TIMER_START
+php pts-graph-benchmark/pts_graph_benchmark.php 2>&1
+\$TIMER_STOP" > pts-graph
 chmod +x pts-graph
diff --git a/pts/test-resources/pts-graph/parse-results.php b/pts/test-resources/pts-graph/parse-results.php
deleted file mode 100644
index fd28438..0000000
--- a/pts/test-resources/pts-graph/parse-results.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "pts_Graph Time:") + 15);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/render-bench/install.sh b/pts/test-resources/render-bench/install.sh
index fcb7fc2..5d4e93f 100755
--- a/pts/test-resources/render-bench/install.sh
+++ b/pts/test-resources/render-bench/install.sh
@@ -8,5 +8,7 @@ cd ..
 
 echo "#!/bin/sh
 cd render_bench/
-/usr/bin/time -f \"Total Render Time: %e Seconds\" ./render_bench 2>&1" > render-bench-test
+\$TIMER_START
+./render_bench 2>&1
+\$TIMER_STOP" > render-bench-test
 chmod +x render-bench-test
diff --git a/pts/test-resources/render-bench/parse-results.php b/pts/test-resources/render-bench/parse-results.php
deleted file mode 100644
index 560eb6d..0000000
--- a/pts/test-resources/render-bench/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "Total Render Time:") + 18);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/sample-program/install.sh b/pts/test-resources/sample-program/install.sh
index f6170d0..ac048c9 100755
--- a/pts/test-resources/sample-program/install.sh
+++ b/pts/test-resources/sample-program/install.sh
@@ -3,7 +3,8 @@
 g++ sample-pi-program.cpp -o sample-pi-program
 
 echo "#!/bin/sh
-
-/usr/bin/time -f \"Pi Calculation Time: %e Seconds\" ./sample-pi-program 2>&1 | grep Seconds" > sample-program
+\$TIMER_START
+./sample-pi-program 2>&1
+\$TIMER_STOP" > sample-program
 chmod +x sample-program
 
diff --git a/pts/test-resources/sample-program/parse-results.php b/pts/test-resources/sample-program/parse-results.php
deleted file mode 100644
index 58e76ad..0000000
--- a/pts/test-resources/sample-program/parse-results.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "Pi Calculation Time:") + 20);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/sqlite/install.sh b/pts/test-resources/sqlite/install.sh
index 8869056..ef7f913 100755
--- a/pts/test-resources/sqlite/install.sh
+++ b/pts/test-resources/sqlite/install.sh
@@ -15,6 +15,8 @@ chmod +x sqlite-inserts
 echo "#!/bin/sh
 rm -f benchmark.db
 ./sqlite-3.6.1/sqlite3 benchmark.db  \"CREATE TABLE pts1 ('I' SMALLINT NOT NULL, 'DT' TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, 'F1' VARCHAR(4) NOT NULL, 'F2' VARCHAR(16) NOT NULL, PRIMARY KEY ('I'), UNIQUE ('I'));\"
-/usr/bin/time -f \"SQLite Time: %e Seconds\" ./sqlite-inserts 2>&1
+\$TIMER_START
+./sqlite-inserts 2>&1
+\$TIMER_STOP
 rm -f benchmark.db" > sqlite
 chmod +x sqlite
diff --git a/pts/test-resources/sqlite/parse-results.php b/pts/test-resources/sqlite/parse-results.php
deleted file mode 100644
index d788214..0000000
--- a/pts/test-resources/sqlite/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "SQLite Time:") + 12);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/tandem-xml/install.sh b/pts/test-resources/tandem-xml/install.sh
index 090a8ff..bbfb394 100755
--- a/pts/test-resources/tandem-xml/install.sh
+++ b/pts/test-resources/tandem-xml/install.sh
@@ -7,11 +7,15 @@ echo "#!/bin/sh
 rm -f tmp/*.xml
 case \"\$1\" in
 \"WRITE\")
-	/usr/bin/time -f \"tandem_Xml Time: %e Seconds\" php tandem-benchmark/tandem_benchmark.php WRITE 2>&1
+	\$TIMER_START
+	php tandem-benchmark/tandem_benchmark.php WRITE 2>&1
+	\$TIMER_STOP
 	;;
 \"READ\")
 	php tandem-benchmark/tandem_benchmark.php WRITE
-	/usr/bin/time -f \"tandem_Xml Time: %e Seconds\" php tandem-benchmark/tandem_benchmark.php READ 2>&1
+	\$TIMER_START
+	php tandem-benchmark/tandem_benchmark.php READ 2>&1
+	\$TIMER_STOP
 	;;
 esac
 " > tandem-xml
diff --git a/pts/test-resources/tandem-xml/parse-results.php b/pts/test-resources/tandem-xml/parse-results.php
deleted file mode 100644
index 4a19f30..0000000
--- a/pts/test-resources/tandem-xml/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "tandem_Xml Time:") + 16);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/trislam/install.sh b/pts/test-resources/trislam/install.sh
index f2ab3d5..ee953e5 100755
--- a/pts/test-resources/trislam/install.sh
+++ b/pts/test-resources/trislam/install.sh
@@ -8,5 +8,7 @@ cd ..
 
 echo "#!/bin/sh
 cd trislam/
-/usr/bin/time -f \"Triangle Slammer Run-Time: %e Seconds\" ./trislam 2>&1" > trislam-run
+\$TIMER_START
+./trislam 2>&1
+\$TIMER_STOP" > trislam-run
 chmod +x trislam-run
diff --git a/pts/test-resources/trislam/parse-results.php b/pts/test-resources/trislam/parse-results.php
deleted file mode 100644
index e7ad975..0000000
--- a/pts/test-resources/trislam/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "Triangle Slammer Run-Time:") + 26);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>
diff --git a/pts/test-resources/yafray/install.sh b/pts/test-resources/yafray/install.sh
index c51b158..f4c1f81 100755
--- a/pts/test-resources/yafray/install.sh
+++ b/pts/test-resources/yafray/install.sh
@@ -42,5 +42,7 @@ cp yafray_/etc/gram.yafray .
 
 echo "#!/bin/sh
 export LD_LIBRARY_PATH=\"$THIS_DIR/yafray_/lib/:\$LD_LIBRARY_PATH\"
-/usr/bin/time -f \"Render Time: %e Seconds\" ./yafray_/bin/yafray -c \$NUM_CPU_CORES YBtest.xml 2>&1 | grep Seconds" > yafray-run
+\$TIMER_START
+./yafray_/bin/yafray -c \$NUM_CPU_CORES YBtest.xml 2>&1
+\$TIMER_STOP" > yafray-run
 chmod +x yafray-run
diff --git a/pts/test-resources/yafray/parse-results.php b/pts/test-resources/yafray/parse-results.php
deleted file mode 100644
index 6f8e4e5..0000000
--- a/pts/test-resources/yafray/parse-results.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$BENCHMARK_RESULTS = substr($argv[1], strrpos($argv[1], "Render Time:") + 12);
-echo trim(substr($BENCHMARK_RESULTS, 0, strpos($BENCHMARK_RESULTS, "Seconds")));
-?>