From 5a2a042ec728caeb876a2f2162432455338a41c5 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 16 May 2023 14:53:19 +0200 Subject: [PATCH] ci: stop using the hang-detection tool for vkd3d-proton It's no longer used for deqp-runner as well, and it's not really useful for us because we can detect GPU hangs differently. It also prevents returning the error code from vkd3d-proton. Signed-off-by: Samuel Pitoiset Part-of: --- .gitlab-ci/vkd3d-proton/run.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci/vkd3d-proton/run.sh b/.gitlab-ci/vkd3d-proton/run.sh index 61ffd2a..8ef00f7 100755 --- a/.gitlab-ci/vkd3d-proton/run.sh +++ b/.gitlab-ci/vkd3d-proton/run.sh @@ -46,8 +46,6 @@ quiet() { SANITY_MESA_VERSION_CMD="vulkaninfo | tee /tmp/version.txt | grep \"Mesa $MESA_VERSION\(\s\|$\)\"" -HANG_DETECTION_CMD="/parallel-deqp-runner/build/bin/hang-detection" - RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $SANITY_MESA_VERSION_CMD" set +e @@ -67,7 +65,7 @@ fi VKD3D_PROTON_TESTSUITE_CMD="/vkd3d-proton-tests/x64/bin/d3d12 >$RESULTS/vkd3d-proton.log" quiet printf "%s\n" "Running vkd3d-proton testsuite..." -RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $HANG_DETECTION_CMD $VKD3D_PROTON_TESTSUITE_CMD" +RUN_CMD="export LD_LIBRARY_PATH=$__LD_LIBRARY_PATH; $VKD3D_PROTON_TESTSUITE_CMD" set +e eval $RUN_CMD -- 2.7.4