pts: Switch all video tests to extend a video-sample base test instead

of all tests having some of the same code copied throughout

13 files changed, 37 insertions, 36 deletions

diff --git a/EXPERIMENTAL-CHANGE-LOG b/EXPERIMENTAL-CHANGE-LOG
index d9dfa74..61c34af 100644
--- a/EXPERIMENTAL-CHANGE-LOG
+++ b/EXPERIMENTAL-CHANGE-LOG
@@ -15,6 +15,7 @@ Phoronix Test Suite
 - pts-core: Report identifiers of test profiles being extended to the test profiles being run
 - 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
 - pts: Switch all build tests to extend a timed-build base test instead of all tests having some of the same code copied throughout
+- pts: Switch all video tests to extend a video-sample base test instead of all tests having some of the same code copied throughout
 - tandem_Xml: Add a pts_test_tandem_XmlReader object that extends tandem_XmlReader but takes advantage of the handleXmlZeroTagFallback
 - tandem_Xml: Add fallback function handler support when a tag isn't found
 - documentation: Add basic documentation concerning the Self-Contained Test Profiles (SCTP) XML tags that are added
diff --git a/pts/test-profiles/base/video-sample.xml b/pts/test-profiles/base/video-sample.xml
new file mode 100644
index 0000000..a7457af
--- /dev/null
+++ b/pts/test-profiles/base/video-sample.xml
@@ -0,0 +1,14 @@
+<PhoronixTestSuite>
+	<TestProfile>
+		<TestType>Processor</TestType>
+		<SoftwareType>Utility</SoftwareType>
+		<License>FREE</License>
+		<Status>VERIFIED</Status>
+	</TestProfile>
+	<TestInformation>
+		<TimesToRun>3</TimesToRun>
+		<ResultScale>Seconds</ResultScale>
+		<Proportion>LIB</Proportion>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
+	</TestInformation>
+</PhoronixTestSuite>
diff --git a/pts/test-profiles/ffmpeg.xml b/pts/test-profiles/ffmpeg.xml
index b0c5c30..026a9a1 100644
--- a/pts/test-profiles/ffmpeg.xml
+++ b/pts/test-profiles/ffmpeg.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.0.0</Version>
+		<Version>1.1.0</Version>
 		<TestType>Processor</TestType>
 		<SoftwareType>Utility</SoftwareType>
 		<License>FREE</License>
@@ -9,6 +9,7 @@
 		<DownloadSize>88</DownloadSize>
 		<EnvironmentSize>16</EnvironmentSize>
 		<ProjectURL>http://ffmpeg.mplayerhq.hu/</ProjectURL>
+		<Extends>video-sample</Extends>
 	</TestProfile>
 	<TestInformation>
 		<Title>FFmpeg</Title>
diff --git a/pts/test-profiles/mencoder.xml b/pts/test-profiles/mencoder.xml
index 3756dce..cedddd5 100644
--- a/pts/test-profiles/mencoder.xml
+++ b/pts/test-profiles/mencoder.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.0.0</Version>
+		<Version>1.1.0</Version>
 		<TestType>Processor</TestType>
 		<SoftwareType>Utility</SoftwareType>
 		<License>FREE</License>
@@ -9,6 +9,7 @@
 		<DownloadSize>95</DownloadSize>
 		<EnvironmentSize>16</EnvironmentSize>
 		<ProjectURL>http://www.mplayerhq.hu/</ProjectURL>
+		<Extends>video-sample</Extends>
 	</TestProfile>
 	<TestInformation>
 		<Title>Mencoder</Title>
diff --git a/pts/test-profiles/video-extensions.xml b/pts/test-profiles/video-extensions.xml
index c79ff73..5c70121 100644
--- a/pts/test-profiles/video-extensions.xml
+++ b/pts/test-profiles/video-extensions.xml
@@ -1,6 +1,6 @@
 <PhoronixTestSuite>
 	<TestProfile>
-		<Version>1.0.0</Version>
+		<Version>1.1.0</Version>
 		<TestType>Graphics</TestType>
 		<SoftwareType>Benchmark</SoftwareType>
 		<License>FREE</License>
