projects / phoronix-test-suite.git / commitdiff
Build Results
 
Summary

Description: Phoronix Test Suite open-source benchmarking development
Last Change: Mon 10/20/14 21:58

Recent Commits
Time
Signed-Off By
Description
Commit Diff
Mon 10/20/14 21:58
Michael Larabel  
Phoronix Test Suite 5.4... 
Mon 10/20/14 21:49
Michael Larabel  
phoromatic: Support for... 
Mon 10/20/14 21:29
Michael Larabel  
phoromatic: Support for... 
Mon 10/20/14 11:32
Michael Larabel  
phoromatic: Introduce... 
Sun 10/12/14 12:55
Michael Larabel  
phoromatic: Improve... 
Sun 10/12/14 12:31
Michael Larabel  
phoromatic: Support for... 
 
> --git a/pts-core/external-test-dependencies/xml/angstrom-packages.xml b/pts-core/external-test-dependencies/xml/angstrom-packages.xml
index f206e36
..978ffe0 100644
--- a/pts-core/external-test-dependencies/xml/angstrom-packages.xml
+++ b/pts-core/external-test-dependencies/xml/angstrom-packages.xml
@@ -8,67 +8,55 @@
         <
Package>
             <
GenericName>gtk-development</GenericName>
             <
PackageName>gtk+-dev</PackageName>
-            <
FileCheck>/usr/include/gtk-2.0</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>sdl-development</GenericName>
             <
PackageName>libsdl-1.2-dev libsdl-image-1.2-dev libsdl-ttf-dev libsdl-x11-dev libsdl-net-1.2-dev libsdl-gfx-dev</PackageName>
-            <
FileCheck>/usr/include/SDL/SDL.h, /usr/include/SDL/SDL_gfxPrimitives.h, /usr/include/SDL/SDL_net.h, /usr/include/SDL/SDL_image.h, /usr/include/SDL/SDL_ttf.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glut</GenericName>
             <
PackageName>freeglut-dev</PackageName>
-            <
FileCheck>/usr/lib/libglut.so.3, /usr/include/GL/glut.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libpng-development</GenericName>
             <
PackageName>libpng-dev</PackageName>
-            <
FileCheck>/usr/include/libpng12/png.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>build-utilities</GenericName>
             <
PackageName>cpp gcc autoconf automake libstdc++-dev</PackageName>
-            <
FileCheck>/usr/bin/cpp</FileCheck>
+            <
FileCheck>cpp</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>xorg-development</GenericName>
             <
PackageName>xserver-xorg-dev</PackageName>
-            <
FileCheck>/usr/lib/libXmu.so, /usr/lib/libXmuu.so, /usr/lib/libXi.a</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>bison</GenericName>
             <
PackageName>bison</PackageName>
-            <
FileCheck>/usr/bin/bison</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>flex</GenericName>
             <
PackageName>flex</PackageName>
-            <
FileCheck>/usr/bin/flex</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>imlib2-development</GenericName>
             <
PackageName>libimlib2-dev</PackageName>
-            <
FileCheck>/usr/lib/imlib2</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>java</GenericName>
             <
PackageName>openjdk-6-jdk</PackageName>
-            <
FileCheck>/usr/bin/java</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>portaudio-development</GenericName>
             <
PackageName>libportaudio-dev</PackageName>
-            <
FileCheck>/usr/include/portaudio.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>fortran-compiler</GenericName>
             <
PackageName>gfortran</PackageName>
-            <
FileCheck>/usr/bin/gfortran</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>freeimage</GenericName>
             <
PackageName>libfreeimage3</PackageName>
-            <
FileCheck>/usr/lib/libfreeimage.so.3, /usr/include/FreeImage.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>scons</GenericName>
@@ -
78,112 +66,90 @@
         <
Package>
             <
GenericName>zlib-development</GenericName>
             <
PackageName>python-zlib</PackageName>
-            <
FileCheck>/usr/include/zlib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>jpeg-development</GenericName>
             <
PackageName>libjpeg-dev</PackageName>
-            <
FileCheck>/usr/include/jpeglib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>perl</GenericName>
             <
PackageName>perl sdl-perl</PackageName>
-            <
FileCheck>/usr/bin/perl</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>xorg-video</GenericName>
             <
PackageName>libxvmc-dev libxv-dev</PackageName>
-            <
FileCheck>/usr/include/X11/extensions/Xvlib.h, /usr/include/X11/extensions/XvMClib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>vorbis-development</GenericName>
             <
PackageName>libvorbis-dev</PackageName>
-            <
FileCheck>/usr/include/vorbis/vorbisfile.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>qt4-development</GenericName>
             <
PackageName>libqtcore4-dev</PackageName>
-            <
FileCheck>/usr/bin/qmake-qt4, /usr/include/qt4/Qt/qgl.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>autoconf</GenericName>
             <
PackageName>autoconf</PackageName>
-            <
FileCheck>/usr/bin/autoconf</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libtool</GenericName>
             <
PackageName>libtool</PackageName>
-            <
FileCheck>/usr/bin/libtool</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>ncurses-development</GenericName>
             <
PackageName>ncurses-dev</PackageName>
-            <
FileCheck>/usr/include/ncurses.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>popt</GenericName>
             <
PackageName>libpopt-dev</PackageName>
-            <
FileCheck>/usr/include/popt.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>curl</GenericName>
             <
PackageName>curl libcurl4 libcurl5</PackageName>
-            <
FileCheck>/usr/lib/libcurl.so.3, /usr/bin/curl</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>fftw3-development</GenericName>
             <
PackageName>fftw-dev libfftw</PackageName>
-            <
FileCheck>/usr/include/fftw3.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>cmake</GenericName>
             <
PackageName>cmake</PackageName>
-            <
FileCheck>/usr/bin/cmake</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>boost-development</GenericName>
             <
PackageName>boost-dev</PackageName>
-            <
FileCheck>/usr/include/boost/, /usr/include/asio/, /usr/include/boost/date_time/, /usr/include/boost/regex.hpp, /usr/include/boost/iostreams/write.hpp</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>bzip2-development</GenericName>
             <
PackageName>bzip2-dev</PackageName>
-            <
FileCheck>/usr/include/bzlib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>tcl</GenericName>
             <
PackageName>tcl</PackageName>
-            <
FileCheck>/usr/bin/tclsh</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glibc-development</GenericName>
             <
PackageName>libc6-dev</PackageName>
-            <
FileCheck>/usr/include/gnu/stubs-32.h, /usr/lib/libc.a</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>python</GenericName>
             <
PackageName>python</PackageName>
-            <
FileCheck>/usr/bin/python</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>python-boost-development</GenericName>
             <
PackageName>boost-python libboost-python1.33.1</PackageName>
-            <
FileCheck>/usr/include/boost/python.hpp</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>boost-thread-development</GenericName>
             <
PackageName>boost-thread libboost-thread-mt1.33.1</PackageName>
-            <
FileCheck>/usr/include/boost/thread.hpp</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>python-numpy</GenericName>
             <
PackageName>python-numpy</PackageName>
-            <
FileCheck>/usr/share/pyshared/numpy/version.py</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>gmp-library</GenericName>
             <
PackageName>libgmp-dev</PackageName>
-            <
FileCheck>/usr/include/gmp.h</FileCheck>
         </
Package>
     </
ExternalDependencies>
 </
PhoronixTestSuite>
diff --git a/pts-core/external-test-dependencies/xml/arch-packages.xml b/pts-core/external-test-dependencies/xml/arch-packages.xml
index 0b8dcb1
..fe68064 100644
--- a/pts-core/external-test-dependencies/xml/arch-packages.xml
+++ b/pts-core/external-test-dependencies/xml/arch-packages.xml
@@ -9,87 +9,71 @@
         <
Package>
             <
GenericName>gtk-development</GenericName>
             <
PackageName>gtk2</PackageName>
-            <
FileCheck>/usr/include/gtk-2.0/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>sdl-development</GenericName>
             <
PackageName>sdl sdl_net sdl_gfx sdl_image sdl_ttf</PackageName>
-            <
FileCheck>/usr/include/SDL/SDL.h, /usr/include/SDL/SDL_net.h, /usr/include/SDL/SDL_ttf.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glut</GenericName>
             <
