Change static /usr/bin/time to time in all test profiles...

14 files changed, 15 insertions, 15 deletions

diff --git a/documentation/guide-write-test-profile.txt b/documentation/guide-write-test-profile.txt
index 4ef0116..9fbc959 100644
--- a/documentation/guide-write-test-profile.txt
+++ b/documentation/guide-write-test-profile.txt
@@ -55,7 +55,7 @@ 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
+time -f \"Pi Calculation Time: %e Seconds\" ./sample-pi-program 2>&1 | grep Seconds" > sample-program
 chmod +x sample-program
 
 This install file builds the code with GCC, and then creates a small script that is run by the Phoronix Test Suite, which times how long it takes to run the software. Where does the source-code come into play? Well, it needs to be downloaded now from a web server. The Phoronix Test Suite has built-in support for managing downloads from multiple servers in a random over, fall-back support if one mirror is done, and verification of MD5 check-sums. Below is the downloads.xml file for sample-program that covers all of this.
diff --git a/pts/test-resources/build-imagemagick/install.sh b/pts/test-resources/build-imagemagick/install.sh
index 7a36e1f..3d6b96a 100644
--- a/pts/test-resources/build-imagemagick/install.sh
+++ b/pts/test-resources/build-imagemagick/install.sh
@@ -15,6 +15,6 @@ 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
+time -f \"ImageMagick Build Time: %e Seconds\" make -s -j \$NUM_CPU_JOBS 2>&1 | grep Seconds" > time-compile-imagemagick
 
 chmod +x time-compile-imagemagick
diff --git a/pts/test-resources/build-linux-kernel/install.sh b/pts/test-resources/build-linux-kernel/install.sh
index 5b5f7fe..b990c2d 100644
--- a/pts/test-resources/build-linux-kernel/install.sh
+++ b/pts/test-resources/build-linux-kernel/install.sh
@@ -27,6 +27,6 @@ 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
+time -f \"Kernel Build Time: %e Seconds\" make -s -j \$NUM_CPU_JOBS 2>&1 | grep Seconds" > time-compile-kernel
 
 chmod +x time-compile-kernel
diff --git a/pts/test-resources/build-mplayer/install.sh b/pts/test-resources/build-mplayer/install.sh
index 0773532..74abb98 100644
--- a/pts/test-resources/build-mplayer/install.sh
+++ b/pts/test-resources/build-mplayer/install.sh
@@ -15,7 +15,7 @@ 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 -s -j \$NUM_CPU_JOBS 2>&1 | grep Seconds" > time-compile-mplayer
+time -f \"MPlayer Build Time: %e Seconds\" make -s -j \$NUM_CPU_JOBS 2>&1 | grep Seconds" > time-compile-mplayer
 
 chmod +x time-compile-mplayer
 
diff --git a/pts/test-resources/compress-gzip/install.sh b/pts/test-resources/compress-gzip/install.sh
index 34521b1..18f40ce 100644
--- a/pts/test-resources/compress-gzip/install.sh
+++ b/pts/test-resources/compress-gzip/install.sh
@@ -15,7 +15,7 @@ chmod +x gzip_bigfile
 
 cat > compress-gzip <<EOT
 #!/bin/sh
-/usr/bin/time -f "Gzip Compress Time: %e Seconds" ./gzip_bigfile 2>&1
+time -f "Gzip Compress Time: %e Seconds" ./gzip_bigfile 2>&1
 EOT
 chmod +x compress-gzip 
 
diff --git a/pts/test-resources/compress-pbzip2/install.sh b/pts/test-resources/compress-pbzip2/install.sh
index d592fc8..e5a0bc8 100644
--- a/pts/test-resources/compress-pbzip2/install.sh
+++ b/pts/test-resources/compress-pbzip2/install.sh
@@ -27,7 +27,7 @@ done
 cat > compress-pbzip2 <<EOT
 #!/bin/sh
 cd pbzip2-1.0.2/
-/usr/bin/time -f "PBZIP2 Compress Time: %e Seconds" ./pbzip2 -k -f -p\$NUM_CPU_CORES -r -5 ../bigfile 2>&1
+time -f "PBZIP2 Compress Time: %e Seconds" ./pbzip2 -k -f -p\$NUM_CPU_CORES -r -5 ../bigfile 2>&1
 rm -f bigfile.bz2
 EOT
 chmod +x compress-pbzip2
diff --git a/pts/test-resources/encode-flac/install.sh b/pts/test-resources/encode-flac/install.sh
index 1c305d0..cc7a4f9 100644
--- a/pts/test-resources/encode-flac/install.sh
+++ b/pts/test-resources/encode-flac/install.sh
@@ -19,5 +19,5 @@ 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 ../pts-shared/pts-trondheim.wav -f -o /dev/null 2>&1" > flac
+time -f \"WAV To FLAC Encode Time: %e Seconds\" ./flac_/bin/flac -s --best --totally-silent ../pts-shared/pts-trondheim.wav -f -o /dev/null 2>&1" > flac
 chmod +x flac
