diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-04-16 10:59:52 +0300 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-04-16 10:59:52 +0300 |
| commit | 6ef5b422fce9deb1278b7092890ebe5e10227eae (patch) | |
| tree | 0e10e96838b3576130e7ccdad2cd462adb3afb3e /tests | |
| parent | bfb633087b60f28ece96d93becee0141e964c015 (diff) | |
| parent | 2720667566d73c52a3cc293d057d297ac775c74d (diff) | |
Merge remote-tracking branch 'origin' into blender2.8
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/python/collada/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/python/collada/CMakeLists.txt b/tests/python/collada/CMakeLists.txt index 421e4ba7667..4307eec3791 100644 --- a/tests/python/collada/CMakeLists.txt +++ b/tests/python/collada/CMakeLists.txt @@ -62,5 +62,7 @@ macro (COLLADA_TEST module test_name blend_file) ) endmacro() -COLLADA_TEST(mesh simple mesh_simple.blend) -COLLADA_TEST(animation simple suzannes_parent_inverse.blend) +# Tests are disabled because they only work on Windows +# Tests will be redone completely to work reliable +#COLLADA_TEST(mesh simple mesh_simple.blend) +#COLLADA_TEST(animation simple suzannes_parent_inverse.blend) |