PackageName>freeglut</PackageName>
-            <
FileCheck>/usr/lib/libglut.so.3, /usr/include/GL/glut.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libpng-development</GenericName>
             <
PackageName>libpng</PackageName>
-            <
FileCheck>/usr/include/png.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>build-utilities</GenericName>
             <
PackageName>gcc</PackageName>
-            <
FileCheck>/usr/bin/g++</FileCheck>
+            <
FileCheck>g++</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>xorg-development</GenericName>
             <
PackageName>xorg</PackageName>
-            <
FileCheck>/usr/bin/X</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openssl-development</GenericName>
             <
PackageName>openssl</PackageName>
-            <
FileCheck>/usr/include/openssl/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>bison</GenericName>
             <
PackageName>bison</PackageName>
-            <
FileCheck>/usr/bin/bison</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>flex</GenericName>
             <
PackageName>flex</PackageName>
-            <
FileCheck>/usr/bin/flex</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>imlib2-development</GenericName>
             <
PackageName>imlib2</PackageName>
-            <
FileCheck>/usr/lib/imlib2</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>java</GenericName>
             <
PackageName>openjdk6</PackageName>
-            <
FileCheck>/usr/bin/java</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>portaudio-development</GenericName>
             <
PackageName>portaudio</PackageName>
-            <
FileCheck>/usr/include/portaudio.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>fortran-compiler</GenericName>
             <
PackageName>gcc-fortran</PackageName>
-            <
FileCheck>/usr/bin/gfortran</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glew</GenericName>
             <
PackageName>glew</PackageName>
-            <
FileCheck>/usr/include/GL/glew.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>scons</GenericName>
             <
PackageName>scons</PackageName>
-            <
FileCheck>/usr/bin/scons</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>zlib-development</GenericName>
             <
PackageName>zlib1</PackageName>
-            <
FileCheck>/usr/include/zlib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>jpeg-development</GenericName>
             <
PackageName>libjpeg</PackageName>
-            <
FileCheck>/usr/include/jpeglib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>perl</GenericName>
@@ -
99,32 +83,26 @@
         <
Package>
             <
GenericName>xorg-video</GenericName>
             <
PackageName>xorg</PackageName>
-            <
FileCheck>/usr/include/X11/extensions/Xvlib.h, /usr/include/X11/extensions/XvMClib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libstdcpp5</GenericName>
             <
PackageName>libstdc++5</PackageName>
-            <
FileCheck>/usr/lib/libstdc++.so.5</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openal-development</GenericName>
             <
PackageName>openal</PackageName>
-            <
FileCheck>/usr/include/AL/al.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>vorbis-development</GenericName>
             <
PackageName>libvorbis</PackageName>
-            <
FileCheck>/usr/include/vorbis/vorbisfile.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>jam</GenericName>
             <
PackageName>ftjam</PackageName>
-            <
FileCheck>/usr/bin/jam</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>qt4-development</GenericName>
             <
PackageName>qt4</PackageName>
-            <
FileCheck>/usr/bin/qmake-qt4</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>autoconf</GenericName>
@@ -
134,92 +112,74 @@
         <
Package>
             <
GenericName>libtool</GenericName>
             <
PackageName>libtool</PackageName>
-            <
FileCheck>/usr/bin/libtool</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>numa-development</GenericName>
             <
PackageName>numactl</PackageName>
-            <
FileCheck>/usr/include/numa.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>curl</GenericName>
             <
PackageName>libcurl curl</PackageName>
-            <
FileCheck>/usr/lib/libcurl.so.3, /usr/bin/curl</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>fftw3-development</GenericName>
             <
PackageName>fftw</PackageName>
-            <
FileCheck>/usr/include/fftw3.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>blas-development</GenericName>
             <
PackageName>blas</PackageName>
-            <
FileCheck>/usr/include/cblas.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>lapack-development</GenericName>
             <
PackageName>lapack</PackageName>
-            <
FileCheck>/usr/lib/liblapack.so</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>cmake</GenericName>
             <
PackageName>cmake</PackageName>
-            <
FileCheck>/usr/bin/cmake</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>boost-development</GenericName>
             <
PackageName>boost</PackageName>
-            <
FileCheck>/usr/include/boost/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>p7zip</GenericName>
             <
PackageName>p7zip</PackageName>
-            <
FileCheck>/usr/bin/7za</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>cairo-development</GenericName>
             <
PackageName>cairo</PackageName>
-            <
FileCheck>/usr/include/cairo/cairo.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>tcl</GenericName>
             <
PackageName>tcl</PackageName>
-            <
FileCheck>/usr/bin/tclsh</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>python</GenericName>
             <
PackageName>python</PackageName>
-            <
FileCheck>/usr/bin/python</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>yasm</GenericName>
             <
PackageName>yasm</PackageName>
-            <
FileCheck>/usr/bin/yasm</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>lib3ds</GenericName>
             <
PackageName>lib3ds</PackageName>
-            <
FileCheck>/usr/include/lib3ds/atmosphere.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>gmp-library</GenericName>
             <
PackageName>libgmp</PackageName>
-            <
FileCheck>/usr/include/gmp.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>subversion</GenericName>
             <
PackageName>subversion</PackageName>
-            <
FileCheck>/usr/bin/svn</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>git</GenericName>
             <
PackageName>git</PackageName>
-            <
FileCheck>/usr/bin/git</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>superlu</GenericName>
             <
PackageName>superlu</PackageName>
-            <
FileCheck>/usr/include/superlu</FileCheck>
         </
Package>
     </
ExternalDependencies>
 </
PhoronixTestSuite>
diff --git a/pts-core/external-test-dependencies/xml/fedora-packages.xml b/pts-core/external-test-dependencies/xml/fedora-packages.xml
index 80e54c8
..9de52db 100644
--- a/pts-core/external-test-dependencies/xml/fedora-packages.xml
+++ b/pts-core/external-test-dependencies/xml/fedora-packages.xml
@@ -10,262 +10,210 @@
         <
Package>
             <
GenericName>gtk-development</GenericName>
             <
PackageName>gtk2-devel</PackageName>
-            <
FileCheck>/usr/include/gtk-2.0/gtk/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>sdl-development</GenericName>
             <
PackageName>SDL-devel SDL_gfx-devel SDL_image-devel SDL_net-devel SDL_sound-devel SDL_ttf-devel</PackageName>
-            <
FileCheck>/usr/include/SDL/SDL.h, /usr/include/SDL/SDL_gfxPrimitives.h, /usr/include/SDL/SDL_net.h, /usr/include/SDL/SDL_image.h, /usr/include/SDL/SDL_ttf.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glut</GenericName>
             <
PackageName>freeglut-devel</PackageName>
-            <
FileCheck>/usr/lib/libglut.so OR /usr/lib64/libglut.so.3, /usr/include/GL/glut.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openssl-development</GenericName>
             <
PackageName>openssl-devel</PackageName>
-            <
FileCheck>/usr/include/openssl/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>csh</GenericName>
             <
PackageName>tcsh</PackageName>
-            <
FileCheck>/bin/tcsh OR /usr/bin/tcsh</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>cairo-development</GenericName>
             <
PackageName>cairo-devel</PackageName>
-            <
FileCheck>/usr/include/cairo/cairo.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libpng-development</GenericName>
             <
PackageName>libpng-devel</PackageName>
-            <
FileCheck>/usr/include/libpng12/png.OR /usr/include/png.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>build-utilities</GenericName>
             <
PackageName>gcc gcc-c++ make autoconf automake glibc-static patch</PackageName>
-            <
FileCheck>/usr/bin/gcc, /usr/bin/c++, /usr/bin/make, /usr/bin/autoconf, /usr/bin/patch</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>xorg-development</GenericName>
             <
PackageName>xorg-x11-server-devel</PackageName>
-            <
FileCheck>/usr/include/xorg</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>bison</GenericName>
             <
PackageName>bison</PackageName>
-            <
FileCheck>/usr/bin/bison</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>flex</GenericName>
             <
PackageName>flex</PackageName>
-            <
FileCheck>/usr/bin/flex</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>imlib2-development</GenericName>
             <
PackageName>imlib2-devel</PackageName>
-            <
FileCheck>/usr/lib/imlib2 OR /usr/lib64/imlib2</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>java</GenericName>
             <
