More profile updates... switch time back to /usr/bin/time and add proper

ImageMagick download links.

17 files changed, 18 insertions, 18 deletions

diff --git a/pts/test-resources/build-apache/install.sh b/pts/test-resources/build-apache/install.sh
index 5a47330..ebf9d6c 100644
--- a/pts/test-resources/build-apache/install.sh
+++ b/pts/test-resources/build-apache/install.sh
@@ -8,6 +8,6 @@ tar -xvf httpd-2.2.8.tar.gz
 cd httpd-2.2.8/
 ./configure > /dev/null
 sleep 3
-time -f \"Apache Build Time: %e Seconds\" make -s -j \$NUM_CPU_JOBS 2>&1 | grep Seconds" > time-compile-apache
+/usr/bin/time -f \"Apache Build Time: %e Seconds\" make -s -j \$NUM_CPU_JOBS 2>&1 | grep Seconds" > time-compile-apache
 
 chmod +x time-compile-apache
diff --git a/pts/test-resources/build-imagemagick/downloads.xml b/pts/test-resources/build-imagemagick/downloads.xml
index 2016b76..1e81401 100644
--- a/pts/test-resources/build-imagemagick/downloads.xml
+++ b/pts/test-resources/build-imagemagick/downloads.xml
@@ -1,7 +1,7 @@
 <PhoronixTestSuite>
 	<Downloads>
 		<Package>
-			<URL>http://image_magick.veidrodis.com/image_magick/ImageMagick-6.4.0-11.tar.bz2</URL>
+			<URL>http://superb-east.dl.sourceforge.net/sourceforge/imagemagick/ImageMagick-6.4.0-11.tar.bz2, ftp://ftp.imagemagick.org/pub/ImageMagick/legacy/ImageMagick-6.4.0-11.tar.bz2, http://internap.dl.sourceforge.net/sourceforge/imagemagick/ImageMagick-6.4.0-11.tar.bz2</URL>
 			<MD5>f7b96a073f87e655c8d47d1d3947b0c4</MD5>
 			<FileName>image-magick.tar.bz2</FileName>
 		</Package>
diff --git a/pts/test-resources/build-imagemagick/install.sh b/pts/test-resources/build-imagemagick/install.sh
index 3d6b96a..7a36e1f 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
-time -f \"ImageMagick Build Time: %e Seconds\" make -s -j \$NUM_CPU_JOBS 2>&1 | grep Seconds" > time-compile-imagemagick
+/usr/bin/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 b990c2d..5b5f7fe 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
-time -f \"Kernel Build Time: %e Seconds\" make -s -j \$NUM_CPU_JOBS 2>&1 | grep Seconds" > time-compile-kernel
+/usr/bin/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 4a53f5d..96fc175 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
-time -f \"MPlayer Build Time: %e Seconds\" make -j \$NUM_CPU_JOBS 2>&1 | grep Seconds" > time-compile-mplayer
+/usr/bin/time -f \"MPlayer Build Time: %e Seconds\" make -j \$NUM_CPU_JOBS 2>&1 | grep Seconds" > time-compile-mplayer
 
 chmod +x time-compile-mplayer
 
diff --git a/pts/test-resources/build-php/install.sh b/pts/test-resources/build-php/install.sh
index 8e0e993..8b95468 100644
--- a/pts/test-resources/build-php/install.sh
+++ b/pts/test-resources/build-php/install.sh
@@ -27,6 +27,6 @@ tar -xjf php-5.2.5.tar.bz2
 cd php-5.2.5/
 ./configure --with-libxml-dir=$THIS_DIR/libxml2 > /dev/null
 sleep 3
-time -f \"PHP Build Time: %e Seconds\" make -s -j \$NUM_CPU_JOBS 2>&1 | grep Seconds" > time-compile-php
+/usr/bin/time -f \"PHP Build Time: %e Seconds\" make -s -j \$NUM_CPU_JOBS 2>&1 | grep Seconds" > time-compile-php
 
 chmod +x time-compile-php
