pts-core: Move ExternalDependencies tag location from TestInformation to

Test Profile block (This breaks compatibility with earlier test
profiles!)
pts: Update the location of the ExternalDependencies tag in all relevant
test profiles

46 files changed, 46 insertions, 45 deletions

diff --git a/pts/test-profiles/base/java-environment.xml b/pts/test-profiles/base/java-environment.xml
index 2b789c1..8270803 100644
--- a/pts/test-profiles/base/java-environment.xml
+++ b/pts/test-profiles/base/java-environment.xml
@@ -1,5 +1,5 @@
 <PhoronixTestSuite>
-	<TestInformation>
+	<TestProfile>
 		<ExternalDependencies>java</ExternalDependencies>
-	</TestInformation>
+	</TestProfile>
 </PhoronixTestSuite>
diff --git a/pts/test-profiles/base/timed-audio-encode.xml b/pts/test-profiles/base/timed-audio-encode.xml
index a7457af..8e9e30c 100644
--- a/pts/test-profiles/base/timed-audio-encode.xml
+++ b/pts/test-profiles/base/timed-audio-encode.xml
@@ -3,12 +3,12 @@
 		<TestType>Processor</TestType>
 		<SoftwareType>Utility</SoftwareType>
 		<License>FREE</License>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<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/base/timed-build.xml b/pts/test-profiles/base/timed-build.xml
index 0e0c792..377b76f 100644
--- a/pts/test-profiles/base/timed-build.xml
+++ b/pts/test-profiles/base/timed-build.xml
@@ -3,12 +3,12 @@
 		<TestType>Processor</TestType>
 		<SoftwareType>Utility</SoftwareType>
 		<License>FREE</License>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<Status>VERIFIED</Status>
 	</TestProfile>
 	<TestInformation>
 		<SubTitle>Time To Compile</SubTitle>
 		<TimesToRun>1</TimesToRun>
-		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<ResultScale>Seconds</ResultScale>
 		<TimesToRun>2</TimesToRun>
 		<Proportion>LIB</Proportion>
diff --git a/pts/test-profiles/base/video-sample.xml b/pts/test-profiles/base/video-sample.xml
index a7457af..8e9e30c 100644
--- a/pts/test-profiles/base/video-sample.xml
+++ b/pts/test-profiles/base/video-sample.xml
@@ -3,12 +3,12 @@
 		<TestType>Processor</TestType>
 		<SoftwareType>Utility</SoftwareType>
 		<License>FREE</License>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<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/bonnie.xml b/pts/test-profiles/bonnie.xml
index 118fe22..90f591f 100644
--- a/pts/test-profiles/bonnie.xml
+++ b/pts/test-profiles/bonnie.xml
@@ -7,6 +7,7 @@
 		<Status>VERIFIED</Status>
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>0.1</EnvironmentSize>
+                <ExternalDependencies>build-utilities</ExternalDependencies>
 		<ProjectURL>http://www.coker.com.au/bonnie++/</ProjectURL>
 	</TestProfile>
 	<TestInformation>
@@ -17,7 +18,6 @@
 		<Proportion>HIB</Proportion>
 		<TimesToRun>1</TimesToRun>
 		<Description>This benchmark tests the system's hard disk.</Description>
-                <ExternalDependencies>build-utilities</ExternalDependencies>
 	</TestInformation>
 	<TestSettings>
 		<Option>
diff --git a/pts/test-profiles/byte.xml b/pts/test-profiles/byte.xml
index 56c5708..3eaa64a 100644
--- a/pts/test-profiles/byte.xml
+++ b/pts/test-profiles/byte.xml
@@ -7,6 +7,7 @@
 		<Status>VERIFIED</Status>
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>0.5</EnvironmentSize>
+                <ExternalDependencies>build-utilities</ExternalDependencies>
 	</TestProfile>
 	<TestInformation>
 		<Title>BYTE Unix Benchmark</Title>
@@ -15,7 +16,6 @@
 		<ResultScale>LPS</ResultScale>
 		<Proportion>HIB</Proportion>
 		<Description>This test runs the ANSI C version of SciMark 2.0, which is a benchmark for scientific and numerical computing developed by programmers at the National Institute of Standards and Technology. This test is made up of Fast Foruier Transform, Jacobi Successive Over-relaxation, Monte Carlo, Sparse Matrix Multiply, and dense LU matrix factorization benchmarks.</Description>
-                <ExternalDependencies>build-utilities</ExternalDependencies>
 	</TestInformation>
 	<TestSettings>
 		<Option>
diff --git a/pts/test-profiles/compliance-ogl.xml b/pts/test-profiles/compliance-ogl.xml
index db944e9..7e8ec9b 100644
--- a/pts/test-profiles/compliance-ogl.xml
+++ b/pts/test-profiles/compliance-ogl.xml
@@ -8,6 +8,7 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>3.8</EnvironmentSize>
 		<ProjectURL>http://www.opengl.org/</ProjectURL>
+		<ExternalDependencies>glut, build-utilities, xorg-development</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
@@ -18,6 +19,5 @@
 		<ResultScale>GL 1.1, GL 1.2, GL 1.3, GL 1.4, GL 1.5, GL 2.0, GL 2.1</ResultScale>
 		<Description>This is a test checking for some particular OpenGL extesnions present on the system using GLEW, the OpenGL Extension Wrangler Library.</Description>
 		<ResultFormat>MULTI_PASS_FAIL</ResultFormat>