PackageName>java-openjdk</PackageName>
-            <
FileCheck>/usr/bin/java</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>portaudio-development</GenericName>
             <
PackageName>portaudio-devel</PackageName>
-            <
FileCheck>/usr/include/portaudio.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>fortran-compiler</GenericName>
             <
PackageName>gcc-gfortran</PackageName>
-            <
FileCheck>/usr/bin/gfortran</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glew</GenericName>
             <
PackageName>glew-devel</PackageName>
-            <
FileCheck>/usr/include/GL/glew.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>freeimage</GenericName>
             <
PackageName>freeimage freeimage-devel</PackageName>
-            <
FileCheck>/usr/lib/libfreeimage.so.3 OR /usr/lib64/libfreeimage.so.3, /usr/include/FreeImage.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>scons</GenericName>
             <
PackageName>scons</PackageName>
-            <
FileCheck>/usr/bin/scons</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>zlib-development</GenericName>
             <
PackageName>zlib-devel</PackageName>
-            <
FileCheck>/usr/include/zlib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>jpeg-development</GenericName>
             <
PackageName>libjpeg-devel</PackageName>
-            <
FileCheck>/usr/include/jpeglib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libaio-development</GenericName>
             <
PackageName>libaio-devel</PackageName>
-            <
FileCheck>/usr/include/libaio.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>perl</GenericName>
             <
PackageName>perl perl-SDL pcre-devel</PackageName>
-            <
FileCheck>/usr/bin/perl, /usr/include/pcre.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>xorg-video</GenericName>
             <
PackageName>libXv-devel libXvMC-devel</PackageName>
-            <
FileCheck>/usr/include/X11/extensions/Xvlib.h, /usr/include/X11/extensions/XvMClib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libstdcpp5</GenericName>
             <
PackageName>compat-libstdc++-33</PackageName>
-            <
FileCheck>/usr/lib/libstdc++.so.5 OR /usr/lib64/libstdc++.so.5</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>p7zip</GenericName>
             <
PackageName>p7zip</PackageName>
-            <
FileCheck>/usr/bin/7za</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openal-development</GenericName>
             <
PackageName>openal openal-devel</PackageName>
-            <
FileCheck>/usr/include/AL/al.h, /usr/lib/libopenal.so.0 OR /usr/lib64/libopenal.so.0 OR /usr/lib/libopenal.so OR /usr/lib64/libopenal.so</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>vorbis-development</GenericName>
             <
PackageName>taglib-devel</PackageName>
-            <
FileCheck>/usr/include/taglib/vorbisfile.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>jam</GenericName>
             <
PackageName>jam</PackageName>
-            <
FileCheck>/usr/bin/jam</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>qt4-development</GenericName>
             <
PackageName>qt4-devel</PackageName>
-            <
FileCheck>/usr/bin/qmake-qt4</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>autoconf</GenericName>
             <
PackageName>autoconf</PackageName>
-            <
FileCheck>/usr/bin/autoconf</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libtool</GenericName>
             <
PackageName>libtool</PackageName>
-            <
FileCheck>/usr/bin/libtool</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>ncurses-development</GenericName>
             <
PackageName>ncurses-devel</PackageName>
-            <
FileCheck>/usr/include/ncurses.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>popt</GenericName>
             <
PackageName>popt-devel</PackageName>
-            <
FileCheck>/usr/include/popt.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>numa-development</GenericName>
             <
PackageName>numactl-devel</PackageName>
-            <
FileCheck>/usr/include/numa.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>curl</GenericName>
             <
PackageName>libcurl curl</PackageName>
-            <
FileCheck>/usr/lib/libcurl.so.4 OR /usr/lib64/libcurl.so.4, /usr/bin/curl</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>fftw3-development</GenericName>
             <
PackageName>fftw3-devel</PackageName>
-            <
FileCheck>/usr/include/fftw3.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>blas-development</GenericName>
             <
PackageName>blas blas-devel</PackageName>
-            <
FileCheck>/usr/lib/libblas.so OR /usr/lib64/libblas.so</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>lapack-development</GenericName>
             <
PackageName>lapack-devel</PackageName>
-            <
FileCheck>/usr/lib/liblapack.so OR /usr/lib64/liblapack.so</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>cmake</GenericName>
             <
PackageName>cmake</PackageName>
-            <
FileCheck>/usr/bin/cmake</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>boost-development</GenericName>
             <
PackageName>boost-devel</PackageName>
-            <
FileCheck>/usr/include/boost/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>bzip2-development</GenericName>
             <
PackageName>bzip2-devel</PackageName>
-            <
FileCheck>/usr/include/bzlib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>tcl</GenericName>
             <
PackageName>tcl</PackageName>
-            <
FileCheck>/usr/bin/tclsh</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glibc-development</GenericName>
             <
PackageName>glibc-devel</PackageName>
-            <
FileCheck>/usr/lib/libc.so OR /usr/lib64/libc.so</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>python</GenericName>
             <
PackageName>python</PackageName>
-            <
FileCheck>/usr/bin/python</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>atlas-development</GenericName>
             <
PackageName>atlas-devel</PackageName>
-            <
FileCheck>/usr/lib/atlas/ OR /usr/lib64/atlas/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openmpi-development</GenericName>
             <
PackageName>openmpi-devel openmpi mpich2-devel</PackageName>
-            <
FileCheck>/usr/lib/openmpi/ OR /usr/lib64/openmpi/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>yasm</GenericName>
             <
PackageName>yasm</PackageName>
-            <
FileCheck>/usr/bin/yasm</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>lib3ds</GenericName>
             <
PackageName>lib3ds-devel</PackageName>
-            <
FileCheck>/usr/include/lib3ds/atmosphere.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>gmp-library</GenericName>
             <
PackageName>gmp-devel</PackageName>
-            <
FileCheck>/usr/include/gmp.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>subversion</GenericName>
             <
PackageName>subversion</PackageName>
-            <
FileCheck>/usr/bin/svn</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>git</GenericName>
             <
PackageName>git</PackageName>
-            <
FileCheck>/usr/bin/git</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>superlu</GenericName>
             <
PackageName>superlu</PackageName>
-            <
FileCheck>/usr/include/superlu</FileCheck>
         </
Package>
     </
ExternalDependencies>
 </
PhoronixTestSuite>
diff --git a/pts-core/external-test-dependencies/xml/freebsd-packages.xml b/pts-core/external-test-dependencies/xml/freebsd-packages.xml
index 63d5aca
..0298a55 100644
--- a/pts-core/external-test-dependencies/xml/freebsd-packages.xml
+++ b/pts-core/external-test-dependencies/xml/freebsd-packages.xml
@@ -8,172 +8,140 @@
         <
Package>
             <
GenericName>gtk-development</GenericName>
             <
PackageName>x11-toolkits/gtk20</PackageName>
-            <
FileCheck>/usr/local/include/gtk-2.0/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>sdl-development</GenericName>
             <
PackageName>devel/sdl12 graphics/sdl_gfx graphics/sdl_image graphics/sdl_ttf audio/sdl_sound audio/sdl_mixer</PackageName>
-            <
FileCheck>/usr/local/include/SDL/SDL.h, /usr/local/include/SDL/SDL_image.h, /usr/local/include/SDL/SDL_ttf.h, /usr/local/include/SDL/SDL_audio.h, /usr/local/include/SDL/SDL_mixer.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glut</GenericName>
             <
PackageName>graphics/freeglut</PackageName>
-            <
FileCheck>/usr/local/include/GL/glut.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>csh</GenericName>
             <
PackageName>shells/44bsd-csh</PackageName>
-            <
FileCheck>/usr/local/bin/44bsd-csh</FileCheck>
+            <
FileCheck>44bsd-csh</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libpng-development</GenericName>
             <
PackageName>graphics/png</PackageName>
-            <
FileCheck>/usr/local/include/png.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openssl-development</GenericName>
             <
PackageName>security/openssl</PackageName>
-            <
FileCheck>/usr/local/include/openssl/ssl.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>build-utilities</GenericName>
             <
PackageName>devel/autoconf</PackageName>
-            <
FileCheck>/usr/local/bin/autoconf</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>cairo-development</GenericName>
             <
PackageName>graphics/cairo</PackageName>
-            <
FileCheck>/usr/local/include/cairo/cairo.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>bison</GenericName>
             <
