From 19a50b9a9e7627b181a4a8a071f4c2ec62b8f70d Mon Sep 17 00:00:00 2001 From: Alexander Gessler Date: Thu, 4 Sep 2014 22:56:08 -0700 Subject: [PATCH 1/3] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 517db52b9..772cb51ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ before_install: - - sudo apt-get install cmake libcppunit-dev + - sudo apt-get install cmake libcppunit-dev python3 env: - TRAVIS_NO_EXPORT=YES From 11dc89d4551ff111d31773a79f1a6da0fbff601b Mon Sep 17 00:00:00 2001 From: Alexander Gessler Date: Thu, 4 Sep 2014 23:06:47 -0700 Subject: [PATCH 2/3] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 772cb51ae..8a4974ae8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ script: - cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT -STATIC_BUILD=$TRAVIS_STATIC_BUILD - make - sudo make install + - sudo ldconfig - cd test/unit - ../../bin/unit - cd ../regression From fd84970596fb825d1ee8bf0003827c7ad7d7a01c Mon Sep 17 00:00:00 2001 From: Alexander Gessler Date: Thu, 4 Sep 2014 23:18:20 -0700 Subject: [PATCH 3/3] Regression tests: run.py should not block on user input if used for CI. --- test/regression/run.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/regression/run.py b/test/regression/run.py index caa3a6bd0..9c8ef619a 100644 --- a/test/regression/run.py +++ b/test/regression/run.py @@ -258,6 +258,5 @@ def run_test(): # ------------------------------------------------------------------------------- if __name__ == "__main__": run_test() - input("Press any key to continue ...") # vim: ai ts=4 sts=4 et sw=4