-		<ExternalDependencies>glut, build-utilities, xorg-development</ExternalDependencies>
 	</TestInformation>
 </PhoronixTestSuite>
diff --git a/pts/test-profiles/compress-7zip.xml b/pts/test-profiles/compress-7zip.xml
index d7726f7..e1498f9 100644
--- a/pts/test-profiles/compress-7zip.xml
+++ b/pts/test-profiles/compress-7zip.xml
@@ -7,13 +7,13 @@
 		<Status>VERIFIED</Status>
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>8.6</EnvironmentSize>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<ProjectURL>http://www.7-zip.org/</ProjectURL>
 	</TestProfile>
 	<TestInformation>
 		<Title>7-Zip Compression</Title>
 		<TimesToRun>3</TimesToRun>
 		<ResultScale>Average MIPS</ResultScale>
-		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<Proportion>HIB</Proportion>
 		<Description>This is a test of 7-Zip using p7zip with the integrated benchmark feature.</Description>
 	</TestInformation>
diff --git a/pts/test-profiles/compress-lzma.xml b/pts/test-profiles/compress-lzma.xml
index 991018f..56e04b3 100644
--- a/pts/test-profiles/compress-lzma.xml
+++ b/pts/test-profiles/compress-lzma.xml
@@ -6,13 +6,13 @@
 		<License>FREE</License>
 		<Status>VERIFIED</Status>
 		<EnvironmentSize>0.7</EnvironmentSize>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<Maintainer>apaige</Maintainer>
 	</TestProfile>
 	<TestInformation>
 		<Title>Timed LZMA Compression</Title>
 		<TimesToRun>3</TimesToRun>
 		<SubTitle>2GB File Compression</SubTitle>
-		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<ResultScale>Seconds</ResultScale>
 		<Proportion>LIB</Proportion>
 		<Description>This test measures the time needed to compress a file using LZMA compression.</Description>
diff --git a/pts/test-profiles/compress-pbzip2.xml b/pts/test-profiles/compress-pbzip2.xml
index a8813e7..8e71cad 100644
--- a/pts/test-profiles/compress-pbzip2.xml
+++ b/pts/test-profiles/compress-pbzip2.xml
@@ -8,13 +8,13 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>4.5</EnvironmentSize>
 		<ProjectURL>http://compression.ca/pbzip2/</ProjectURL>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
 		<Title>Parallel BZIP2 Compression</Title>
 		<Version>1.0.2</Version>
 		<SubTitle>2GB File Compression</SubTitle>
-		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<TimesToRun>3</TimesToRun>
 		<ResultScale>Seconds</ResultScale>
 		<Proportion>LIB</Proportion>
diff --git a/pts/test-profiles/espeak.xml b/pts/test-profiles/espeak.xml
index d1de455..4fdb7e3 100644
--- a/pts/test-profiles/espeak.xml
+++ b/pts/test-profiles/espeak.xml
@@ -8,13 +8,13 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>2.2</EnvironmentSize>
 		<ProjectURL>http://espeak.sourceforge.net/</ProjectURL>
+		<ExternalDependencies>portaudio-development, build-utilities</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
 		<Title>eSpeak Speech Engine</Title>
 		<Version>1.39</Version>
 		<SubTitle>Text-To-Speech Synthesis</SubTitle>
-		<ExternalDependencies>portaudio-development, build-utilities</ExternalDependencies>
 		<TimesToRun>3</TimesToRun>
 		<ResultScale>Seconds</ResultScale>
 		<Proportion>LIB</Proportion>
diff --git a/pts/test-profiles/ffmpeg.xml b/pts/test-profiles/ffmpeg.xml
index 2f53375..5ada369 100644
--- a/pts/test-profiles/ffmpeg.xml
+++ b/pts/test-profiles/ffmpeg.xml
@@ -10,6 +10,7 @@
 		<ProjectURL>http://ffmpeg.mplayerhq.hu/</ProjectURL>
 		<Extends>video-sample</Extends>
 		<UnsupportedPlatforms>Solaris</UnsupportedPlatforms>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
 	</TestProfile>
 	<TestInformation>
 		<Title>FFmpeg</Title>
@@ -18,6 +19,5 @@
 		<ResultScale>Seconds</ResultScale>
 		<Proportion>LIB</Proportion>
 		<Description>This test uses FFmpeg and the libavcodec family for testing the system's audio/video encoding performance.</Description>
-		<ExternalDependencies>build-utilities</ExternalDependencies>
 	</TestInformation>
 </PhoronixTestSuite>
diff --git a/pts/test-profiles/fhourstones.xml b/pts/test-profiles/fhourstones.xml
index 2e37e6f..dd1130d 100644
--- a/pts/test-profiles/fhourstones.xml
+++ b/pts/test-profiles/fhourstones.xml
@@ -8,6 +8,7 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>0.1</EnvironmentSize>
 		<ProjectURL>http://homepages.cwi.nl/~tromp/c4/fhour.html</ProjectURL>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<UnsupportedPlatforms>Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