PackageName>devel/bison</PackageName>
-            <
FileCheck>/usr/local/bin/bison</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>flex</GenericName>
             <
PackageName>textproc/flex</PackageName>
-            <
FileCheck>/usr/local/bin/flex</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>imlib2-development</GenericName>
             <
PackageName>graphics/imlib2</PackageName>
-            <
FileCheck>/usr/local/lib/imlib2/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>java</GenericName>
             <
PackageName>java/openjdk7</PackageName>
-            <
FileCheck>/usr/local/bin/java</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>portaudio-development</GenericName>
             <
PackageName>audio/portaudio</PackageName>
-            <
FileCheck>/usr/local/include/portaudio.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>fortran-compiler</GenericName>
             <
PackageName>lang/g95</PackageName>
-            <
FileCheck>/usr/local/bin/g95</FileCheck>
+            <
FileCheck>g95</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glew</GenericName>
             <
PackageName>graphics/glew</PackageName>
-            <
FileCheck>/usr/local/include/GL/glew.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>lib3ds</GenericName>
             <
PackageName>graphics/lib3ds</PackageName>
-            <
FileCheck>/usr/local/include/lib3ds/io.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>freeimage</GenericName>
             <
PackageName>graphics/freeimage</PackageName>
-            <
FileCheck>/usr/local/include/FreeImage.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>scons</GenericName>
             <
PackageName>devel/scons</PackageName>
-            <
FileCheck>/usr/local/bin/scons</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>jpeg-development</GenericName>
             <
PackageName>graphics/libjpeg-turbo</PackageName>
-            <
FileCheck>/usr/local/include/jpeglib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libaio-development</GenericName>
             <
PackageName>emulators/linux-libaio</PackageName>
-            <
FileCheck>/usr/local/include/libaio.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>perl</GenericName>
             <
PackageName>lang/perl5.14</PackageName>
-            <
FileCheck>/usr/local/bin/perl</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openal-development</GenericName>
             <
PackageName>audio/openal</PackageName>
-            <
FileCheck>/usr/local/include/AL/al.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>vorbis-development</GenericName>
             <
PackageName>audio/libvorbis</PackageName>
-            <
FileCheck>/usr/local/include/vorbis/vorbisfile.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>jam</GenericName>
             <
PackageName>devel/jam</PackageName>
-            <
FileCheck>/usr/local/bin/jam</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>p7zip</GenericName>
             <
PackageName>archivers/p7zip</PackageName>
-            <
FileCheck>/usr/local/bin/7za</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>qt4-development</GenericName>
             <
PackageName>x11-toolkits/qt4-gui</PackageName>
-            <
FileCheck>/usr/local/include/qt4/Qt/qgl.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>autoconf</GenericName>
             <
PackageName>devel/autoconf</PackageName>
-            <
FileCheck>/usr/local/bin/autoconf</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libtool</GenericName>
             <
PackageName>devel/libtool</PackageName>
-            <
FileCheck>/usr/local/bin/libtool</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>ncurses-development</GenericName>
             <
PackageName>devel/ncurses</PackageName>
-            <
FileCheck>/usr/local/include/ncurses/ncurses.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>popt</GenericName>
             <
PackageName>devel/popt</PackageName>
-            <
FileCheck>/usr/local/include/popt.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>curl</GenericName>
             <
PackageName>ftp/curl</PackageName>
-            <
FileCheck>/usr/local/bin/curl</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>fftw3-development</GenericName>
             <
PackageName>math/fftw</PackageName>
-            <
FileCheck>/usr/local/include/fftw3.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>blas-development</GenericName>
             <
PackageName>math/blas</PackageName>
-            <
FileCheck>/usr/local/lib/libblas.so</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>lapack-development</GenericName>
             <
PackageName>math/lapack</PackageName>
-            <
FileCheck>/usr/local/lib/liblapack.so</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>atlas-development</GenericName>
@@ -
183,62 +151,50 @@
         <
Package>
             <
GenericName>openmpi-development</GenericName>
             <
PackageName>net/openmpi net/mpich2</PackageName>
-            <
FileCheck>/usr/local/mpi/openmpi/lib, /usr/local/include/mpicxx.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>cmake</GenericName>
             <
PackageName>devel/cmake</PackageName>
-            <
FileCheck>/usr/local/bin/cmake</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>boost-development</GenericName>
             <
PackageName>devel/boost-all</PackageName>
-            <
FileCheck>/usr/local/include/boost/iostreams/write.hpp</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>bzip2-development</GenericName>
             <
PackageName>archivers/bzip2</PackageName>
-            <
FileCheck>/usr/local/include/bzlib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>tcl</GenericName>
             <
PackageName>devel/tcllib</PackageName>
-            <
FileCheck>/usr/local/bin/tclsh8.5</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>python</GenericName>
             <
PackageName>lang/python</PackageName>
-            <
FileCheck>/usr/local/bin/python</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>python-boost-development</GenericName>
             <
PackageName>devel/boost-python-libs</PackageName>
-            <
FileCheck>/usr/local/include/boost/python.hpp</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>yasm</GenericName>
             <
PackageName>devel/yasm</PackageName>
-            <
FileCheck>/usr/local/bin/yasm</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>gmp-library</GenericName>
             <
PackageName>math/gmp</PackageName>
-            <
FileCheck>/usr/local/include/gmp.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>subversion</GenericName>
             <
PackageName>devel/subversion</PackageName>
-            <
FileCheck>/usr/local/bin/svn</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>git</GenericName>
             <
PackageName>devel/git</PackageName>
-            <
FileCheck>/usr/local/bin/git</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>superlu</GenericName>
             <
PackageName>math/superlu</PackageName>
-            <
FileCheck>/usr/local/include/superlu/</FileCheck>
         </
Package>
     </
ExternalDependencies>
 </
PhoronixTestSuite>
diff --git a/pts-core/external-test-dependencies/xml/generic-packages.xml b/pts-core/external-test-dependencies/xml/generic-packages.xml
index 741b925
..7d68c9f 100644
--- a/pts-core/external-test-dependencies/xml/generic-packages.xml
+++ b/pts-core/external-test-dependencies/xml/generic-packages.xml
@@ -35,+35,@@
             <
GenericName>csh</GenericName>
             <
Title>CSH</Title>
             <
PossibleNames>cshtcsh</PossibleNames>
-            <
FileCheck>csh</FileCheck>
+            <
FileCheck>csh OR bsd-csh</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libpng-development</GenericName>
@@ -
89,+89,@@
             <
GenericName>imlib2-development</GenericName>
             <
Title>Imlib2 Development Files</Title>
             <
PossibleNames>libimlib2-dev</PossibleNames>
-            <
FileCheck>Imlib2.h</FileCheck>
+            <
FileCheck>Imlib2.hlibImlib2.so</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>java</GenericName>
@@ -
191,13 +191,13 @@
             <
GenericName>jam</GenericName>
             <
Title>Jam Build Tool</Title>
             <
PossibleNames>jam</PossibleNames>
-            <
FileCheck>jam</FileCheck>
+            <
FileCheck>jam OR jam.perforce</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>qt4-development</GenericName>
             <
Title>Qt4 Development Files</Title>
             <
PossibleNames>libqt4-devlibqt4-develqt4-devel</PossibleNames>
-            <
FileCheck>qmake</FileCheck>
+            <
FileCheck>qmake OR qmake-qt4</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>autoconf</GenericName>
@@ -
288,+288,@@
             <
GenericName>glibc-development</GenericName>
             <
Title>GNU C Development Libraries w32-bit Support</Title>
             <
PossibleNames>libc6-devlibc6-dev-i386glibc-devel</PossibleNames>
-            <
FileCheck>gnu/stubs-32.hlibc.a</FileCheck>
+            <
FileCheck>gnu/stubs-32.h OR gnu-versions.hlibc.a</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>python</GenericName>
diff --git a/pts-core/external-test-dependencies/xml/gentoo-packages.xml b/pts-core/external-test-dependencies/xml/gentoo-packages.xml
index d3bf176
..1451822 100644
--- a/pts-core/external-test-dependencies/xml/gentoo-packages.xml
+++ b/pts-core/external-test-dependencies/xml/gentoo-packages.xml
@@ -9,217 +9,174 @@
         <
Package>
             <
