Tests: recurse into directories for finding OpenGL draw test .blends.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 28 Sep 2018 12:09:42 +0000 (14:09 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 28 Sep 2018 12:09:42 +0000 (14:09 +0200)
tests/python/CMakeLists.txt
tests/python/modules/render_report.py

index 0a6e2e4..b5cc39a 100644 (file)
@@ -575,7 +575,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
index 6c71e8d..ebfc589 100755 (executable)
@@ -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):