@@ -19,6 +20,5 @@
 		<ResultScale>Kpos / sec</ResultScale>
 		<Proportion>HIB</Proportion>
 		<Description>This integer benchmark solves positions in the game of connect-4, as played on a vertical 7x6 board. By default, it uses a 64Mb transposition table with the twobig replacement strategy. Positions are represented as 64-bit bitboards, and the hash function is computed using a single 64-bit modulo operation, giving 64-bit machines a slight edge. The alpha-beta searcher sorts moves dynamically based on the history heuristic.</Description>
-		<ExternalDependencies>build-utilities</ExternalDependencies>
 	</TestInformation>
 </PhoronixTestSuite>
diff --git a/pts/test-profiles/fio.xml b/pts/test-profiles/fio.xml
index 5a9f71a..3d3b0ee 100644
--- a/pts/test-profiles/fio.xml
+++ b/pts/test-profiles/fio.xml
@@ -8,12 +8,12 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>5.0</EnvironmentSize>
 		<ProjectURL>http://git.kernel.dk/?p=fio.git;a=summary</ProjectURL>
+		<ExternalDependencies>build-utilities, libaio-devel</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
 		<Title>Flexible IO Tester</Title>
 		<Version>1.21</Version>
-		<ExternalDependencies>build-utilities, libaio-devel</ExternalDependencies>
 		<Executable>fio-run</Executable>
 		<TimesToRun>1</TimesToRun>
 		<ResultScale>Seconds (Run Time)</ResultScale>
diff --git a/pts/test-profiles/fract.xml b/pts/test-profiles/fract.xml
index cc3201e..291d52e 100644
--- a/pts/test-profiles/fract.xml
+++ b/pts/test-profiles/fract.xml
@@ -9,6 +9,7 @@
 		<EnvironmentSize>3.2</EnvironmentSize>
 		<SupportedArchitectures>x86</SupportedArchitectures>
 		<ProjectURL>http://fract.sourceforge.net/</ProjectURL>
+		<ExternalDependencies>build-utilities, sdl-development</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
@@ -18,7 +19,6 @@
 		<ResultScale>Frames Per Second</ResultScale>
 		<Proportion>HIB</Proportion>
 		<Description>This test uses the FRACT benchmark.</Description>
-		<ExternalDependencies>build-utilities, sdl-development</ExternalDependencies>
 		<PreRunMessage>Once the benchmark completes, you must close the opened window for the testing process to continue.</PreRunMessage>
 	</TestInformation>
 </PhoronixTestSuite>
diff --git a/pts/test-profiles/glmark.xml b/pts/test-profiles/glmark.xml
index d5f1e71..b84494e 100644
--- a/pts/test-profiles/glmark.xml
+++ b/pts/test-profiles/glmark.xml
@@ -8,12 +8,12 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>1.5</EnvironmentSize>
 		<ProjectURL>https://sourceforge.net/projects/glmark</ProjectURL>
+		<ExternalDependencies>sdl-development, glut, build-utilities, glew</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
 		<Title>GLMark</Title>
 		<Version>0.5.2</Version>
-		<ExternalDependencies>sdl-development, glut, build-utilities, glew</ExternalDependencies>
 		<TimesToRun>1</TimesToRun>
 		<ResultScale>Frames Per Second</ResultScale>
 		<Proportion>HIB</Proportion>
diff --git a/pts/test-profiles/gnupg.xml b/pts/test-profiles/gnupg.xml
index 0a85a05..d8e9874 100644
--- a/pts/test-profiles/gnupg.xml
+++ b/pts/test-profiles/gnupg.xml
@@ -7,6 +7,7 @@
 		<Status>VERIFIED</Status>
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>8.4</EnvironmentSize>
+                <ExternalDependencies>build-utilities</ExternalDependencies>
 		<ProjectURL>http://www.gnupg.org/</ProjectURL>
 	</TestProfile>
 	<TestInformation>
@@ -17,6 +18,5 @@
 		<ResultScale>Seconds</ResultScale>
 		<Proportion>LIB</Proportion>
 		<Description>This test times how long it takes to encrypt a file using GnuPG of a file.</Description>
-                <ExternalDependencies>build-utilities</ExternalDependencies>
 	</TestInformation>
 </PhoronixTestSuite>
diff --git a/pts/test-profiles/gtkperf.xml b/pts/test-profiles/gtkperf.xml
index ee528f8..602733c 100644
--- a/pts/test-profiles/gtkperf.xml
+++ b/pts/test-profiles/gtkperf.xml
@@ -8,12 +8,12 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>0.11</EnvironmentSize>
 		<ProjectURL>http://gtkperf.sourceforge.net/</ProjectURL>
+		<ExternalDependencies>gtk-development, build-utilities</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
 		<Title>GtkPerf</Title>
 		<Version>0.40</Version>
-		<ExternalDependencies>gtk-development, build-utilities</ExternalDependencies>
 		<TimesToRun>1</TimesToRun>
 		<ResultScale>Seconds</ResultScale>
 		<Proportion>LIB</Proportion>
