@@ -96,9 +96,13 @@ macro(add_qml_test SUBPATH COMPONENT_NAME)
97 ${function_ARGS}
97 ${function_ARGS}
99+ find_program( HAVE_GCC gcc )
100+ if (NOT ${HAVE_GCC} STREQUAL "")
99− exec_program( gcc ARGS "-dumpmachine" OUTPUT_VARIABLE ARCH_TRIPLET )
101+ exec_program( gcc ARGS "-dumpmachine" OUTPUT_VARIABLE ARCH_TRIPLET )
102+ set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
100 set(qmltest_xvfb_command
104 set(qmltest_xvfb_command
101− env ${qmltest_ENVIRONMENT} LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1
105+ env ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH}
102 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
106 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
103 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
107 ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
104 ${qmltestrunner_imports}
108 ${qmltestrunner_imports}
@@ -122,9 +126,13 @@ macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)
122 add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)
126 add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)
123 add_dependencies(test${CLASS_NAME} ${CLASS_NAME}TestExec ${DEPS})
127 add_dependencies(test${CLASS_NAME} ${CLASS_NAME}TestExec ${DEPS})
129+ find_program( HAVE_GCC gcc )
130+ if (NOT ${HAVE_GCC} STREQUAL "")
125− exec_program( gcc ARGS "-dumpmachine" OUTPUT_VARIABLE ARCH_TRIPLET )
131+ exec_program( gcc ARGS "-dumpmachine" OUTPUT_VARIABLE ARCH_TRIPLET )
132+ set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
126 set(xvfbtestCommand
134 set(xvfbtestCommand
127− LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1
135+ ${LD_PRELOAD_PATH}
128 LD_LIBRARY_PATH=${LD_PATH}
136 LD_LIBRARY_PATH=${LD_PATH}
129 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
137 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
130 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
138 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec