[Bf-blender-cvs] [259ebdd0172] master: Fix failing tests when Cycles is enabled

[Brecht Van Lommel]

Commit: 259ebdd017255c6ab8bd456d7f654d589b13872b
Author: Brecht Van Lommel
Date:   Fri May 10 13:29:43 2019 +0200
Branches: master
https://developer.blender.org/rB259ebdd017255c6ab8bd456d7f654d589b13872b

Fix failing tests when Cycles is enabled

The --env-system-scripts hack does not work with it, it can't find the cycles
Python module then when importing add-ons.

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

M	tests/python/CMakeLists.txt

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

diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt
index 076b0d958f1..b7f04a65dcd 100644
--- a/tests/python/CMakeLists.txt
+++ b/tests/python/CMakeLists.txt
@@ -15,8 +15,6 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # ***** END GPL LICENSE BLOCK *****
 
-# --env-system-scripts allows to run without the install target.
-
 # Use '--write-blend=/tmp/test.blend' to view output
 
 # Some tests are interesting but take too long to run
@@ -35,12 +33,10 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${TEST_OUT_DIR})
 #~  endif()
 
 # all calls to blender use this
-if(APPLE)
-  if(${CMAKE_GENERATOR} MATCHES "Xcode")
-    set(TEST_BLENDER_EXE_PARAMS --background -noaudio --factory-startup)
-  else()
-    set(TEST_BLENDER_EXE_PARAMS --background -noaudio --factory-startup --env-system-scripts ${CMAKE_SOURCE_DIR}/release/scripts)
-  endif()
+# --env-system-scripts allows to run without the install target, but does
+# not work for all configurations.
+if(WITH_CYCLES OR (APPLE AND (${CMAKE_GENERATOR} MATCHES "Xcode")))
+  set(TEST_BLENDER_EXE_PARAMS --background -noaudio --factory-startup)
 else()
   set(TEST_BLENDER_EXE_PARAMS --background -noaudio --factory-startup --env-system-scripts ${CMAKE_SOURCE_DIR}/release/scripts)
 endif()