GenericName>gtk-development</GenericName>
             <
PackageName>x11-libs/gtk+</PackageName>
-            <
FileCheck>/usr/include/gtk-2.0</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>sdl-development</GenericName>
             <
PackageName>media-libs/libsdl media-libs/sdl-net media-libs/sdl-image</PackageName>
-            <
FileCheck>/usr/include/SDL/SDL.h, /usr/include/SDL/SDL_net.h, /usr/include/SDL/SDL_image.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glut</GenericName>
             <
PackageName>virtual/glut</PackageName>
-            <
FileCheck>/usr/lib/libglut.so.3 OR /usr/lib64/libglut.so.3, /usr/include/GL/glut.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openssl-development</GenericName>
             <
PackageName>dev-libs/openssl</PackageName>
-            <
FileCheck>/usr/include/openssl/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>cairo-development</GenericName>
             <
PackageName>x11-libs/cairo</PackageName>
-            <
FileCheck>/usr/include/cairo/cairo.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>csh</GenericName>
             <
PackageName>app-shells/tcsh</PackageName>
-            <
FileCheck>/bin/csh</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>p7zip</GenericName>
             <
PackageName>app-arch/p7zip</PackageName>
-            <
FileCheck>/usr/bin/7za</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libpng-development</GenericName>
             <
PackageName>media-libs/libpng</PackageName>
-            <
FileCheck>/usr/include/libpng12/png.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>build-utilities</GenericName>
             <
PackageName>sys-devel/gcc</PackageName>
-            <
FileCheck>/usr/bin/gcc</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>xorg-development</GenericName>
             <
PackageName>x11-base/xorg-server</PackageName>
-            <
FileCheck>/usr/include/xorg</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>bison</GenericName>
             <
PackageName>sys-devel/bison</PackageName>
-            <
FileCheck>/usr/bin/bison</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>flex</GenericName>
             <
PackageName>sys-devel/flex</PackageName>
-            <
FileCheck>/usr/bin/flex</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>imlib2-development</GenericName>
             <
PackageName>media-libs/imlib2</PackageName>
-            <
FileCheck>/usr/include/Imlib2.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>java</GenericName>
             <
PackageName>virtual/jre</PackageName>
-            <
FileCheck>/usr/bin/java</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>portaudio-development</GenericName>
             <
PackageName>media-libs/portaudio</PackageName>
-            <
FileCheck>/usr/include/portaudio.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>fortran-compiler</GenericName>
             <
PackageName>sys-devel/gcc</PackageName>
-            <
FileCheck>/usr/bin/gfortran</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glew</GenericName>
             <
PackageName>media-libs/glew</PackageName>
-            <
FileCheck>/usr/include/GL/glew.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>freeimage</GenericName>
             <
PackageName>media-libs/freeimage</PackageName>
-            <
FileCheck>/usr/lib/libfreeimage.so.3 OR /usr/lib64/libfreeimage.so.3</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>scons</GenericName>
             <
PackageName>dev-util/scons</PackageName>
-            <
FileCheck>/usr/bin/scons</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>zlib-development</GenericName>
             <
PackageName>sys-libs/zlib</PackageName>
-            <
FileCheck>/usr/include/zlib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>jpeg-development</GenericName>
             <
PackageName>media-libs/jpeg</PackageName>
-            <
FileCheck>/usr/include/jpeglib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libaio-development</GenericName>
             <
PackageName>dev-libs/libaio</PackageName>
-            <
FileCheck>/usr/include/libaio.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>perl</GenericName>
             <
PackageName>dev-lang/perl</PackageName>
-            <
FileCheck>/usr/bin/perl</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>xorg-video</GenericName>
             <
PackageName>x11-libs/libXvMC x11-libs/libXv</PackageName>
-            <
FileCheck>/usr/include/X11/extensions/Xvlib.h, /usr/include/X11/extensions/XvMClib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libstdcpp5</GenericName>
             <
PackageName>virtual/libstdc++-3.3</PackageName>
-            <
FileCheck>/usr/lib/libstdc++.so.5 OR /usr/lib/libstdc++-v3/libstdc++.so.5 OR /usr/lib64/libstdc++-v3/libstdc++.so.5</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openal-development</GenericName>
             <
PackageName>media-libs/openal</PackageName>
-            <
FileCheck>/usr/include/AL/al.h, /usr/lib/libopenal.so.0 OR /usr/lib/libopenal.so.1 OR /usr/lib64/libopenal.so.1</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>vorbis-development</GenericName>
             <
PackageName>media-libs/taglib</PackageName>
-            <
FileCheck>/usr/include/taglib/vorbisfile.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>jam</GenericName>
             <
PackageName>dev-util/ftjam</PackageName>
-            <
FileCheck>/usr/bin/jam</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>qt4-development</GenericName>
             <
PackageName>x11-libs/qt-core</PackageName>
-            <
FileCheck>/usr/bin/qmake</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>autoconf</GenericName>
             <
PackageName>sys-devel/autoconf</PackageName>
-            <
FileCheck>/usr/bin/autoconf</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libtool</GenericName>
             <
PackageName>sys-devel/libtool</PackageName>
-            <
FileCheck>/usr/bin/libtool</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>ncurses-development</GenericName>
             <
PackageName>sys-libs/ncurses</PackageName>
-            <
FileCheck>/usr/include/ncurses.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>popt</GenericName>
             <
PackageName>dev-libs/popt</PackageName>
-            <
FileCheck>/usr/include/popt.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>numa-development</GenericName>
             <
PackageName>sys-process/numactl</PackageName>
-            <
FileCheck>/usr/include/numa.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>curl</GenericName>
             <
PackageName>net-misc/curl</PackageName>
-            <
FileCheck>/usr/lib/libcurl.so.3, /usr/bin/curl</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>fftw3-development</GenericName>
             <
PackageName>sci-libs/fftw</PackageName>
-            <
FileCheck>/usr/include/fftw3.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>blas-development</GenericName>
             <
PackageName>virtual/blas</PackageName>
-            <
FileCheck>/usr/include/cblas.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>lapack-development</GenericName>
             <
PackageName>virtual/lapack</PackageName>
-            <
FileCheck>/usr/lib/liblapack.so</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>cmake</GenericName>
             <
PackageName>dev-util/cmake</PackageName>
-            <
FileCheck>/usr/bin/cmake</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>boost-development</GenericName>
             <
PackageName>dev-libs/boost</PackageName>
-            <
FileCheck>/usr/include/boost/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>bzip2-development</GenericName>
             <
PackageName>dev-haskell/bzlib</PackageName>
-            <
FileCheck>/usr/include/bzlib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>tcl</GenericName>
             <
PackageName>dev-lang/tcl</PackageName>
-            <
FileCheck>/usr/bin/tclsh</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glibc-development</GenericName>
             <
PackageName>dev-libs/libpthread-stubs</PackageName>
-            <
FileCheck>/usr/include/gnu/stubs-32.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>python</GenericName>
@@ -
229,47 +186,38 @@
         <
Package>
             <
GenericName>atlas-development</GenericName>
             <
PackageName>sci-libs/lapack-atlas</PackageName>
-            <
FileCheck>/usr/lib/libatlas.a</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openmpi-development</GenericName>
             <
PackageName>sys-cluster/openmpi</PackageName>
-            <
FileCheck>/usr/lib/openmpi/lib/libmpi.so, /usr/bin/mpirun.openmpi</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>yasm</GenericName>
             <
PackageName>dev-lang/yasm</PackageName>
-            <
FileCheck>/usr/bin/yasm</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>lib3ds</GenericName>
             <
PackageName>media-libs/lib3ds</PackageName>
-            <
FileCheck>/usr/include/lib3ds/atmosphere.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>gmp-library</GenericName>
             <
PackageName>dev-libs/gmp</PackageName>
-            <
FileCheck>/usr/include/gmp.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>subversion</GenericName>
             <
PackageName>dev-vcs/subversion</PackageName>
-            <
FileCheck>/usr/bin/svn</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>git</GenericName>
             <
PackageName>dev-vcs/git</PackageName>
-            <
FileCheck>/usr/bin/git</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>superlu</GenericName>
             <
PackageName>sci-libs/superlu</PackageName>
-            <
FileCheck>/usr/include/superlu</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libtool</GenericName>
             <