diff --git a/pts/test-profiles/hmmer.xml b/pts/test-profiles/hmmer.xml
index f6201bf..dbd15a4 100644
--- a/pts/test-profiles/hmmer.xml
+++ b/pts/test-profiles/hmmer.xml
@@ -6,6 +6,7 @@
 		<License>FREE</License>
 		<Status>VERIFIED</Status>
 		<Maintainer>Andrew Schofield</Maintainer>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<EnvironmentSize>707</EnvironmentSize>
 		<ProjectURL>http://hmmer.janelia.org/</ProjectURL>
 	</TestProfile>
@@ -14,7 +15,6 @@
 		<Version>2.3.2</Version>
 		<SubTitle>Pfam Database Search</SubTitle>
 		<ResultScale>Seconds</ResultScale>
-		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<TimesToRun>1</TimesToRun>
 		<Description>This test searches through the Pfam database of profile hidden markov models. The search finds the domain structure of Drosophila Sevenless protein.</Description>
 		<Proportion>LIB</Proportion>
diff --git a/pts/test-profiles/iozone.xml b/pts/test-profiles/iozone.xml
index e5e6470..63bf733 100644
--- a/pts/test-profiles/iozone.xml
+++ b/pts/test-profiles/iozone.xml
@@ -8,6 +8,7 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>2.3</EnvironmentSize>
 		<ProjectURL>http://www.iozone.org/</ProjectURL>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
@@ -17,7 +18,6 @@
 		<ResultScale>MB/s</ResultScale>
 		<Proportion>HIB</Proportion>
 		<Description>The IOzone benchmark tests your hard disk drive / file-system performance.</Description>
-		<ExternalDependencies>build-utilities</ExternalDependencies>
 	</TestInformation>
 	<TestSettings>
 		<Default>
diff --git a/pts/test-profiles/lightsmark.xml b/pts/test-profiles/lightsmark.xml
index 3f2729d..0136de3 100644
--- a/pts/test-profiles/lightsmark.xml
+++ b/pts/test-profiles/lightsmark.xml
@@ -8,6 +8,7 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>0.7</EnvironmentSize>
 		<SupportedArchitectures>x86, x86_64</SupportedArchitectures>
+		<ExternalDependencies>glut, glew, freeimage</ExternalDependencies>
 		<ProjectURL>http://www.dee.cz/lightsmark/</ProjectURL>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
@@ -15,7 +16,6 @@
 		<Title>Lightsmark</Title>
 		<Version>2008</Version>
 		<TimesToRun>3</TimesToRun>
-		<ExternalDependencies>glut, glew, freeimage</ExternalDependencies>
 		<ResultScale>Frames Per Second</ResultScale>
 		<Proportion>HIB</Proportion>
 		<Description>This test calculates the average frame-rate within the Lightsmark 2008. Lightsmark is an OpenGL real-time global illumination and penumbra shadow benchmark.</Description>
diff --git a/pts/test-profiles/mafft.xml b/pts/test-profiles/mafft.xml
index c77badc..34cf17d 100644
--- a/pts/test-profiles/mafft.xml
+++ b/pts/test-profiles/mafft.xml
@@ -7,6 +7,7 @@
 		<Status>VERIFIED</Status>
 		<Maintainer>Andrew Schofield</Maintainer>
 		<ProjectURL>http://align.bmr.kyushu-u.ac.jp/mafft/software/</ProjectURL>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<UnsupportedPlatforms>Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
@@ -14,7 +15,6 @@
 		<Version>6.240</Version>
 		<SubTitle>Multiple Sequence Alignment</SubTitle>
 		<ResultScale>Seconds</ResultScale>
-		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<TimesToRun>3</TimesToRun>
 		<Description>This test performs an alignment of 100 pyruvate decarboxylase sequences.</Description>
 		<Proportion>LIB</Proportion>
diff --git a/pts/test-profiles/md-gromacs.xml b/pts/test-profiles/md-gromacs.xml
index 0aa8e30..d12260f 100644
--- a/pts/test-profiles/md-gromacs.xml
+++ b/pts/test-profiles/md-gromacs.xml
@@ -7,6 +7,7 @@
 		<Status>VERIFIED</Status>
 		<Maintainer>Andrew Schofield</Maintainer>
 		<EnvironmentSize>106</EnvironmentSize>
+		<ExternalDependencies>build-utilities, fortran-compiler</ExternalDependencies>
 		<ProjectURL>http://www.gromacs.org/</ProjectURL>
 	</TestProfile>
 	<TestInformation>
@@ -18,7 +19,6 @@
 		<ResultScale>Gflops</ResultScale>
 		<Proportion>HIB</Proportion>
 		<Description>This test runs a series of molecular dynamics simulations using the GROMACS MD package. This test is capable of running on multiple cores by using the MPICH2 library, and is similar in configuration to the SMP GROMACS cores (FahCore_a1) used by the Folding@HOME distributed computing project.</Description>
-		<ExternalDependencies>build-utilities, fortran-compiler</ExternalDependencies>
 	</TestInformation>
 	<TestSettings>
 		<Option>
diff --git a/pts/test-profiles/memory-bandwidth.xml b/pts/test-profiles/memory-bandwidth.xml
index 553d7eb..caffc70 100644
--- a/pts/test-profiles/memory-bandwidth.xml
+++ b/pts/test-profiles/memory-bandwidth.xml
@@ -7,6 +7,7 @@
 		<Status>VERIFIED</Status>
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>0.05</EnvironmentSize>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
@@ -16,7 +17,6 @@
 		<ResultScale>MB/s</ResultScale>
 		<Proportion>HIB</Proportion>
 		<Description>This benchmark tests the system memory (RAM) and CPU Level 2 cache performance.</Description>
