Merge topic 'mesa-tests'

cabaad1c

 paraview: test the mesa binary

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !572

tests/paraview.test.cmake

@@ -2,6 +2,7 @@ set(paraview_extract_dir "${CMAKE_CURRENT_BINARY_DIR}/paraview/test-extraction")
 if (WIN32)
   set(generator "ZIP")
   set(paraview_exe "${paraview_extract_dir}/bin/paraview.exe")
+  set(paraview_mesa_exe "${paraview_extract_dir}/bin/paraview-mesa.exe")
   set(pvpython_exe "${paraview_extract_dir}/bin/pvpython.exe")
   set(pvserver_exe "${paraview_extract_dir}/bin/pvserver.exe")
   set(pvbatch_exe  "${paraview_extract_dir}/bin/pvbatch.exe")
@@ -9,12 +10,14 @@ elseif (APPLE)
   set(generator "DragNDrop")
   include(paraview-appname)
   set(paraview_exe "${paraview_extract_dir}/${paraview_appname}/Contents/MacOS/paraview")
+  set(paraview_mesa_exe "${paraview_extract_dir}/${paraview_appname}/Contents/bin/paraview-mesa")
   set(pvpython_exe "${paraview_extract_dir}/${paraview_appname}/Contents/bin/pvpython")
   set(pvserver_exe "${paraview_extract_dir}/${paraview_appname}/Contents/bin/pvserver")
   set(pvbatch_exe  "${paraview_extract_dir}/${paraview_appname}/Contents/bin/pvbatch")
 else ()
   set(generator "TGZ")
   set(paraview_exe "${paraview_extract_dir}/bin/paraview")
+  set(paraview_mesa_exe "${paraview_extract_dir}/bin/paraview-mesa")
   set(pvpython_exe "${paraview_extract_dir}/bin/pvpython")
   set(pvserver_exe "${paraview_extract_dir}/bin/pvserver")
   set(pvbatch_exe  "${paraview_extract_dir}/bin/pvbatch")
@@ -45,6 +48,10 @@ if (NOT mpi_enabled)
   set(pvbatch_exe)
 endif ()
 
+if (NOT mesa_enabled)
+  set(paraview_mesa_exe)
+endif ()
+
 function (paraview_add_test name exe)
   if (NOT exe)
     return ()
@@ -159,20 +166,24 @@ if (mesa_enabled AND python_enabled)
   set(mesa_llvm_arg)
   set(mesa_swr_arg)
   if (PARAVIEW_DEFAULT_SYSTEM_GL)
-    set(mesa_llvm_arg "--mesa-llvm")
-    set(mesa_swr_arg "--mesa-swr")
+    set(mesa_llvm_arg --backend llvmpipe)
+    set(mesa_swr_arg --backend swr)
   endif ()
 
-  paraview_add_test("mesa-llvm" "${pvpython_exe}"
+  paraview_add_test("mesa-llvm" "${paraview_mesa_exe}"
     ${mesa_llvm_arg}
+    pvpython
+    --
     "${CMAKE_CURRENT_LIST_DIR}/python/CheckOpenGLVersion.py"
     "mesa" "llvmpipe")
   if (mesa_USE_SWR)
     # Either don't add or add but explicitly disable this test for now
     # until the underlying VTK segfault is fixed.
     if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.9)
-      paraview_add_test("mesa-swr" "${pvpython_exe}"
+      paraview_add_test("mesa-swr" "${paraview_mesa_exe}"
         ${mesa_swr_arg}
+        pvpython
+        --
         "${CMAKE_CURRENT_LIST_DIR}/python/CheckOpenGLVersion.py"
         "mesa" "swr")
       # Mesa exits with failure.