From de4e56fcf7da52c6e3713ba7dab2216097c8b9d8 Mon Sep 17 00:00:00 2001 From: Cristian Ciocaltea Date: Mon, 3 Jan 2022 01:11:20 +0200 Subject: [PATCH] ci: Create results folder before starting virgl_test_server Move the statement responsible for creating the results output path before 'virgl_test_server' is started in 'piglit-runner.sh' script. This ensures the server log file will be available in the pipeline job artifacts archive. Signed-off-by: Cristian Ciocaltea Reviewed-by: Rohan Garg Reviewed-by: Tomeu Vizoso Part-of: --- .gitlab-ci/piglit/piglit-runner.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/piglit/piglit-runner.sh b/.gitlab-ci/piglit/piglit-runner.sh index 86d83a5747c..e07f2b7882b 100755 --- a/.gitlab-ci/piglit/piglit-runner.sh +++ b/.gitlab-ci/piglit/piglit-runner.sh @@ -14,6 +14,9 @@ export LD_LIBRARY_PATH=`pwd`/install/lib/ export EGL_PLATFORM=surfaceless export VK_ICD_FILENAMES=`pwd`/install/share/vulkan/icd.d/"$VK_DRIVER"_icd.${VK_CPU:-`uname -m`}.json +RESULTS=`pwd`/${PIGLIT_RESULTS_DIR:-results} +mkdir -p $RESULTS + if [ "$GALLIUM_DRIVER" = "virpipe" ]; then # deqp is to use virpipe, and virgl_test_server llvmpipe export GALLIUM_DRIVER="$GALLIUM_DRIVER" @@ -30,9 +33,6 @@ if [ "$GALLIUM_DRIVER" = "virpipe" ]; then sleep 1 fi -RESULTS=`pwd`/${PIGLIT_RESULTS_DIR:-results} -mkdir -p $RESULTS - if [ -n "$PIGLIT_FRACTION" -o -n "$CI_NODE_INDEX" ]; then FRACTION=`expr ${PIGLIT_FRACTION:-1} \* ${CI_NODE_TOTAL:-1}` PIGLIT_RUNNER_OPTIONS="$PIGLIT_RUNNER_OPTIONS --fraction $FRACTION"