-		<ExternalDependencies>build-utilities</ExternalDependencies>
 	</TestInformation>
 	<TestSettings>
 		<Option>
diff --git a/pts/test-profiles/mencoder.xml b/pts/test-profiles/mencoder.xml
index eca0c93..2720f99 100644
--- a/pts/test-profiles/mencoder.xml
+++ b/pts/test-profiles/mencoder.xml
@@ -9,6 +9,7 @@
 		<EnvironmentSize>16</EnvironmentSize>
 		<ProjectURL>http://www.mplayerhq.hu/</ProjectURL>
 		<Extends>video-sample</Extends>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<UnsupportedPlatforms>Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
@@ -19,6 +20,5 @@
 		<ResultScale>Seconds</ResultScale>
 		<Proportion>LIB</Proportion>
 		<Description>This test uses mplayer's mencoder utility and the libavcodec family for testing the system's audio/video encoding performance.</Description>
-		<ExternalDependencies>build-utilities</ExternalDependencies>
 	</TestInformation>
 </PhoronixTestSuite>
diff --git a/pts/test-profiles/mrbayes.xml b/pts/test-profiles/mrbayes.xml
index 5deca97..6d7f179 100644
--- a/pts/test-profiles/mrbayes.xml
+++ b/pts/test-profiles/mrbayes.xml
@@ -15,7 +15,6 @@
 		<Version>3.1</Version>
 		<SubTitle>Primate Phylogeny Analysis</SubTitle>
 		<ResultScale>Seconds</ResultScale>
-		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<TimesToRun>3</TimesToRun>
 		<Description>This test performs a bayesian analysis of a set of primate genome sequences in order to estimate their phylogeny.</Description>
 		<Proportion>LIB</Proportion>
diff --git a/pts/test-profiles/nexuiz.xml b/pts/test-profiles/nexuiz.xml
index 9862e6d..32f04e3 100644
--- a/pts/test-profiles/nexuiz.xml
+++ b/pts/test-profiles/nexuiz.xml
@@ -9,6 +9,7 @@
 		<EnvironmentSize>746</EnvironmentSize>
 		<SupportedArchitectures>x86, x86_64</SupportedArchitectures>
 		<ProjectURL>http://www.nexuiz.com/</ProjectURL>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<UnsupportedPlatforms>Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
diff --git a/pts/test-profiles/norsetto-shadow.xml b/pts/test-profiles/norsetto-shadow.xml
index 36ad98b..cdeca2e 100644
--- a/pts/test-profiles/norsetto-shadow.xml
+++ b/pts/test-profiles/norsetto-shadow.xml
@@ -7,6 +7,7 @@
 		<Status>VERIFIED</Status>
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>2.5</EnvironmentSize>
+		<ExternalDependencies>build-utilities, glut</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
@@ -15,6 +16,5 @@
 		<ResultScale>Frames Per Second</ResultScale>
 		<Proportion>HIB</Proportion>
 		<Description>This is a test of Norsetto Shadow, which is a basic OpenGL demo.</Description>
-		<ExternalDependencies>build-utilities, glut</ExternalDependencies>
 	</TestInformation>
 </PhoronixTestSuite>
diff --git a/pts/test-profiles/openssl.xml b/pts/test-profiles/openssl.xml
index 9f4ffc5..354eb44 100644
--- a/pts/test-profiles/openssl.xml
+++ b/pts/test-profiles/openssl.xml
@@ -7,6 +7,7 @@
 		<Status>VERIFIED</Status>
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>37</EnvironmentSize>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<ProjectURL>http://www.openssl.org/</ProjectURL>
 	</TestProfile>
 	<TestInformation>
@@ -17,6 +18,5 @@
 		<ResultScale>Signs Per Second</ResultScale>
 		<Proportion>HIB</Proportion>
 		<Description>OpenSSL is an open-source toolkit that implements SSL (Secure Sockets Layer) and TLS (Transport Layer Security) protocols. This test measures the RSA 4096-bit performance of OpenSSL.</Description>
-		<ExternalDependencies>build-utilities</ExternalDependencies>
 	</TestInformation>
 </PhoronixTestSuite>
diff --git a/pts/test-profiles/ppracer.xml b/pts/test-profiles/ppracer.xml
index e28096d..c96fd48 100644
--- a/pts/test-profiles/ppracer.xml
+++ b/pts/test-profiles/ppracer.xml
@@ -8,13 +8,13 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>23.3</EnvironmentSize>
 		<SupportedArchitectures>x86</SupportedArchitectures>
+		<ExternalDependencies>build-utilities, glut, sdl-development, libpng-development</ExternalDependencies>
 		<ProjectURL>http://developer.berlios.de/projects/ppracer/</ProjectURL>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
 		<Title>Planet Penguin Racer</Title>
 		<Version>0.5 Alpha</Version>