diff --git a/pts/test-resources/encode-mp3/install.sh b/pts/test-resources/encode-mp3/install.sh
index 71a9d64..89b220d 100644
--- a/pts/test-resources/encode-mp3/install.sh
+++ b/pts/test-resources/encode-mp3/install.sh
@@ -19,5 +19,5 @@ cd ..
 rm -rf lame-3.97/
 
 echo "#!/bin/sh
-/usr/bin/time -f \"WAV To MP3 Encode Time: %e Seconds\" ./lame_/bin/lame --silent -h ../pts-shared/pts-trondheim.wav /dev/null 2>&1" > lame
+time -f \"WAV To MP3 Encode Time: %e Seconds\" ./lame_/bin/lame --silent -h ../pts-shared/pts-trondheim.wav /dev/null 2>&1" > lame
 chmod +x lame
diff --git a/pts/test-resources/encode-ogg/install.sh b/pts/test-resources/encode-ogg/install.sh
index 9f6ec50..b2e476b 100644
--- a/pts/test-resources/encode-ogg/install.sh
+++ b/pts/test-resources/encode-ogg/install.sh
@@ -36,5 +36,5 @@ cd ..
 rm -rf vorbis-tools-1.2.0/
 
 echo "#!/bin/sh
-/usr/bin/time -f \"WAV To OGG Encode Time: %e Seconds\" ./vorbis/bin/oggenc --quiet ../pts-shared/pts-trondheim.wav -q 10 -o /dev/null 2>&1" > oggenc
+time -f \"WAV To OGG Encode Time: %e Seconds\" ./vorbis/bin/oggenc --quiet ../pts-shared/pts-trondheim.wav -q 10 -o /dev/null 2>&1" > oggenc
 chmod +x oggenc
diff --git a/pts/test-resources/espeak/install.sh b/pts/test-resources/espeak/install.sh
index b7b0835..224426b 100644
--- a/pts/test-resources/espeak/install.sh
+++ b/pts/test-resources/espeak/install.sh
@@ -13,5 +13,5 @@ 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 ../../20417-8.txt -w /dev/null 2>&1" > espeak
+LD_LIBRARY_PATH=$THIS_DIR/espeak_/lib/:\$LD_LIBRARY_PATH time -f \"eSpeak Synthesis Time: %e Seconds\" ./espeak -f ../../20417-8.txt -w /dev/null 2>&1" > espeak
 chmod +x espeak
diff --git a/pts/test-resources/pts-graph/install.sh b/pts/test-resources/pts-graph/install.sh
index e58a2ab..75e65ef 100644
--- a/pts/test-resources/pts-graph/install.sh
+++ b/pts/test-resources/pts-graph/install.sh
@@ -6,5 +6,5 @@ tar -xvf pts-graph-benchmark.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
+time -f \"pts_Graph Time: %e Seconds\" php pts-graph-benchmark/pts_graph_benchmark.php 2>&1" > pts-graph
 chmod +x pts-graph
diff --git a/pts/test-resources/render-bench/install.sh b/pts/test-resources/render-bench/install.sh
index ee9a977..5cb8dd9 100644
--- a/pts/test-resources/render-bench/install.sh
+++ b/pts/test-resources/render-bench/install.sh
@@ -10,5 +10,5 @@ cd ..
 
 echo "#!/bin/sh
 cd render_bench/
-/usr/bin/time -f \"Total Render Time: %e Seconds\" ./render_bench 2>&1" > render-bench-test
+time -f \"Total Render Time: %e Seconds\" ./render_bench 2>&1" > render-bench-test
 chmod +x render-bench-test
diff --git a/pts/test-resources/sample-program/install.sh b/pts/test-resources/sample-program/install.sh
index 0310480..06fe65d 100644
--- a/pts/test-resources/sample-program/install.sh
+++ b/pts/test-resources/sample-program/install.sh
@@ -4,6 +4,6 @@ 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
+time -f \"Pi Calculation Time: %e Seconds\" ./sample-pi-program 2>&1 | grep Seconds" > sample-program
 chmod +x sample-program
 
diff --git a/pts/test-resources/tandem-xml/install.sh b/pts/test-resources/tandem-xml/install.sh
index 3c7a119..96052f3 100644
--- a/pts/test-resources/tandem-xml/install.sh
+++ b/pts/test-resources/tandem-xml/install.sh
@@ -9,11 +9,11 @@ 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
+	time -f \"tandem_Xml Time: %e Seconds\" php tandem-benchmark/tandem_benchmark.php WRITE 2>&1
 	;;
 \"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
+	time -f \"tandem_Xml Time: %e Seconds\" php tandem-benchmark/tandem_benchmark.php READ 2>&1
 	;;
 esac
 " > tandem-xml