diff --git a/.travis.yml b/.travis.yml index c39af3a4e..9c6422058 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ before_install: - - sudo apt-get install cmake + - sudo apt-get install cmake python3 env: - TRAVIS_NO_EXPORT=YES @@ -16,6 +16,14 @@ 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 + - sudo ldconfig - cd test/unit - ../../bin/unit + - 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 diff --git a/test/regression/run.py b/test/regression/run.py index caa3a6bd0..6d776b362 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 @@ -258,6 +262,5 @@ def run_test(): # ------------------------------------------------------------------------------- if __name__ == "__main__": run_test() - input("Press any key to continue ...") # vim: ai ts=4 sts=4 et sw=4 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