[Bf-blender-cvs] [6dd047c3330] master: Tests: recurse into directories for finding OpenGL draw test .blends.

[Brecht Van Lommel]

Commit: 6dd047c333081e45a99119daaf2e9965471e05e2
Author: Brecht Van Lommel
Date:   Fri Sep 28 14:09:42 2018 +0200
Branches: master
https://developer.blender.org/rB6dd047c333081e45a99119daaf2e9965471e05e2

Tests: recurse into directories for finding OpenGL draw test .blends.

===================================================================

M	tests/python/CMakeLists.txt
M	tests/python/modules/render_report.py

===================================================================

diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index 0a6e2e4909c..b5cc39ae37a 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -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
diff --git a/tests/python/modules/render_report.py b/tests/python/modules/render_report.py
index 6c71e8dcb74..ebfc58997c0 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):