diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-28 16:03:03 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-28 16:03:03 +0300 |
| commit | d2d0b4fcd7f0fdb42cfbbbc6b708a6748b4d474f (patch) | |
| tree | 1691015bf462cf0ca67142fd4b52a7380b3a05c9 /tests | |
| parent | 3341d42ad5669edde09025043be9a221f7ee789b (diff) | |
| parent | de3ee3c6e842692a32182f3349bc1c76cde14683 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/python/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | tests/python/modules/render_report.py | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index d5ba68b9b93..9faedf93d62 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -583,7 +583,7 @@ if(WITH_OPENGL_DRAW_TESTS) file(GLOB children RELATIVE ${TEST_SRC_DIR} ${TEST_SRC_DIR}/*) foreach(child ${children}) if(IS_DIRECTORY ${TEST_SRC_DIR}/${child}) - file(GLOB blends ${TEST_SRC_DIR}/${child}/*.blend) + file(GLOB_RECURSE blends "${TEST_SRC_DIR}/${child}/*.blend") if(blends) add_python_test( opengl_draw_${child}_test diff --git a/tests/python/modules/render_report.py b/tests/python/modules/render_report.py index 1f0022f13b6..8deed25e854 100755 --- a/tests/python/modules/render_report.py +++ b/tests/python/modules/render_report.py @@ -51,10 +51,11 @@ def print_message(message, type=None, status=''): def blend_list(dirpath): - for filename in os.listdir(dirpath): - if filename.lower().endswith(".blend"): - filepath = os.path.join(dirpath, filename) - yield filepath + for root, dirs, files in os.walk(dirpath): + for filename in files: + if filename.lower().endswith(".blend"): + filepath = os.path.join(root, filename) + yield filepath def test_get_name(filepath): |