PackageName>sys-devel/libtool</PackageName>
-            <
FileCheck>/usr/bin/libtool</FileCheck>
         </
Package>
     </
ExternalDependencies>
 </
PhoronixTestSuite>
diff --git a/pts-core/external-test-dependencies/xml/mandrivalinux-packages.xml b/pts-core/external-test-dependencies/xml/mandrivalinux-packages.xml
index b5760b5
..e967e1c 100644
--- a/pts-core/external-test-dependencies/xml/mandrivalinux-packages.xml
+++ b/pts-core/external-test-dependencies/xml/mandrivalinux-packages.xml
@@ -9,37 +9,30 @@
         <
Package>
             <
GenericName>gtk-development</GenericName>
             <
PackageName>gtk+2-devel</PackageName>
-            <
FileCheck>/usr/include/gtk-2.0/gtk/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>sdl-development</GenericName>
             <
PackageName>libSDL1.2_0 libSDL_gfx13 libSDL_image1.2_0 libSDL_net1.2_0 libSDL_ttf2.0_0</PackageName>
-            <
FileCheck>/usr/include/SDL/SDL.h, /usr/include/SDL/SDL_gfxPrimitives.h, /usr/include/SDL/SDL_net.h, /usr/include/SDL/SDL_image.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>cairo-development</GenericName>
             <
PackageName>cairo-devel</PackageName>
-            <
FileCheck>/usr/include/cairo/cairo.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openssl-development</GenericName>
             <
PackageName>openssl</PackageName>
-            <
FileCheck>/usr/include/openssl/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>p7zip</GenericName>
             <
PackageName>p7zip</PackageName>
-            <
FileCheck>/usr/bin/7za</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>csh</GenericName>
             <
PackageName>tcsh</PackageName>
-            <
FileCheck>/bin/tcsh</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libpng-development</GenericName>
             <
PackageName>png-devel</PackageName>
-            <
FileCheck>/usr/include/libpng12/png.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>build-utilities</GenericName>
@@ -
49,72 +42,58 @@
         <
Package>
             <
GenericName>xorg-development</GenericName>
             <
PackageName>libxorg-x11-devel</PackageName>
-            <
FileCheck>/usr/include/xorg, /usr/include/GL/glut.h, /usr/include/X11/extensions/XvMClib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>bison</GenericName>
             <
PackageName>bison</PackageName>
-            <
FileCheck>/usr/bin/bison</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>flex</GenericName>
             <
PackageName>flex</PackageName>
-            <
FileCheck>/usr/bin/flex</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>imlib2-development</GenericName>
             <
PackageName>imlib2-devel</PackageName>
-            <
FileCheck>/usr/include/Imlib2.h</FileCheck>
         </
Package>
                 <
Package>
                         <
GenericName>java</GenericName>
                         <
PackageName>java</PackageName>
-                        <
FileCheck>/usr/bin/java</FileCheck>
                 </
Package>
         <
Package>
             <
GenericName>portaudio-development</GenericName>
             <
PackageName>portaudio-devel</PackageName>
-            <
FileCheck>/usr/include/portaudio.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>fortran-compiler</GenericName>
             <
PackageName>gcc-gfortran</PackageName>
-            <
FileCheck>/usr/bin/gfortran</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glew</GenericName>
             <
PackageName>glew-devel</PackageName>
-            <
FileCheck>/usr/include/GL/glew.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>freeimage</GenericName>
             <
PackageName>freeimage-devel</PackageName>
-            <
FileCheck>/usr/lib/libfreeimage.so.3, /usr/include/FreeImage.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>scons</GenericName>
             <
PackageName>scons</PackageName>
-            <
FileCheck>/usr/bin/scons</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>zlib-development</GenericName>
             <
PackageName>zlib1-devel</PackageName>
-            <
FileCheck>/usr/include/zlib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>jpeg-development</GenericName>
             <
PackageName>libopenjpeg-devel</PackageName>
-            <
FileCheck>/usr/include/jpeglib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libaio-development</GenericName>
             <
PackageName>libaio-devel</PackageName>
-            <
FileCheck>/usr/include/libaio.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>perl</GenericName>
             <
PackageName>perl perl-SDL</PackageName>
-            <
FileCheck>/usr/bin/perl</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>perl-opengl</GenericName>
@@ -
124,22 +103,18 @@
         <
Package>
             <
GenericName>xorg-video</GenericName>
             <
PackageName>libxv1-devel libxvmc1-devel</PackageName>
-            <
FileCheck>/usr/include/X11/extensions/Xvlib.h, /usr/include/X11/extensions/XvMClib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libstdcpp5</GenericName>
             <
PackageName>libstdc++5</PackageName>
-            <
FileCheck>/usr/lib/libstdc++.so.5</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openal-development</GenericName>
             <
PackageName>openal-devel</PackageName>
-            <
FileCheck>/usr/include/AL/al.h, /usr/lib/libopenal.so.0</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>vorbis-development</GenericName>
             <
PackageName>libvorbis-devel</PackageName>
-            <
FileCheck>/usr/include/taglib/vorbisfile.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>jam</GenericName>
@@ -
154,112 +129,90 @@
         <
Package>
             <
GenericName>autoconf</GenericName>
             <
PackageName>autoconf</PackageName>
-            <
FileCheck>/usr/bin/autoconf</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libtool</GenericName>
             <
PackageName>libtool</PackageName>
-            <
FileCheck>/usr/bin/libtool</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>ncurses-development</GenericName>
             <
PackageName>libncurses5-devel</PackageName>
-            <
FileCheck>/usr/include/ncurses.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>popt</GenericName>
             <
PackageName>popt</PackageName>
-            <
FileCheck>/usr/include/popt.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>curl</GenericName>
             <
PackageName>libcurl4 curl</PackageName>
-            <
FileCheck>/usr/lib/libcurl.so.3, /usr/bin/curl</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>fftw3-development</GenericName>
             <
PackageName>libfftw-devel</PackageName>
-            <
FileCheck>/usr/include/fftw3.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>blas-development</GenericName>
             <
PackageName>libblas-devel</PackageName>
-            <
FileCheck>/usr/include/cblas.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>lapack-development</GenericName>
             <
PackageName>liblapack-devel</PackageName>
-            <
FileCheck>/usr/lib/liblapack.so</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>cmake</GenericName>
             <
PackageName>cmake</PackageName>
-            <
FileCheck>/usr/bin/cmake</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>boost-development</GenericName>
             <
PackageName>libboost-devel</PackageName>
-            <
FileCheck>/usr/include/boost/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>bzip2-development</GenericName>
             <
PackageName>libbzip2-devel</PackageName>
-            <
FileCheck>/usr/include/bzlib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>tcl</GenericName>
             <
PackageName>tcl</PackageName>
-            <
FileCheck>/usr/bin/tclsh</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glibc-development</GenericName>
             <
PackageName>glibc-devel</PackageName>
-            <
FileCheck>/usr/include/gnu/stubs-32.h, /usr/lib/libc.a</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>python</GenericName>
             <
PackageName>python</PackageName>
-            <
FileCheck>/usr/bin/python</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>atlas-development</GenericName>
             <
PackageName>libatlas-devel</PackageName>
-            <
FileCheck>/usr/lib/libatlas.a</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openmpi-development</GenericName>
             <
PackageName>libopenmpi</PackageName>
-            <
FileCheck>/usr/lib/openmpi/lib/libmpi.so, /usr/bin/mpirun.openmpi</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>yasm</GenericName>
             <
PackageName>yasm</PackageName>
-            <
FileCheck>/usr/bin/yasm</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>lib3ds</GenericName>
             <
PackageName>lib3ds-devel</PackageName>
-            <
FileCheck>/usr/include/lib3ds/atmosphere.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>gmp-library</GenericName>
             <
PackageName>libgmp-devel</PackageName>
-            <
FileCheck>/usr/include/gmp.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>subversion</GenericName>
             <
PackageName>subversion</PackageName>
-            <
FileCheck>/usr/bin/svn</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>git</GenericName>
             <
PackageName>git</PackageName>
-            <
FileCheck>/usr/bin/git</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>superlu</GenericName>
             <
PackageName>superlu</PackageName>
-            <
FileCheck>/usr/include/superlu</FileCheck>
         </
Package>
     </
ExternalDependencies>
 </
