Merge pull request #383 from johnhaddon/travisTesting

Travis testing

Author: andrewkaufman

.travis.yml

@@ -0,0 +1,21 @@
+language: cpp
+
+os:
+    - linux
+
+before_install:
+    - sudo apt-get update -qq
+    - sudo apt-get install -qq libboost-all-dev
+    - sudo apt-get install -qq libopenexr-dev
+    - sudo apt-get install -qq libtbb-dev
+    - sudo apt-get install -qq libfreetype6-dev
+
+script:
+    - scons testCore testCorePython CXX=$CXX ENV_VARS_TO_IMPORT="PATH TRAVIS" RMAN_ROOT=$DELIGHT BOOST_LIB_SUFFIX=""
+
+compiler:
+    ## \todo Enable clang here too. We can't with the default Ubuntu boost
+    # install though, because it is broken for Clang :
+    #
+    # https://svn.boost.org/trac/boost/ticket/6156
+    - gcc

SConstruct

@@ -123,13 +123,13 @@ o.Add(
 o.Add(
 	"BOOST_INCLUDE_PATH",
 	"The path to the boost include directory.",
-	"/usr/local/include/boost-1_34_1",
+	"/usr/include",
 )
 
 o.Add(
 	"BOOST_LIB_PATH",
 	"The path to the boost library directory.",
-	"/usr/local/lib",
+	"/usr/lib",
 )
 
 o.Add(
@@ -145,13 +145,13 @@ o.Add(
 o.Add(
 	"OPENEXR_INCLUDE_PATH",
 	"The path to the OpenEXR include directory.",
-	"/usr/local/include/OpenEXR",
+	"/usr/include/OpenEXR",
 )
 
 o.Add(
 	"OPENEXR_LIB_PATH",
 	"The path to the OpenEXR lib directory.",
-	"/usr/local/lib",
+	"/usr/lib",
 )
 
 o.Add(
@@ -227,7 +227,7 @@ o.Add(
 o.Add(
 	"FREETYPE_INCLUDE_PATH",
 	"The path to the FreeType include directory.",
-	"/usr/local/include/freetype2",
+	"/usr/include/freetype2",
 )
 
 o.Add(

test/IECore/AssociatedLegendreTest.cpp renamed to contrib/removedInCortex9/sphericalHarmonics/test/IECore/AssociatedLegendreTest.cpp

@@ -421,8 +421,8 @@ def testProblemTDL( self ) :
 
 		# 3delight has started using the SMinSampleValue and SMaxSampleValue tags to store
 		# the range of values in a tdl file. this is jolly useful for shader writers but a pain
-		# for anyone using libtiff to read the images. libtiff currently doesn't support the
-		# storage of different values per sample, and therefore complains when given
+		# for anyone using libtiff to read the images. not all libtiff versions support the
+		# storage of different values per sample, and therefore libtiff may complain when given
 		# one of these files. we deal with this by pretending nothing has happened and allowing
 		# all directories except the last one to be read (it's only the last one that has the
 		# problem).
@@ -435,13 +435,17 @@ def testProblemTDL( self ) :
 			( 16, 8 ),
 			( 8, 4 ),
 			( 4, 2 ),
-			# there should be a ( 2, 1 ) as well, but the best we can do is
-			# ignore it.
+			( 2, 1 ), # this is the one that could cause a problem
 		]
 
-		self.assertEqual( r.numDirectories(), len( expectedResolutions ) )
+		self.assertTrue(
+			# good libtiff version
+			r.numDirectories() == len( expectedResolutions ) or
+			# bad libtiff version
+			r.numDirectories() == len( expectedResolutions ) - 1
+		)
 
-		for i in range( 0, len( expectedResolutions ) ) :
+		for i in range( 0, r.numDirectories() ) :
 			r.setDirectory( i )
 			image = r.read()
 			size = image.dataWindow.size()