From 1ca91683e22de3f5915081957ab829642e785ffe Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Thu, 2 Apr 2020 22:38:34 +0300 Subject: [PATCH] gitlab-ci: protect usage of shell variables with double quotes Not really needed right now, but seems dangerous to have paths without the double quote. I went ahead and used in the rest of values too. Signed-off-by: Andres Gomez Reviewed-by: Alexandros Frantzis Reviewed-by: Rohan Garg Part-of: --- .gitlab-ci/tracie-runner-gl.sh | 8 ++++---- .gitlab-ci/tracie-runner-vk.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/tracie-runner-gl.sh b/.gitlab-ci/tracie-runner-gl.sh index a12ce6bff39..1c329c9cbe0 100755 --- a/.gitlab-ci/tracie-runner-gl.sh +++ b/.gitlab-ci/tracie-runner-gl.sh @@ -15,12 +15,12 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/renderdoc/build/lib" export LD_LIBRARY_PATH="/waffle/build/lib:$LD_LIBRARY_PATH" # Set environment for apitrace executable. -export PATH=/apitrace/build:$PATH +export PATH="/apitrace/build:$PATH" # Use the surfaceless EGL platform. -export EGL_PLATFORM=surfaceless +export EGL_PLATFORM="surfaceless" export DISPLAY= -export WAFFLE_PLATFORM=surfaceless_egl +export WAFFLE_PLATFORM="surfaceless_egl" # Perform a self-test to ensure tracie is working properly. "$INSTALL/tracie/tests/test.sh" @@ -30,4 +30,4 @@ export WAFFLE_PLATFORM=surfaceless_egl MESA_VERSION=$(cat "$INSTALL/VERSION" | sed 's/\./\\./g') wflinfo --platform surfaceless_egl --api gles2 | grep "Mesa $MESA_VERSION\(\s\|$\)" -python3 $INSTALL/tracie/tracie.py --file $INSTALL/traces.yml --device-name $DEVICE_NAME +python3 "$INSTALL/tracie/tracie.py" --file "$INSTALL/traces.yml" --device-name "$DEVICE_NAME" diff --git a/.gitlab-ci/tracie-runner-vk.sh b/.gitlab-ci/tracie-runner-vk.sh index f234f57a283..a3e13f6c1b4 100755 --- a/.gitlab-ci/tracie-runner-vk.sh +++ b/.gitlab-ci/tracie-runner-vk.sh @@ -34,4 +34,4 @@ vulkaninfo | grep "Mesa $MESA_VERSION\(\s\|$\)" # file: # https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-runners-section PATH="/gfxreconstruct/build/bin:$PATH" \ - python3 $INSTALL/tracie/tracie.py --file $INSTALL/traces.yml --device-name $DEVICE_NAME + python3 "$INSTALL/tracie/tracie.py" --file "$INSTALL/traces.yml" --device-name "$DEVICE_NAME" -- 2.30.2