PhoronixTestSuite>
diff --git a/pts-core/external-test-dependencies/xml/opensuse-packages.xml b/pts-core/external-test-dependencies/xml/opensuse-packages.xml
index 31f180e
..adedc71 100644
--- a/pts-core/external-test-dependencies/xml/opensuse-packages.xml
+++ b/pts-core/external-test-dependencies/xml/opensuse-packages.xml
@@ -10,67 +10,55 @@
         <
Package>
             <
GenericName>gtk-development</GenericName>
             <
PackageName>gtk2-devel</PackageName>
-            <
FileCheck>/usr/include/gtk-2.0</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>sdl-development</GenericName>
             <
PackageName>libSDL-devel libSDL_image-devel libSDL_gfx-devel libSDL_net-devel libSDL_ttf-devel</PackageName>
-            <
FileCheck>/usr/include/SDL/SDL.h, /usr/include/SDL/SDL_image.h, /usr/include/SDL/SDL_gfxPrimitives.h, /usr/include/SDL/SDL_net.h, /usr/include/SDL/SDL_ttf.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glut</GenericName>
             <
PackageName>freeglut-devel</PackageName>
-            <
FileCheck>/usr/include/GL/glut.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openssl-development</GenericName>
             <
PackageName>openssl-devel</PackageName>
-            <
FileCheck>/usr/include/openssl/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>csh</GenericName>
             <
PackageName>tcsh</PackageName>
-            <
FileCheck>/bin/csh</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libpng-development</GenericName>
             <
PackageName>libpng-devel</PackageName>
-            <
FileCheck>/usr/include/libpng12/png.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>build-utilities</GenericName>
             <
PackageName>gcc gcc-c++ make autoconf</PackageName>
-            <
FileCheck>/usr/bin/gcc, /usr/bin/g++, /usr/bin/make, /usr/bin/autoconf</FileCheck>
+            <
FileCheck>gccg++, makeautoconf</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>xorg-development</GenericName>
             <
PackageName>xorg-x11-server-sdk</PackageName>
-            <
FileCheck>/usr/include/xorg</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>cairo-development</GenericName>
             <
PackageName>cairo-devel</PackageName>
-            <
FileCheck>/usr/include/cairo/cairo.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>p7zip</GenericName>
             <
PackageName>p7zip</PackageName>
-            <
FileCheck>/usr/bin/7za</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>bison</GenericName>
             <
PackageName>bison</PackageName>
-            <
FileCheck>/usr/bin/bison</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>flex</GenericName>
             <
PackageName>flex</PackageName>
-            <
FileCheck>/usr/bin/flex</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>imlib2-development</GenericName>
             <
PackageName>imlib2-devel</PackageName>
-            <
FileCheck>/usr/include/Imlib2.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>java</GenericName>
@@ -
80,177 +68,142 @@
         <
Package>
             <
GenericName>portaudio-development</GenericName>
             <
PackageName>portaudio-devel</PackageName>
-            <
FileCheck>/usr/include/portaudio.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>fortran-compiler</GenericName>
             <
PackageName>gcc-fortran</PackageName>
-            <
FileCheck>/usr/bin/gfortran</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glew</GenericName>
             <
PackageName>glew-devel</PackageName>
-            <
FileCheck>/usr/include/GL/glew.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>freeimage</GenericName>
             <
PackageName>libfreeimage3 libfreeimage-devel</PackageName>
-            <
FileCheck>/usr/lib/libfreeimage.so.3, /usr/include/FreeImage.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>scons</GenericName>
             <
PackageName>scons</PackageName>
-            <
FileCheck>/usr/bin/scons</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>zlib-development</GenericName>
             <
PackageName>zlib-devel</PackageName>
-            <
FileCheck>/usr/include/zlib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>jpeg-development</GenericName>
             <
PackageName>libjpeg-devel</PackageName>
-            <
FileCheck>/usr/include/jpeglib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libaio-development</GenericName>
             <
PackageName>libaio-devel</PackageName>
-            <
FileCheck>/usr/include/libaio.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>perl</GenericName>
             <
PackageName>perl</PackageName>
-            <
FileCheck>/usr/bin/perl</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>xorg-video</GenericName>
             <
PackageName>xorg-x11-libXv-devel xorg-x11-devel</PackageName>
-            <
FileCheck>/usr/include/X11/extensions/Xvlib.h, /usr/include/X11/extensions/XvMClib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libstdcpp5</GenericName>
             <
PackageName>libstdc++5</PackageName>
-            <
FileCheck>/usr/lib/libstdc++.so.5</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openal-development</GenericName>
             <
PackageName>libopenal-devel libopenal0-soft</PackageName>
-            <
FileCheck>/usr/include/AL/al.h, /usr/lib/libopenal.so.0</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>vorbis-development</GenericName>
             <
PackageName>taglib-devel</PackageName>
-            <
FileCheck>/usr/include/taglib/vorbisfile.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>jam</GenericName>
             <
PackageName>boost-jam asio-devel</PackageName>
-            <
FileCheck>/usr/bin/jam, /usr/include/asio/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>qt4-development</GenericName>
             <
PackageName>libqt4-devel</PackageName>
-            <
FileCheck>/usr/lib/qt4/bin/qmake</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>autoconf</GenericName>
             <
PackageName>autoconf</PackageName>
-            <
FileCheck>/usr/bin/autoconf</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libtool</GenericName>
             <
PackageName>libtool</PackageName>
-            <
FileCheck>/usr/bin/libtool</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>ncurses-development</GenericName>
             <
PackageName>libncurses5-devel</PackageName>
-            <
FileCheck>/usr/include/ncurses.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>popt</GenericName>
             <
PackageName>popt-devel</PackageName>
-            <
FileCheck>/usr/include/popt.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>numa-development</GenericName>
             <
PackageName>libnuma-devel</PackageName>
-            <
FileCheck>/usr/include/numa.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>curl</GenericName>
             <
PackageName>curl</PackageName>
-            <
FileCheck>/usr/bin/curl</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>fftw3-development</GenericName>
             <
PackageName>fftw3-devel</PackageName>
-            <
FileCheck>/usr/include/fftw3.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>blas-development</GenericName>
             <
PackageName>blas</PackageName>
-            <
FileCheck>/usr/include/cblas.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>lapack-development</GenericName>
             <
PackageName>lapack</PackageName>
-            <
FileCheck>/usr/lib/liblapack.so</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>cmake</GenericName>
             <
PackageName>cmake</PackageName>
-            <
FileCheck>/usr/bin/cmake</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>boost-development</GenericName>
             <
PackageName>boost-devel</PackageName>
-            <
FileCheck>/usr/include/boost/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>bzip2-development</GenericName>
             <
PackageName>libbz2-devel</PackageName>
-            <
FileCheck>/usr/include/bzlib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>tcl</GenericName>
             <
PackageName>tcl</PackageName>
-            <
FileCheck>/usr/bin/tclsh</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glibc-development</GenericName>
             <
PackageName>glibc-devel glibc-devel-32bit</PackageName>
-            <
FileCheck>/usr/include/gnu/stubs-32.h, /usr/lib/libc.a</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>python</GenericName>
             <
PackageName>python</PackageName>
-            <
FileCheck>/usr/bin/python</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>atlas-development</GenericName>
             <
PackageName>libatlas3-devel</PackageName>
-            <
FileCheck>/usr/lib/libatlas.a</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openmpi-development</GenericName>
             <
PackageName>openmpi</PackageName>
-            <
FileCheck>/usr/lib/openmpi/lib/libmpi.so, /usr/bin/mpirun.openmpi</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>yasm</GenericName>
             <
PackageName>yasm</PackageName>
-            <
FileCheck>/usr/bin/yasm</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>lib3ds</GenericName>
             <
PackageName>lib3ds-devel</PackageName>
-            <
FileCheck>/usr/include/lib3ds/atmosphere.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>gmp-library</GenericName>
             <
PackageName>libgmp3</PackageName>
-            <
FileCheck>/usr/include/gmp.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>32bit-compatibility</GenericName>
@@ -
261,17 +214,14 @@
         <
Package>
             <
GenericName>subversion</GenericName>
             <
PackageName>subversion</PackageName>
-            <
FileCheck>/usr/bin/svn</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>git</GenericName>
             <
