pts: Switch all audio encoding tests to extend a timed-audio-encode base

test instead of all tests having some of the same code copied throughout

10 files changed, 6 insertions, 45 deletions

diff --git a/pts/test-resources/base/timed-audio-encode/install.sh b/pts/test-resources/base/timed-audio-encode/install.sh
index dfb4a78..6d844de 100644
--- a/pts/test-resources/base/timed-audio-encode/install.sh
+++ b/pts/test-resources/base/timed-audio-encode/install.sh
@@ -1,3 +1,4 @@
 #!/bin/sh
 
 tar -xvf pts-trondheim-wav-3.tar.gz
+mv pts-trondheim-3.wav pts-trondheim.wav
diff --git a/pts/test-resources/encode-ape/install.sh b/pts/test-resources/encode-ape/install.sh
index ad34ee9..de29ddd 100755
--- a/pts/test-resources/encode-ape/install.sh
+++ b/pts/test-resources/encode-ape/install.sh
@@ -12,7 +12,7 @@ cd ..
 rm -rf mac-3.99-u4-b5-s4/
 
 echo "#!/bin/sh
-./ape_/bin/mac \$TEST_EXTENDS/pts-trondheim-3.wav /dev/null -c4000 1>/dev/null 2>/dev/null
+./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
 
diff --git a/pts/test-resources/encode-flac/downloads.xml b/pts/test-resources/encode-flac/downloads.xml
index fddc8c0..dfc0662 100644
--- a/pts/test-resources/encode-flac/downloads.xml
+++ b/pts/test-resources/encode-flac/downloads.xml
@@ -4,10 +4,5 @@
 			<URL>http://internap.dl.sourceforge.net/sourceforge/flac/flac-1.2.1.tar.gz, http://superb-east.dl.sourceforge.net/sourceforge/flac/flac-1.2.1.tar.gz, http://superb-west.dl.sourceforge.net/sourceforge/flac/flac-1.2.1.tar.gz</URL>
 			<MD5>153c8b15a54da428d1f0fadc756c22c7</MD5>
 		</Package>
-		<Package>
-			<URL>http://www.phoronix-test-suite.com/benchmark-files/pts-trondheim-wav-3.tar.gz, http://www.phoronix.net/downloads/phoronix-test-suite/benchmark-files/pts-trondheim-wav-3.tar.gz</URL>
-			<MD5>49b8f2f98ed71af16866e2df580e14c3</MD5>
-			<DownloadTo>SHARED</DownloadTo>
-		</Package>
 	</Downloads>
 </PhoronixTestSuite>
diff --git a/pts/test-resources/encode-flac/install.sh b/pts/test-resources/encode-flac/install.sh
index f5bb41e..3c04634 100755
--- a/pts/test-resources/encode-flac/install.sh
+++ b/pts/test-resources/encode-flac/install.sh
@@ -1,10 +1,5 @@
 #!/bin/sh
 
-if [ ! -f ../pts-shared/pts-trondheim-3.wav ]
-  then
-     tar -xvf ../pts-shared/pts-trondheim-wav-3.tar.gz -C ../pts-shared/
-fi
-
 THIS_DIR=$(pwd)
 mkdir $THIS_DIR/flac_
 
@@ -17,5 +12,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-3.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 \$TEST_EXTENDS/pts-trondheim.wav -f -o /dev/null 2>&1" > flac
 chmod +x flac
diff --git a/pts/test-resources/encode-mp3/downloads.xml b/pts/test-resources/encode-mp3/downloads.xml
index 9f4da5a..f3d0304 100644
--- a/pts/test-resources/encode-mp3/downloads.xml
+++ b/pts/test-resources/encode-mp3/downloads.xml
@@ -4,10 +4,5 @@
 			<URL>http://voxel.dl.sourceforge.net/sourceforge/lame/lame-398.tar.gz, http://voxel.dl.sourceforge.net/sourceforge/lame/lame-398.tar.gz, http://internap.dl.sourceforge.net/sourceforge/lame/lame-398.tar.gz, http://transact.dl.sourceforge.net/sourceforge/lame/lame-398.tar.gz</URL>
 			<MD5>f44b9f8e1b5d8835d0a77f9cc9cedd1c</MD5>
 		</Package>
-		<Package>
-			<URL>http://www.phoronix-test-suite.com/benchmark-files/pts-trondheim-wav-3.tar.gz, http://www.phoronix.net/downloads/phoronix-test-suite/benchmark-files/pts-trondheim-wav-3.tar.gz</URL>
-			<MD5>49b8f2f98ed71af16866e2df580e14c3</MD5>
-			<DownloadTo>SHARED</DownloadTo>
-		</Package>
 	</Downloads>
 </PhoronixTestSuite>
diff --git a/pts/test-resources/encode-mp3/install.sh b/pts/test-resources/encode-mp3/install.sh
index 80a5ebc..6dc7d86 100755
--- a/pts/test-resources/encode-mp3/install.sh
+++ b/pts/test-resources/encode-mp3/install.sh
@@ -1,10 +1,5 @@
 #!/bin/sh
 