@@ -9,6 +9,7 @@
 		<DownloadSize>24.0</DownloadSize>
 		<EnvironmentSize>30.0</EnvironmentSize>
 		<ProjectURL>http://www.mplayerhq.hu/</ProjectURL>
+		<Extends>video-sample</Extends>
 	</TestProfile>
 	<TestInformation>
 		<Title>MPlayer Video Playback Tests</Title>
diff --git a/pts/test-resources/base/video-sample/downloads.xml b/pts/test-resources/base/video-sample/downloads.xml
new file mode 100644
index 0000000..3675ca3
--- /dev/null
+++ b/pts/test-resources/base/video-sample/downloads.xml
@@ -0,0 +1,9 @@
+<PhoronixTestSuite>
+	<Downloads>
+		<Package>
+			<URL>http://www.phoronix-test-suite.com/benchmark-files/pts-trondheim-avi.tar.bz2, http://www.phoronix.net/downloads/phoronix-test-suite/benchmark-files/pts-trondheim-avi.tar.bz2</URL>
+			<MD5>c91aa7b412f32c0f2b616ebfe2f261ad</MD5>
+		</Package>
+	</Downloads>
+</PhoronixTestSuite>
+
diff --git a/pts/test-resources/base/video-sample/install.sh b/pts/test-resources/base/video-sample/install.sh
new file mode 100644
index 0000000..c0fe09d
--- /dev/null
+++ b/pts/test-resources/base/video-sample/install.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+tar -xvf ../pts-shared/pts-trondheim-avi.tar.bz2
+# mv pts-trondheim-1.avi pts-trondheim.avi
diff --git a/pts/test-resources/ffmpeg/downloads.xml b/pts/test-resources/ffmpeg/downloads.xml
index 11b505c..338f77b 100644
--- a/pts/test-resources/ffmpeg/downloads.xml
+++ b/pts/test-resources/ffmpeg/downloads.xml
@@ -4,11 +4,6 @@
 			<URL>http://www.phoronix-test-suite.com/benchmark-files/ffmpeg-may27-2008.tar.bz2, http://www.phoronix.net/downloads/phoronix-test-suite/benchmark-files/ffmpeg-may27-2008.tar.bz2</URL>
 			<MD5>7d3f30e1f03770948d7688612dc4f063</MD5>
 		</Package>
-		<Package>
-			<URL>http://www.phoronix-test-suite.com/benchmark-files/pts-trondheim-avi.tar.bz2, http://www.phoronix.net/downloads/phoronix-test-suite/benchmark-files/pts-trondheim-avi.tar.bz2</URL>
-			<MD5>c91aa7b412f32c0f2b616ebfe2f261ad</MD5>
-			<DownloadTo>SHARED</DownloadTo>
-		</Package>
 	</Downloads>
 </PhoronixTestSuite>
 
diff --git a/pts/test-resources/ffmpeg/install.sh b/pts/test-resources/ffmpeg/install.sh
index b08e4cb..4989cb3 100755
--- a/pts/test-resources/ffmpeg/install.sh
+++ b/pts/test-resources/ffmpeg/install.sh
@@ -1,10 +1,5 @@
 #!/bin/sh
 
-if [ ! -f ../pts-shared/pts-trondheim.avi ]
-  then
-     tar -xvf ../pts-shared/pts-trondheim-avi.tar.bz2 -C ../pts-shared/
-fi
-
 tar -xjf ffmpeg-may27-2008.tar.bz2
 
 cd ffmpeg-may27-2008/
@@ -15,7 +10,7 @@ cd ..
 echo "#!/bin/sh
 
 echo \"#!/bin/sh
-./ffmpeg-may27-2008/ffmpeg -i ../pts-shared/pts-trondheim.avi -y -target ntsc-vcd /dev/null\" > encode-process
+./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
diff --git a/pts/test-resources/mencoder/downloads.xml b/pts/test-resources/mencoder/downloads.xml
index 5726d97..eb906fc 100644
--- a/pts/test-resources/mencoder/downloads.xml
+++ b/pts/test-resources/mencoder/downloads.xml
@@ -4,11 +4,6 @@
 			<URL>http://www3.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2, http://ftp.kaist.ac.kr/pub/MPlayer/releases/MPlayer-1.0rc2.tar.bz2</URL>
 			<MD5>7e27e535c2d267637df34898f1b91707</MD5>
 		</Package>
