From 48b138d57597def0265c78cc37db67f0ac38187f Mon Sep 17 00:00:00 2001 From: acgessler Date: Thu, 4 Sep 2014 22:42:00 -0700 Subject: [PATCH 1/8] Add cmake install to travis build. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e0c0788ae..efdf0b2cc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,7 @@ compiler: 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 - cd test/unit - ../../bin/unit From 9e24acb18702fb3945cea694db9f8f71096b1f5a Mon Sep 17 00:00:00 2001 From: acgessler Date: Thu, 4 Sep 2014 22:42:51 -0700 Subject: [PATCH 2/8] Try running regression tests from travis --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index efdf0b2cc..517db52b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,4 +19,7 @@ script: - sudo make install - cd test/unit - ../../bin/unit + - cd ../regression + - chmod 755 run.py + - ./run.py From 19a50b9a9e7627b181a4a8a071f4c2ec62b8f70d Mon Sep 17 00:00:00 2001 From: Alexander Gessler Date: Thu, 4 Sep 2014 22:56:08 -0700 Subject: [PATCH 3/8] 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 4/8] 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 5/8] 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 From 5a0c7058b547510e515c113c95a7eee113fa0741 Mon Sep 17 00:00:00 2001 From: acgessler Date: Fri, 5 Sep 2014 21:20:07 -0700 Subject: [PATCH 6/8] regression tests: ignore pond.0.ply file due to overly long runtime. --- test/regression/run.py | 4 ++++ test/regression/settings.py | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/test/regression/run.py b/test/regression/run.py index caa3a6bd0..5d17f9f48 100644 --- a/test/regression/run.py +++ b/test/regression/run.py @@ -160,6 +160,10 @@ def process_dir(d, outfile_results, zipin, result): process_dir(fullpath, outfile_results, zipin, result) continue + if f in settings.files_to_ignore: + print("Ignoring " + f) + continue + for pppreset in settings.pp_configs_to_test: filehash = utils.hashing(fullpath, pppreset) failure = False diff --git a/test/regression/settings.py b/test/regression/settings.py index 4f81cc66e..b8cd28683 100644 --- a/test/regression/settings.py +++ b/test/regression/settings.py @@ -47,6 +47,14 @@ test scripts rely on this) import os +# ------------------------------------------------------------------------------- +# Files to ignore (with reason) +# +# pond.0.ply - loads with 40k identical triangles, causing postprocessing +# to have quadratic runtime. +# ------------------------------------------------------------------------------- +files_to_ignore = ["pond.0.ply"] + # ------------------------------------------------------------------------------- # List of file extensions to be excluded from the regression suite # File extensions are case insensitive From 1249171bba0aa4cb2f78e38f99fcd63bb5b668e6 Mon Sep 17 00:00:00 2001 From: Alexander Gessler Date: Fri, 5 Sep 2014 23:56:49 -0700 Subject: [PATCH 7/8] Regression tests: output list of failures in Travis terminal output --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8a4974ae8..a2b4423ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,4 +23,7 @@ script: - cd ../regression - chmod 755 run.py - ./run.py + - echo ========================================================== + - echo REGRESSION TEST FAILS (results/run_regression_suite_failures.csv) + - cat ../results/run_regression_suite_failures.csv From 460566197bb03e9ac042e2c850c3f44bf5896d11 Mon Sep 17 00:00:00 2001 From: Alexander Gessler Date: Sat, 6 Sep 2014 00:14:50 -0700 Subject: [PATCH 8/8] Travis: fix echo failing --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a2b4423ae..aa1c9d56b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ script: - cd ../regression - chmod 755 run.py - ./run.py - - echo ========================================================== - - echo REGRESSION TEST FAILS (results/run_regression_suite_failures.csv) + - echo "==========================================================" + - echo "REGRESSION TEST FAILS (results/run_regression_suite_failures.csv)" - cat ../results/run_regression_suite_failures.csv