Merge pull request #594 from LegalizeAdulthood/travis

Fail Travis when tests fail

.editorconfig

@@ -15,3 +15,8 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 indent_size = 4
 indent_style = space
+
+[*.txt]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true

.travis.sh

@@ -0,0 +1,16 @@
+function generate()
+{
+    cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT -DBUILD_SHARED_LIBS=$SHARED_BUILD
+}
+
+if [ $ANDROID ]; then 
+    ant -v -Dmy.dir=${TRAVIS_BUILD_DIR} -f ${TRAVIS_BUILD_DIR}/port/jassimp/build.xml ndk-jni
+else
+    generate \
+    && make \
+    && sudo make install \
+    && sudo ldconfig \
+    && (cd test/unit; ../../bin/unit) \
+    && (cd test/regression; chmod 755 run.py; ./run.py; \
+	chmod 755 result_checker.py; ./result_checker.py)
+fi

.travis.yml

@@ -28,18 +28,4 @@ install:
   - if [ $ANDROID ]; then wget -c http://dl.google.com/android/ndk/android-ndk-${PV}-${PLATF}.tar.bz2 && tar xf android-ndk-${PV}-${PLATF}.tar.bz2 ; fi
 
 script:
-  - if [ $ANDROID ]; then 
+  - . ./.travis.sh
-    ant -v -Dmy.dir=${TRAVIS_BUILD_DIR} -f ${TRAVIS_BUILD_DIR}/port/jassimp/build.xml ndk-jni ;
-    else
-    cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT -DBUILD_SHARED_LIBS=$SHARED_BUILD ;
-    make ;
-    sudo make install ;
-    sudo ldconfig ;
-    cd test/unit ;
-    ../../bin/unit ;
-    cd ../regression ;
-    chmod 755 run.py ;
-    ./run.py ;
-    chmod 755 result_checker.py ;
-    ./result_checker.py;
-    fi

test/CMakeLists.txt

@@ -54,6 +54,8 @@ add_executable( unit
   ${TEST_SRCS}
 )
 
+add_definitions(-DASSIMP_TEST_MODELS_DIR="${CMAKE_CURRENT_LIST_DIR}/models")
+
 SET_PROPERTY( TARGET assimp PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX} )
 
 add_dependencies( unit gtest )

test/regression/README.txt

@@ -62,7 +62,7 @@ number of false positives is relatively low.
 ---------------------------------------------------------------------------------
 Get back to <root>/test/results and look at regression_suite_failures.txt.
 It contains a list of all files which failed the test. Failing dumps are copied to
-root>/test/results/tmp. Both an EXPECTED and an ACTUAL file is produced per test.
+<root>/test/results/tmp. Both an EXPECTED and an ACTUAL file is produced per test.
 The output of "assimp cmpdump" is written to regressions_suite_output.txt. Grep
 for the file name in question and locate the log for the failed comparison. It
 contains a full trace of which scene elements have been compared before, which

test/unit/utColladaExportCamera.cpp

@@ -43,7 +43,7 @@ TEST_F(ColladaExportCamera, testExportCamera)
 {
     const char* file = "cameraExp.dae";
 
-    const aiScene* pTest = im->ReadFile("../test/models/Collada/cameras.dae",0);
+    const aiScene* pTest = im->ReadFile(ASSIMP_TEST_MODELS_DIR "/Collada/cameras.dae",0);
     ASSERT_TRUE(pTest!=NULL);
     ASSERT_TRUE(pTest->HasCameras());
 

test/unit/utColladaExportLight.cpp

@@ -43,7 +43,7 @@ TEST_F(ColladaExportLight, testExportLight)
 {
     const char* file = "cameraExp.dae";
 
-    const aiScene* pTest = im->ReadFile("../test/models/Collada/lights.dae",0);
+    const aiScene* pTest = im->ReadFile(ASSIMP_TEST_MODELS_DIR "/Collada/lights.dae",0);
     ASSERT_TRUE(pTest!=NULL);
     ASSERT_TRUE(pTest->HasLights());
 

test/unit/utExport.cpp

@@ -14,7 +14,7 @@ public:
         ex = new Assimp::Exporter();
         im = new Assimp::Importer();
 
-        pTest = im->ReadFile("../../test/models/X/test.x",0);
+        pTest = im->ReadFile(ASSIMP_TEST_MODELS_DIR "/X/test.x",0);
     }
 
     virtual void TearDown()

test/unit/utImporter.cpp

@@ -219,13 +219,13 @@ TEST_F(ImporterTest, testMultipleReads)
         aiProcess_OptimizeMeshes |
         aiProcess_OptimizeGraph;
 
-    EXPECT_TRUE(pImp->ReadFile("../test/models/X/test.x",flags));
+    EXPECT_TRUE(pImp->ReadFile(ASSIMP_TEST_MODELS_DIR "/X/test.x",flags));
-    //EXPECT_TRUE(pImp->ReadFile("../../test/models/X/dwarf.x",flags)); # is in nonbsd
+    //EXPECT_TRUE(pImp->ReadFile(ASSIMP_TEST_MODELS_DIR "/X/dwarf.x",flags)); # is in nonbsd
-    EXPECT_TRUE(pImp->ReadFile("../test/models/X/Testwuson.X",flags));
+    EXPECT_TRUE(pImp->ReadFile(ASSIMP_TEST_MODELS_DIR "/X/Testwuson.X",flags));
-    EXPECT_TRUE(pImp->ReadFile("../test/models/X/anim_test.x",flags));
+    EXPECT_TRUE(pImp->ReadFile(ASSIMP_TEST_MODELS_DIR "/X/anim_test.x",flags));
-    //EXPECT_TRUE(pImp->ReadFile("../../test/models/X/dwarf.x",flags)); # is in nonbsd
+    //EXPECT_TRUE(pImp->ReadFile(ASSIMP_TEST_MODELS_DIR "/X/dwarf.x",flags)); # is in nonbsd
 
-    EXPECT_TRUE(pImp->ReadFile("../test/models/X/anim_test.x",flags));
+    EXPECT_TRUE(pImp->ReadFile(ASSIMP_TEST_MODELS_DIR "/X/anim_test.x",flags));
-    EXPECT_TRUE(pImp->ReadFile("../test/models/X/BCN_Epileptic.X",flags));
+    EXPECT_TRUE(pImp->ReadFile(ASSIMP_TEST_MODELS_DIR "/X/BCN_Epileptic.X",flags));
-    //EXPECT_TRUE(pImp->ReadFile("../../test/models/X/dwarf.x",flags)); # is in nonbsd
+    //EXPECT_TRUE(pImp->ReadFile(ASSIMP_TEST_MODELS_DIR "/X/dwarf.x",flags)); # is in nonbsd
 }