From f4557c05d78267db8b18ee35ac8c9f36d42c30ed Mon Sep 17 00:00:00 2001 From: DRC Date: Mon, 19 Feb 2024 10:40:52 -0500 Subject: [PATCH] servertest: OpenCL interposer test tweaks - Don't run OpenCL interposer tests unless VGL_DISPLAY is unset or points to a 3D X server. - Allow OpenCL interposer tests to be disabled explicitly. --- server/servertest.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/server/servertest.in b/server/servertest.in index 2ccb03f6..fd0f49b3 100644 --- a/server/servertest.in +++ b/server/servertest.in @@ -27,6 +27,9 @@ onexit() BIN=@CMAKE_RUNTIME_OUTPUT_DIRECTORY@ LIB=@CMAKE_LIBRARY_OUTPUT_DIRECTORY@ FAKEOPENCL=@VGL_FAKEOPENCL@ +if [[ ${VGL_DISPLAY:-"x"} != "x" && ! $VGL_DISPLAY =~ ":" ]]; then + FAKEOPENCL=0 +fi NODL= FAKERUTARGS= @@ -46,6 +49,10 @@ while [ $# -gt 0 ]; do echo "Testing without dlopen() interposer" NODL=-nodl ;; + -noopencl) + echo "Testing without OpenCL interposer" + FAKEOPENCL=0 + ;; -novgltrans) echo "Testing without VGL Transport" VGLTRANS=0