-		<ExternalDependencies>build-utilities, glut, sdl-development, libpng-development</ExternalDependencies>
 		<TimesToRun>3</TimesToRun>
 		<ResultScale>Frames Per Second</ResultScale>
 		<Proportion>HIB</Proportion>
diff --git a/pts/test-profiles/ramspeed.xml b/pts/test-profiles/ramspeed.xml
index 765d0f6..882150c 100644
--- a/pts/test-profiles/ramspeed.xml
+++ b/pts/test-profiles/ramspeed.xml
@@ -8,6 +8,7 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>0.72</EnvironmentSize>
 		<ProjectURL>http://www.alasir.com/software/ramspeed/</ProjectURL>
+                <ExternalDependencies>build-utilities</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
@@ -18,7 +19,6 @@
 		<ResultScale>MB/s</ResultScale>
 		<Proportion>HIB</Proportion>
 		<Description>This benchmark tests the system memory (RAM) performance.</Description>
-                <ExternalDependencies>build-utilities</ExternalDependencies>
 	</TestInformation>
 	<TestSettings>
 		<Option>
diff --git a/pts/test-profiles/render-bench.xml b/pts/test-profiles/render-bench.xml
index ba97d85..202f171 100644
--- a/pts/test-profiles/render-bench.xml
+++ b/pts/test-profiles/render-bench.xml
@@ -8,6 +8,7 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>0.12</EnvironmentSize>
 		<ProjectURL>http://www.freedesktop.org/</ProjectURL>
+		<ExternalDependencies>build-essential, imlib2-development</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
@@ -15,7 +16,6 @@
 		<Executable>render-bench-test</Executable>
 		<TimesToRun>3</TimesToRun>
 		<ResultScale>Seconds</ResultScale>
-		<ExternalDependencies>build-essential, imlib2-development</ExternalDependencies>
 		<Description>This test runs render_bench, which tests the performance of X.Org and the video driver's RENDER extension.</Description>
 	</TestInformation>
 </PhoronixTestSuite>
diff --git a/pts/test-profiles/scimark2.xml b/pts/test-profiles/scimark2.xml
index ed13be4..c431653 100644
--- a/pts/test-profiles/scimark2.xml
+++ b/pts/test-profiles/scimark2.xml
@@ -7,6 +7,7 @@
 		<Status>VERIFIED</Status>
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>0.04</EnvironmentSize>
+                <ExternalDependencies>build-utilities</ExternalDependencies>
 		<ProjectURL>http://math.nist.gov/scimark2/</ProjectURL>
 	</TestProfile>
 	<TestInformation>
@@ -17,7 +18,6 @@
 		<Proportion>HIB</Proportion>
 		<SubTitle>Composite Score</SubTitle>
 		<Description>This test runs the ANSI C version of SciMark 2.0, which is a benchmark for scientific and numerical computing developed by programmers at the National Institute of Standards and Technology. This test is made up of Fast Foruier Transform, Jacobi Successive Over-relaxation, Monte Carlo, Sparse Matrix Multiply, and dense LU matrix factorization benchmarks.</Description>
-                <ExternalDependencies>build-utilities</ExternalDependencies>
 	</TestInformation>
 	<TestSettings>
 		<Option>
diff --git a/pts/test-profiles/specviewperf10.xml b/pts/test-profiles/specviewperf10.xml
index b8e1f6a..34582bb 100644
--- a/pts/test-profiles/specviewperf10.xml
+++ b/pts/test-profiles/specviewperf10.xml
@@ -8,12 +8,12 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>1600</EnvironmentSize>
 		<ProjectURL>http://www.spec.org/</ProjectURL>
+		<ExternalDependencies>build-utilities, glut, csh, libpng-development</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
 		<Title>SPECViewPerf</Title>
 		<Version>10.0</Version>
-		<ExternalDependencies>build-utilities, glut, csh, libpng-development</ExternalDependencies>
 		<TimesToRun>1</TimesToRun>
 		<ResultScale>Weighted Geometric Mean</ResultScale>
 		<Proportion>HIB</Proportion>
diff --git a/pts/test-profiles/specviewperf9.xml b/pts/test-profiles/specviewperf9.xml
index 2763317..fadce45 100644
--- a/pts/test-profiles/specviewperf9.xml
+++ b/pts/test-profiles/specviewperf9.xml
@@ -8,12 +8,12 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>1800</EnvironmentSize>
 		<ProjectURL>http://www.spec.org/</ProjectURL>
+		<ExternalDependencies>build-utilities, glut, csh, libpng-development</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
 		<Title>SPECViewPerf</Title>
 		<Version>9.0.3</Version>
-		<ExternalDependencies>build-utilities, glut, csh, libpng-development</ExternalDependencies>
 		<TimesToRun>1</TimesToRun>
 		<ResultScale>Weighted Geometric Mean</ResultScale>
 		<Proportion>HIB</Proportion>
diff --git a/pts/test-profiles/sqlite.xml b/pts/test-profiles/sqlite.xml
index 43abe01..44e7125 100644
--- a/pts/test-profiles/sqlite.xml
+++ b/pts/test-profiles/sqlite.xml
@@ -7,6 +7,7 @@
 		<Status>VERIFIED</Status>
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>18.4</EnvironmentSize>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<ProjectURL>http://www.sqlite.org/</ProjectURL>
 	</TestProfile>
 	<TestInformation>
