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

Description: Phoronix Test Suite open-source benchmarking development
Last Change: Tue 9/23/14 11:49

Recent Commits
Time
Signed-Off By
Description
Commit Diff
Tue 9/23/14 11:49
Michael Larabel  
pts-core: Couple small... 
Mon 9/22/14 16:14
Michael Larabel  
pts-core: Missing file... 
Mon 9/22/14 15:24
Michael Larabel  
Bump PTS_CORE_VERSION... 
Mon 9/22/14 15:02
Michael Larabel  
pts-core: Allow Phoronix... 
Mon 9/22/14 13:23
Michael Larabel  
pts-core: Convert to a... 
Mon 9/22/14 10:15
Michael Larabel  
pts-core: Add "failed to... 
 
> --git a/CHANGE-LOG b/CHANGE-LOG
index 1d3f3d1
..0247852 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -6,+6,@@ Phoronix Test Suite (Git)
 - 
pts-coreAllow "Deprecated" flag for ProfileStatus in the XML test profile schema
 
pts-coreSupport for scanning test run log files automatically to look for errors when tests fail to execute
 
pts-coreRemove duplicate "libtool" PTS External Dependency
+- pts-coreComplete rewrite of the FreeBSD external dependency handling to use ports collection
 
phodeviFix to improve Xfce version detection when Gtk-Warnings are thrown before the version string
 
phodeviAdd Enlightenment desktop environment detection support
 