-if [ ! -f ../pts-shared/pts-trondheim-3.wav ]
-  then
-     tar -xvf ../pts-shared/pts-trondheim-wav-3.tar.gz -C ../pts-shared/
-fi
-
 THIS_DIR=$(pwd)
 mkdir $THIS_DIR/lame_
 
@@ -17,5 +12,5 @@ cd ..
 rm -rf lame-398/
 
 echo "#!/bin/sh
-/usr/bin/time -f \"WAV To MP3 Encode Time: %e Seconds\" ./lame_/bin/lame --silent -h ../pts-shared/pts-trondheim-3.wav /dev/null 2>&1" > lame
+/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
 chmod +x lame
diff --git a/pts/test-resources/encode-ogg/downloads.xml b/pts/test-resources/encode-ogg/downloads.xml
index fde814a..7364566 100644
--- a/pts/test-resources/encode-ogg/downloads.xml
+++ b/pts/test-resources/encode-ogg/downloads.xml
@@ -12,10 +12,5 @@
 			<URL>http://downloads.xiph.org/releases/vorbis/vorbis-tools-1.2.0.tar.gz</URL>
 			<MD5>df976d24e51ef3d87cd462edf747bf9a</MD5>
 		</Package>
-		<Package>
-			<URL>http://www.phoronix-test-suite.com/benchmark-files/pts-trondheim-wav-3.tar.gz, http://www.phoronix.net/downloads/phoronix-test-suite/benchmark-files/pts-trondheim-wav-3.tar.gz</URL>
-			<MD5>49b8f2f98ed71af16866e2df580e14c3</MD5>
-			<DownloadTo>SHARED</DownloadTo>
-		</Package>
 	</Downloads>
 </PhoronixTestSuite>
diff --git a/pts/test-resources/encode-ogg/install.sh b/pts/test-resources/encode-ogg/install.sh
index e95093d..1dd383f 100755
--- a/pts/test-resources/encode-ogg/install.sh
+++ b/pts/test-resources/encode-ogg/install.sh
@@ -1,10 +1,5 @@
 #!/bin/sh
 
-if [ ! -f ../pts-shared/pts-trondheim-3.wav ]
-  then
-     tar -xvf ../pts-shared/pts-trondheim-wav-3.tar.gz -C ../pts-shared/
-fi
-
 THIS_DIR=$(pwd)
 mkdir $THIS_DIR/vorbis
 
@@ -34,5 +29,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-3.wav -q 10 -o /dev/null 2>&1" > oggenc
+/usr/bin/time -f \"WAV To OGG Encode Time: %e Seconds\" ./vorbis/bin/oggenc --quiet \$TEST_EXTENDS/pts-trondheim.wav -q 10 -o /dev/null 2>&1" > oggenc
 chmod +x oggenc
diff --git a/pts/test-resources/encode-wavpack/downloads.xml b/pts/test-resources/encode-wavpack/downloads.xml
index f2717c1..a796903 100644
--- a/pts/test-resources/encode-wavpack/downloads.xml
+++ b/pts/test-resources/encode-wavpack/downloads.xml
@@ -4,10 +4,5 @@
 			<URL>http://wavpack.com/wavpack-4.41.0.tar.bz2</URL>
 			<MD5>6a13edeae437498db78fe528d9e95144</MD5>
 		</Package>
-		<Package>
-			<URL>http://www.phoronix-test-suite.com/benchmark-files/pts-trondheim-wav-3.tar.gz, http://www.phoronix.net/downloads/phoronix-test-suite/benchmark-files/pts-trondheim-wav-3.tar.gz</URL>
-			<MD5>49b8f2f98ed71af16866e2df580e14c3</MD5>
-			<DownloadTo>SHARED</DownloadTo>
-		</Package>
 	</Downloads>
 </PhoronixTestSuite>
diff --git a/pts/test-resources/encode-wavpack/install.sh b/pts/test-resources/encode-wavpack/install.sh
index 9790974..c329416 100755
--- a/pts/test-resources/encode-wavpack/install.sh
+++ b/pts/test-resources/encode-wavpack/install.sh
@@ -1,10 +1,5 @@
 #!/bin/sh
 
-if [ ! -f ../pts-shared/pts-trondheim-3.wav ]
-  then
-     tar -xvf ../pts-shared/pts-trondheim-wav-3.tar.gz -C ../pts-shared/
-fi
-
 THIS_DIR=$(pwd)
 mkdir $THIS_DIR/wavpack_
 
@@ -17,7 +12,7 @@ cd ..
 rm -rf wavpack-4.41.0/
 
 echo "#!/bin/sh
-./wavpack_/bin/wavpack -q -r -hhx2 -o - ../pts-shared/pts-trondheim-3.wav >/dev/null" > wavpack_process
+./wavpack_/bin/wavpack -q -r -hhx2 -o - \$TEST_EXTENDS/pts-trondheim.wav >/dev/null" > wavpack_process
 chmod +x wavpack_process
 
 echo "#!/bin/sh