diff --git a/pts/test-resources/compress-gzip/install.sh b/pts/test-resources/compress-gzip/install.sh
index 18f40ce..34521b1 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
-time -f "Gzip Compress Time: %e Seconds" ./gzip_bigfile 2>&1
+/usr/bin/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 e5a0bc8..d592fc8 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/
-time -f "PBZIP2 Compress Time: %e Seconds" ./pbzip2 -k -f -p\$NUM_CPU_CORES -r -5 ../bigfile 2>&1
+/usr/bin/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 cc7a4f9..1c305d0 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
-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
+/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
 chmod +x flac
diff --git a/pts/test-resources/encode-mp3/install.sh b/pts/test-resources/encode-mp3/install.sh
index 89b220d..71a9d64 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
-time -f \"WAV To MP3 Encode Time: %e Seconds\" ./lame_/bin/lame --silent -h ../pts-shared/pts-trondheim.wav /dev/null 2>&1" > lame
+/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
 chmod +x lame
diff --git a/pts/test-resources/encode-ogg/install.sh b/pts/test-resources/encode-ogg/install.sh
index b2e476b..9f6ec50 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
-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
+/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
 chmod +x oggenc
diff --git a/pts/test-resources/espeak/install.sh b/pts/test-resources/espeak/install.sh
index 224426b..b7b0835 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 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 /usr/bin/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/gnupg/install.sh b/pts/test-resources/gnupg/install.sh
index ecafeda..61afd19 100644
--- a/pts/test-resources/gnupg/install.sh
+++ b/pts/test-resources/gnupg/install.sh
@@ -16,5 +16,5 @@ rm -rf gnupg-1.4.9/
 echo trondheim-pts-1234567890 > passphrase
 
 echo "#!/bin/sh
-time -f \"Encryption Time: %e Seconds\" ./gnupg_/bin/gpg -c --no-options --passphrase-file passphrase -o /dev/null 1gbfile 2>&1" > gnupg
+/usr/bin/time -f \"Encryption Time: %e Seconds\" ./gnupg_/bin/gpg -c --no-options --passphrase-file passphrase -o /dev/null 1gbfile 2>&1" > gnupg
 chmod +x gnupg
diff --git a/pts/test-resources/render-bench/install.sh b/pts/test-resources/render-bench/install.sh
index 5cb8dd9..ee9a977 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/
-time -f \"Total Render Time: %e Seconds\" ./render_bench 2>&1" > render-bench-test
+/usr/bin/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 06fe65d..0310480 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
 
-time -f \"Pi Calculation Time: %e Seconds\" ./sample-pi-program 2>&1 | grep Seconds" > sample-program
+/usr/bin/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/sqlite/install.sh b/pts/test-resources/sqlite/install.sh
index 1fea1b1..0ee3343 100644
--- a/pts/test-resources/sqlite/install.sh
+++ b/pts/test-resources/sqlite/install.sh
@@ -17,6 +17,6 @@ chmod +x sqlite-inserts
 echo "#!/bin/sh
 rm -f benchmark.db
 ./sqlite-3.5.9/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'));\"
-time -f \"SQLite Time: %e Seconds\" ./sqlite-inserts 2>&1
+/usr/bin/time -f \"SQLite Time: %e Seconds\" ./sqlite-inserts 2>&1
 rm -f benchmark.db" > sqlite
 chmod +x sqlite
diff --git a/pts/test-resources/tandem-xml/install.sh b/pts/test-resources/tandem-xml/install.sh
index e278eb6..44bc2dd 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\")
-	time -f \"tandem_Xml Time: %e Seconds\" php tandem-benchmark/tandem_benchmark.php WRITE 2>&1
+	/usr/bin/time -f \"tandem_Xml Time: %e Seconds\" php tandem-benchmark/tandem_benchmark.php WRITE 2>&1
 	;;
 \"READ\")
 	php tandem-benchmark/tandem_benchmark.php WRITE
-	time -f \"tandem_Xml Time: %e Seconds\" php tandem-benchmark/tandem_benchmark.php READ 2>&1
+	/usr/bin/time -f \"tandem_Xml Time: %e Seconds\" php tandem-benchmark/tandem_benchmark.php READ 2>&1
 	;;
 esac
 " > tandem-xml