diff --git a/pts/test-profiles/super-pi.xml b/pts/test-profiles/super-pi.xml
index b649a1c..af2224f 100644
--- a/pts/test-profiles/super-pi.xml
+++ b/pts/test-profiles/super-pi.xml
@@ -7,6 +7,7 @@
 		<Status>VERIFIED</Status>
 		<Maintainer>Pekka Panula</Maintainer>
 		<EnvironmentSize>1.4</EnvironmentSize>
+		<ExternalDependencies>build-utilities</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
@@ -17,7 +18,6 @@
 		<ResultScale>Seconds</ResultScale>
 		<Proportion>LIB</Proportion>
 		<Description>Time how long it takes to calculate pi to varying lengths.</Description>
-		<ExternalDependencies>build-utilities</ExternalDependencies>
 	</TestInformation>
         <TestSettings>
 		<Option>
diff --git a/pts/test-profiles/trislam.xml b/pts/test-profiles/trislam.xml
index 54abf1e..bf2b40d 100644
--- a/pts/test-profiles/trislam.xml
+++ b/pts/test-profiles/trislam.xml
@@ -8,6 +8,7 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>0.8</EnvironmentSize>
 		<ProjectURL>http://graphcomp.com/pogl.cgi?v=0111s3B3</ProjectURL>
+		<ExternalDependencies>build-utilities, perl, perl-opengl</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
@@ -19,6 +20,5 @@
 		<ResultScale>Seconds</ResultScale>
 		<Proportion>LIB</Proportion>
 		<Description>Triangle Slammer is an OpenGL benchmark of the PERL language.</Description>
-		<ExternalDependencies>build-utilities, perl, perl-opengl</ExternalDependencies>
 	</TestInformation>
 </PhoronixTestSuite>
diff --git a/pts/test-profiles/ut2004-demo.xml b/pts/test-profiles/ut2004-demo.xml
index e62f451..47a50be 100644
--- a/pts/test-profiles/ut2004-demo.xml
+++ b/pts/test-profiles/ut2004-demo.xml
@@ -7,6 +7,7 @@
 		<Status>VERIFIED</Status>
 		<Maintainer>Michael Larabel</Maintainer>
 		<SupportedArchitectures>x86, x86_64</SupportedArchitectures>
+		<ExternalDependencies>libstdcpp5</ExternalDependencies>
 		<ProjectURL>http://www.unrealtournament2003.com/ut2004/index.html</ProjectURL>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
@@ -14,7 +15,6 @@
 		<Title>Unreal Tournament 2004 Demo</Title>
 		<Version>3334</Version>
 		<TimesToRun>3</TimesToRun>
-		<ExternalDependencies>libstdcpp5</ExternalDependencies>
 		<ResultScale>Frames Per Second</ResultScale>
 		<Proportion>HIB</Proportion>
 		<Description>This test calculates the average frame-rate within the Unreal Tournament 2004 game demo from Epic Games.</Description>
diff --git a/pts/test-profiles/vdrift.xml b/pts/test-profiles/vdrift.xml
index 888e906..dff1882 100644
--- a/pts/test-profiles/vdrift.xml
+++ b/pts/test-profiles/vdrift.xml
@@ -7,6 +7,7 @@
 		<Status>BROKEN</Status>
 		<Maintainer>Michael Larabel</Maintainer>
 		<SupportedArchitectures>x86, x86_64</SupportedArchitectures>
+		<ExternalDependencies>sdl-development, build-utilities, glew, jam, scons, vorbis-devel</ExternalDependencies>
 		<ProjectURL>http://www.vdrift.net/</ProjectURL>
 		<UnsupportedPlatforms>Solaris</UnsupportedPlatforms>
 	</TestProfile>
@@ -15,7 +16,6 @@
 		<Version>2008-08-05</Version>
 		<TimesToRun>3</TimesToRun>
 		<ResultScale>Frames Per Second</ResultScale>
-		<ExternalDependencies>sdl-development, build-utilities, glew, jam, scons, vorbis-devel</ExternalDependencies>
 		<Proportion>HIB</Proportion>
 		<Description>This test calculates the average frame-rate within vDrift, which is an open-source drift racing game.</Description>
 	</TestInformation>
diff --git a/pts/test-profiles/video-extensions.xml b/pts/test-profiles/video-extensions.xml
index 0b9aa99..51b181e 100644
--- a/pts/test-profiles/video-extensions.xml
+++ b/pts/test-profiles/video-extensions.xml
@@ -8,6 +8,7 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>30.0</EnvironmentSize>
 		<ProjectURL>http://www.mplayerhq.hu/</ProjectURL>
+		<ExternalDependencies>build-utilities, xorg-development, xorg-video</ExternalDependencies>
 		<Extends>video-sample</Extends>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
@@ -18,6 +19,5 @@
 		<ResultScale>GL, GL2, X-Video, XvMC</ResultScale>
 		<Description>This is a test of playing back a short video file with different video extensions supported by X.Org and MPlayer.</Description>
 		<ResultFormat>MULTI_PASS_FAIL</ResultFormat>
-		<ExternalDependencies>build-utilities, xorg-development, xorg-video</ExternalDependencies>
 	</TestInformation>
 </PhoronixTestSuite>