-		<Package>
-			<URL>http://www.phoronix-test-suite.com/benchmark-files/pts-trondheim-avi.tar.bz2, http://www.phoronix.net/downloads/phoronix-test-suite/benchmark-files/pts-trondheim-avi.tar.bz2</URL>
-			<MD5>c91aa7b412f32c0f2b616ebfe2f261ad</MD5>
-			<DownloadTo>SHARED</DownloadTo>
-		</Package>
 	</Downloads>
 </PhoronixTestSuite>
 
diff --git a/pts/test-resources/mencoder/install.sh b/pts/test-resources/mencoder/install.sh
index 99ab0ec..fcaf87c 100755
--- a/pts/test-resources/mencoder/install.sh
+++ b/pts/test-resources/mencoder/install.sh
@@ -1,10 +1,5 @@
 #!/bin/sh
 
-if [ ! -f ../pts-shared/pts-trondheim.avi ]
-  then
-     tar -xvf ../pts-shared/pts-trondheim-avi.tar.bz2 -C ../pts-shared/
-fi
-
 tar -xjf MPlayer-1.0rc2.tar.bz2
 
 THIS_DIR=$(pwd)
@@ -20,7 +15,7 @@ rm -rf MPlayer-1.0rc2/
 echo "#!/bin/sh
 
 echo \"#!/bin/sh
-./mplayer_/bin/mencoder ../pts-shared/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
+./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
diff --git a/pts/test-resources/video-extensions/downloads.xml b/pts/test-resources/video-extensions/downloads.xml
index fa223ba..eb906fc 100644
--- a/pts/test-resources/video-extensions/downloads.xml
+++ b/pts/test-resources/video-extensions/downloads.xml
@@ -4,11 +4,6 @@
 			<URL>http://www3.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc2.tar.bz2, http://ftp.kaist.ac.kr/pub/MPlayer/releases/MPlayer-1.0rc2.tar.bz2</URL>
 			<MD5>7e27e535c2d267637df34898f1b91707</MD5>
 		</Package>
-		<Package>
-			<URL>http://www.phoronix-test-suite.com/benchmark-files/pts-sample-playback-1.avi.tar.bz2, http://www.phoronix.net/downloads/phoronix-test-suite/benchmark-files/pts-sample-playback-1.avi.tar.bz2</URL>
-			<MD5>cb1e4775e9970ed31d346be804d0fe1c</MD5>
-			<DownloadTo>SHARED</DownloadTo>
-		</Package>
 	</Downloads>
 </PhoronixTestSuite>
 
diff --git a/pts/test-resources/video-extensions/install.sh b/pts/test-resources/video-extensions/install.sh
index 066adb6..8b48d3c 100755
--- a/pts/test-resources/video-extensions/install.sh
+++ b/pts/test-resources/video-extensions/install.sh
@@ -1,10 +1,5 @@
 #!/bin/sh
 
-if [ ! -f ../pts-shared/pts-sample-playback-1.avi ]
-  then
-     tar -xvf ../pts-shared/pts-sample-playback-1.avi.tar.bz2 -C ../pts-shared/
-fi
-
 tar -xjf MPlayer-1.0rc2.tar.bz2
 
 THIS_DIR=$(pwd)
@@ -27,7 +22,7 @@ foreach($extensions_to_check as $extension)
 {
 	echo "Checking Video Output For: $extension\n";
 	$start_time = time();
-	echo shell_exec("./mplayer_/bin/mplayer -vo $extension -ao null ../pts-shared/pts-sample-playback-1.avi");
+	echo shell_exec("./mplayer_/bin/mplayer -vo $extension -ao null $TEST_EXTENDS/pts-sample-playback-1.avi");
 	$end_time = time();
 
 	$time_diff = $end_time - $start_time;