PackageName>git-core</PackageName>
-            <
FileCheck>/usr/bin/git</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>superlu</GenericName>
             <
PackageName>superlu</PackageName>
-            <
FileCheck>/usr/include/superlu</FileCheck>
         </
Package>
     </
ExternalDependencies>
 </
PhoronixTestSuite>
diff --git a/pts-core/external-test-dependencies/xml/ubuntu-packages.xml b/pts-core/external-test-dependencies/xml/ubuntu-packages.xml
index 95ea128
..7ad82a3 100644
--- a/pts-core/external-test-dependencies/xml/ubuntu-packages.xml
+++ b/pts-core/external-test-dependencies/xml/ubuntu-packages.xml
@@ -21,32 +21,26 @@
         <
Package>
             <
GenericName>gtk-development</GenericName>
             <
PackageName>libgtk2.0-dev</PackageName>
-            <
FileCheck>gtk-2.0/gtk/gtk.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>sdl-development</GenericName>
             <
PackageName>libsdl1.2-dev libsdl-gfx1.2-dev libsdl-net1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libsdl-mixer1.2-dev</PackageName>
-            <
FileCheck>SDL/SDL.hSDL/SDL_gfxPrimitives.hSDL/SDL_net.hSDL/SDL_image.hSDL/SDL_ttf.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glut</GenericName>
             <
PackageName>freeglut3-dev</PackageName>
-            <
FileCheck>GL/glut.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>csh</GenericName>
             <
PackageName>csh</PackageName>
-            <
FileCheck>/bin/bsd-csh</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libpng-development</GenericName>
             <
PackageName>libpng12-dev</PackageName>
-            <
FileCheck>libpng12/png.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openssl-development</GenericName>
             <
PackageName>libssl-dev</PackageName>
-            <
FileCheck>openssl/sha.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>build-utilities</GenericName>
@@ -
61,62 +55,50 @@
         <
Package>
             <
GenericName>xorg-development</GenericName>
             <
PackageName>xorg-dev</PackageName>
-            <
FileCheck>xorg/xf86.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>bison</GenericName>
             <
PackageName>bison</PackageName>
-            <
FileCheck>bison</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>flex</GenericName>
             <
PackageName>flex</PackageName>
-            <
FileCheck>flex</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>imlib2-development</GenericName>
             <
PackageName>libimlib2-dev</PackageName>
-            <
FileCheck>libImlib2.so</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>java</GenericName>
             <
PackageName>openjdk-6-jre</PackageName>
-            <
FileCheck>java</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>portaudio-development</GenericName>
             <
PackageName>libportaudio-dev</PackageName>
-            <
FileCheck>portaudio.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>fortran-compiler</GenericName>
             <
PackageName>gfortran</PackageName>
-            <
FileCheck>gfortran</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glew</GenericName>
             <
PackageName>libglew1.5-dev</PackageName>
-            <
FileCheck>GL/glew.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>lib3ds</GenericName>
             <
PackageName>lib3ds-dev</PackageName>
-            <
FileCheck>lib3ds/atmosphere.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>freeimage</GenericName>
             <
PackageName>libfreeimage3 libfreeimage-dev</PackageName>
-            <
FileCheck>libfreeimage.so.3FreeImage.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>scons</GenericName>
             <
PackageName>scons</PackageName>
-            <
FileCheck>scons</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>zlib-development</GenericName>
             <
PackageName>zlib1g-dev</PackageName>
-            <
FileCheck>zlib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>jpeg-development</GenericName>
@@ -
126,+108,@@
         <
Package>
             <
GenericName>libaio-development</GenericName>
             <
PackageName>libaio-dev</PackageName>
-            <
FileCheck>libaio.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>perl</GenericName>
@@ -
141,32 +122,26 @@
         <
Package>
             <
GenericName>xorg-video</GenericName>
             <
PackageName>libxv-dev libxvmc-dev</PackageName>
-            <
FileCheck>X11/extensions/Xvlib.hX11/extensions/XvMClib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libstdcpp5</GenericName>
             <
PackageName>libstdc++5</PackageName>
-            <
FileCheck>libstdc++.so.5 OR /usr/lib32/libstdc++.so.5 OR /usr/lib/x86_64-linux-gnu/libstdc++.so.5</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openal-development</GenericName>
             <
PackageName>libopenal-dev</PackageName>
-            <
FileCheck>AL/al.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>vorbis-development</GenericName>
             <
PackageName>libvorbis-dev</PackageName>
-            <
FileCheck>vorbis/vorbisfile.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>jam</GenericName>
             <
PackageName>jam</PackageName>
-            <
FileCheck>jam.perforce</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>p7zip</GenericName>
             <
PackageName>p7zip-full</PackageName>
-            <
FileCheck>7za</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>qt4-development</GenericName>
@@ -
176,62 +151,50 @@
         <
Package>
             <
GenericName>autoconf</GenericName>
             <
PackageName>autoconf</PackageName>
-            <
FileCheck>autoconf</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libtool</GenericName>
             <
PackageName>libtool</PackageName>
-            <
FileCheck>libtool</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>ncurses-development</GenericName>
             <
PackageName>libncurses5-dev</PackageName>
-            <
FileCheck>ncurses.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>popt</GenericName>
             <
PackageName>libpopt-dev</PackageName>
-            <
FileCheck>popt.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>numa-development</GenericName>
             <
PackageName>libnuma-dev</PackageName>
-            <
FileCheck>numa.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>curl</GenericName>
             <
PackageName>libcurl3 curl</PackageName>
-            <
FileCheck>curl</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>fftw3-development</GenericName>
             <
PackageName>libfftw3-dev fftw-dev</PackageName>
-            <
FileCheck>fftw3.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>blas-development</GenericName>
             <
PackageName>libblas-dev</PackageName>
-            <
FileCheck>cblas.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>lapack-development</GenericName>
             <
PackageName>liblapack-dev</PackageName>
-            <
FileCheck>liblapack.so</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>atlas-development</GenericName>
             <
PackageName>libatlas-base-dev</PackageName>
-            <
FileCheck>libatlas.a</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openmpi-development</GenericName>
             <
PackageName>libopenmpi-dev openmpi-bin libmpich2-dev libmpich1.0-dev</PackageName>
-            <
FileCheck>openmpi/lib/libmpi.sompirun.openmpi</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>cmake</GenericName>
             <
PackageName>cmake</PackageName>
-            <
FileCheck>cmake</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>boost-development</GenericName>
@@ -
241,17 +204,14 @@
         <
Package>
             <
GenericName>bzip2-development</GenericName>
             <
PackageName>libbz2-dev</PackageName>
-            <
FileCheck>bzlib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>tcl</GenericName>
             <
PackageName>tcl</PackageName>
-            <
FileCheck>tclsh</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glibc-development</GenericName>
             <
PackageName>libc6-dev</PackageName>
-            <
FileCheck>gnu/stubs-32.h OR gnu-versions.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>glibc-development</GenericName>
@@ -
262,17 +222,14 @@
         <
Package>
             <
GenericName>python</GenericName>
             <
PackageName>python</PackageName>
-            <
FileCheck>python</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>python-boost-development</GenericName>
             <
PackageName>libboost-python-dev</PackageName>
-            <
FileCheck>boost/python.hpp</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>boost-thread-development</GenericName>
             <
PackageName>libboost-thread-dev</PackageName>
-            <
FileCheck>boost/thread.hpp</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>python-numpy</GenericName>
@@ -
281,28 +238,22 @@
         </
Package>
         <
Package>
             <
GenericName>yasm</GenericName>
-            <
PackageName>yasm</PackageName>
-            <
FileCheck>yasm</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>gmp-library</GenericName>
             <
PackageName>libgmp3-dev</PackageName>
-            <
FileCheck>gmp.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>subversion</GenericName>
             <
PackageName>subversion</PackageName>
-            <
FileCheck>svn</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>git</GenericName>
             <
PackageName>git-core</PackageName>
-            <
FileCheck>git</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>superlu</GenericName>
             <
PackageName>libsuperlu3-dev</PackageName>
-            <
FileCheck>superlu/slu_util.h</FileCheck>
         </
Package>
     </
ExternalDependencies>
 </
PhoronixTestSuite>
<
 
Phoronix.com
Linux Driver Forums
Copyright © 2014 by Phoronix Media