diff --git a/pts/test-profiles/warsow.xml b/pts/test-profiles/warsow.xml
index 9862388..aa1462e 100644
--- a/pts/test-profiles/warsow.xml
+++ b/pts/test-profiles/warsow.xml
@@ -8,6 +8,7 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>195</EnvironmentSize>
 		<SupportedArchitectures>x86, x86_64</SupportedArchitectures>
+		<ExternalDependencies>xorg-development</ExternalDependencies>
 		<ProjectURL>http://www.warsow.net/</ProjectURL>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
@@ -16,7 +17,6 @@
 		<Version>0.42</Version>
 		<TimesToRun>3</TimesToRun>
 		<ResultScale>Frames Per Second</ResultScale>
-		<ExternalDependencies>xorg-development</ExternalDependencies>
 		<Proportion>HIB</Proportion>
 		<Description>This is a benchmark of Warsow, a popular open-source first-person shooter. This game uses the QFusion engine.</Description>
 	</TestInformation>
diff --git a/pts/test-profiles/wine.xml b/pts/test-profiles/wine.xml
index ba5fd84..54a220a 100644
--- a/pts/test-profiles/wine.xml
+++ b/pts/test-profiles/wine.xml
@@ -6,12 +6,12 @@
 		<License>FREE</License>
 		<Status>UNVERIFIED</Status>
 		<Maintainer>Stefan Doesinger</Maintainer>
+		<ExternalDependencies>glut, libpng-development, git, xorg-development, bison, flex, build-utilities</ExternalDependencies>
 		<ProjectURL>http://www.winehq.org/</ProjectURL>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
 		<Title>Wine Conformance Tests</Title>
-		<ExternalDependencies>glut, libpng-development, git, xorg-development, bison, flex, build-utilities</ExternalDependencies>
 		<Description>This test runs the Wine Direct3D conformance tests.</Description>
 	</TestInformation>
 	<TestSettings>
diff --git a/pts/test-profiles/x11perf.xml b/pts/test-profiles/x11perf.xml
index 44f3977..6283929 100644
--- a/pts/test-profiles/x11perf.xml
+++ b/pts/test-profiles/x11perf.xml
@@ -8,12 +8,12 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>1.7</EnvironmentSize>
 		<ProjectURL>http://www.x.org/</ProjectURL>
+		<ExternalDependencies>glut, build-utilities, xorg-development</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
 		<Title>x11perf</Title>
 		<Version>1.5</Version>
-		<ExternalDependencies>glut, build-utilities, xorg-development</ExternalDependencies>
 		<TimesToRun>3</TimesToRun>
 		<ResultScale>Operations / Second</ResultScale>
 		<Proportion>HIB</Proportion>
diff --git a/pts/test-profiles/xplane9.xml b/pts/test-profiles/xplane9.xml
index ac90401..a9a003b 100644
--- a/pts/test-profiles/xplane9.xml
+++ b/pts/test-profiles/xplane9.xml
@@ -9,6 +9,7 @@
 		<EnvironmentSize>855</EnvironmentSize>
 		<SupportedArchitectures>x86, x86_64</SupportedArchitectures>
 		<ProjectURL>http://www.x-plane.com/</ProjectURL>
+		<ExternalDependencies>openal-devel</ExternalDependencies>
 		<UnsupportedPlatforms>Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
@@ -16,7 +17,6 @@
 		<Version>9.00</Version>
 		<TimesToRun>3</TimesToRun>
 		<ResultScale>Frames Per Second</ResultScale>
-		<ExternalDependencies>openal-devel</ExternalDependencies>
 		<Proportion>HIB</Proportion>
 		<Description>This is a test of X-Plane, a realistic multi-platform flight simulator designed for personal computers. This is commercial closed-source software, but this X-Plane 9.0 benchmark has been kindly made available for free. X-Plane is the product of Austin Meyer and Laminar Research.</Description>
 	</TestInformation>
diff --git a/pts/test-profiles/yafray.xml b/pts/test-profiles/yafray.xml
index dba3573..735db36 100644
--- a/pts/test-profiles/yafray.xml
+++ b/pts/test-profiles/yafray.xml
@@ -8,6 +8,7 @@
 		<Maintainer>Michael Larabel</Maintainer>
 		<EnvironmentSize>28.9</EnvironmentSize>
 		<ProjectURL>http://www.yafray.org/</ProjectURL>
+		<ExternalDependencies>build-utilities, scons, zlib-devel, jpeg-devel</ExternalDependencies>
 		<UnsupportedPlatforms>MacOSX, Solaris</UnsupportedPlatforms>
 	</TestProfile>
 	<TestInformation>
@@ -19,6 +20,5 @@
 		<ResultScale>Seconds</ResultScale>
 		<Proportion>LIB</Proportion>
 		<Description>YaFray (Yet Another Free Raytracer) is an open-source raytracing program. Most notably, this engine has been integrated into the Blender 3D software and uses an XML scene description language. This test measures how long it takes YaFray to render a scene.</Description>
-		<ExternalDependencies>build-utilities, scons, zlib-devel, jpeg-devel</ExternalDependencies>
 	</TestInformation>
 </PhoronixTestSuite>