phodeviAdd Consort Desktop Environment (GNOME Forkdetection support
diff 
--git a/pts-core/external-test-dependencies/scripts/install-freebsd-packages.sh b/pts-core/external-test-dependencies/scripts/install-freebsd-packages.sh
index b2a186e
..66d0257 100755
--- a/pts-core/external-test-dependencies/scripts/install-freebsd-packages.sh
+++ b/pts-core/external-test-dependencies/scripts/install-freebsd-packages.sh
@@ -2,+2,16 @@

 
# FreeBSD package installation

-echo "Please enter your root password below:" 1>&2
-su root -"PACKAGESITE=\"ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-7-stable/Latest/\" pkg_add -r $*"
-exit
+
# for now try to set BATCH several ways...
+setenv BATCH 1
+# using config-reursive would be another option...
+
+for 
portdir in $*
+do
+  
cd /usr/ports/$portdir
+  sudo make config-recursive install clean BATCH="yes"
+done
+
+
#echo "Please enter your root password below:" 1>&2
+#su root -c "PACKAGESITE=\"ftp://ftp.freebsd.org/pub/FreeBSD/ports/i386/packages-7-stable/Latest/\" pkg_add -r $*"
+#exit
diff --git a/pts-core/external-test-dependencies/xml/freebsd-packages.xml b/pts-core/external-test-dependencies/xml/freebsd-packages.xml
index 44f70e5
..63d5aca 100644
--- a/pts-core/external-test-dependencies/xml/freebsd-packages.xml
+++ b/pts-core/external-test-dependencies/xml/freebsd-packages.xml
@@ -6,134 +6,239 @@
             <
Name>FreeBSD</Name>
         </
Information>
         <
Package>
-            <
GenericName>32bit-compatibility</GenericName>
-            <
PackageName>linux_base</PackageName>
-            <
FileCheck>/usr/local/bin/bash</FileCheck>
-        </
Package>
-        <
Package>
             <
GenericName>gtk-development</GenericName>
-            <
PackageName>gtk20</PackageName>
+            <
PackageName>x11-toolkits/gtk20</PackageName>
             <
FileCheck>/usr/local/include/gtk-2.0/</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>sdl-development</GenericName>
-            <
PackageName>sdl_gfx sdl_gui sdl_image sdl_mixer sdl_net sdl_ttf</PackageName>
-            <
FileCheck>/usr/local/include/SDL/SDL.h</FileCheck>
+            <
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>freeglut</PackageName>
+            <
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>
+        </
Package>
+        <
Package>
             <
GenericName>libpng-development</GenericName>
-            <
PackageName>libpng12-dev</PackageName>
-            <
FileCheck>/usr/include/libpng12/png.h</FileCheck>
+            <
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>gcc43</PackageName>
-            <
FileCheck>/usr/bin/gcc</FileCheck>
+            <
PackageName>devel/autoconf</PackageName>
+            <
FileCheck>/usr/local/bin/autoconf</FileCheck>
         </
Package>
         <
Package>
-            <
GenericName>xorg-development</GenericName>
-            <
PackageName>linux-xorg-libs xorg-libraries</PackageName>
-            <
FileCheck>/usr/X11R6/lib/X11/</FileCheck>
+            <
GenericName>cairo-development</GenericName>
+            <
PackageName>graphics/cairo</PackageName>
+            <
FileCheck>/usr/local/include/cairo/cairo.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>bison</GenericName>
-            <
PackageName>bison</PackageName>
+            <
PackageName>devel/bison</PackageName>
             <
FileCheck>/usr/local/bin/bison</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>flex</GenericName>
-            <
PackageName>flex</PackageName>
+            <
PackageName>textproc/flex</PackageName>
             <
FileCheck>/usr/local/bin/flex</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>imlib2-development</GenericName>
-            <
PackageName>imlib2</PackageName>
-            <
FileCheck>/usr/local/include/imlib2.h</FileCheck>
+            <
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>portaudio</PackageName>
+            <
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>
+        </
Package>
+        <
Package>
             <
GenericName>glew</GenericName>
-            <
PackageName>glew</PackageName>
+            <
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>freeimage</PackageName>
+            <
PackageName>graphics/freeimage</PackageName>
             <
FileCheck>/usr/local/include/FreeImage.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>scons</GenericName>
-            <
PackageName>scons</PackageName>
+            <
PackageName>devel/scons</PackageName>
             <
FileCheck>/usr/local/bin/scons</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>jpeg-development</GenericName>
-            <
PackageName>libjpeg62-dev</PackageName>
+            <
PackageName>graphics/libjpeg-turbo</PackageName>
             <
FileCheck>/usr/local/include/jpeglib.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>libaio-development</GenericName>
-            <
PackageName>linux-libaio</PackageName>
-            <
FileCheck>/usr/local/lib/libaio.so.1.0.1</FileCheck>
+            <
PackageName>emulators/linux-libaio</PackageName>
+            <
FileCheck>/usr/local/include/libaio.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>perl</GenericName>
-            <
PackageName>perl</PackageName>
-            <
FileCheck>/usr/bin/perl</FileCheck>
-        </
Package>
-        <
Package>
-            <
GenericName>xorg-video</GenericName>
-            <
PackageName>linux-xorg-libs xorg-libraries</PackageName>
-            <
FileCheck>/usr/X11R6/lib/X11/</FileCheck>
+            <
PackageName>lang/perl5.14</PackageName>
+            <
FileCheck>/usr/local/bin/perl</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>openal-development</GenericName>
-            <
PackageName>libopenal-dev</PackageName>
+            <
PackageName>audio/openal</PackageName>
             <
FileCheck>/usr/local/include/AL/al.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>vorbis-development</GenericName>
-            <
PackageName>libvorbis</PackageName>
+            <
PackageName>audio/libvorbis</PackageName>
             <
FileCheck>/usr/local/include/vorbis/vorbisfile.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>jam</GenericName>
-            <
PackageName>jam</PackageName>
+            <
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>qt</PackageName>
-            <
FileCheck>/usr/local/include/qt.h</FileCheck>
+            <
PackageName>x11-toolkits/qt4-gui</PackageName>
+            <
FileCheck>/usr/local/include/qt4/Qt/qgl.h</FileCheck>
         </
Package>
         <
Package>
             <
GenericName>autoconf</GenericName>
-            <
PackageName>autoconf</PackageName>
+            <
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>
+            <
PackageName>devel/atlas</PackageName>
+            <
FileCheck>/usr/local/include/Atlas-C++-0.5</FileCheck>
+        </
Package>
+        <
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>python</PackageName>
+            <
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>yasm</PackageName>
+            <
PackageName>devel/yasm</PackageName>
             <
FileCheck>/usr/local/bin/yasm</FileCheck>
         </
Package>
         <
Package>
-            <
GenericName>lib3ds</GenericName>
-            <
PackageName>lib3ds</PackageName>
-            <
FileCheck>/usr/local/include/lib3ds/atmosphere.h</FileCheck>
+            <
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/objects/phodevi/parsers/phodevi_bsd_parser.php b/pts-core/objects/phodevi/parsers/phodevi_bsd_parser.php
index be41874
..05db8d5 100644
--- a/pts-core/objects/phodevi/parsers/phodevi_bsd_parser.php
+++ b/pts-core/objects/phodevi/parsers/phodevi_bsd_parser.php
@@ -3,+3,@@
 
/*
     Phoronix Test Suite
     URLs: http://www.phoronix.com, http://www.phoronix-test-suite.com/
-    Copyright (C) 2009 - 2012, Phoronix Media
-    Copyright (C) 2009 - 2012, Michael Larabel
+    Copyright (C) 2009 - 2013, Phoronix Media
+    Copyright (C) 2009 - 2013, Michael Larabel
     phodevi_bsd_parser.php: General parsing functions specific to BSD

     This program is free software; you can redistribute it and/or modify
@@ -71,7 +71,7 @@ class phodevi_bsd_parser
     {
         $info = false;

-        if(pts_client::executable_in_path('acpiconf'))
+        if(pts_client::executable_in_path('acpiconf 2> /dev/null'))
         {
             $output = shell_exec('acpic
 
Phoronix.com
Linux Driver Forums
Copyright © 2014 by Phoronix Media