diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index 304b1abe724..18cddc03489 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -145,10 +145,6 @@ if [ "$GALLIUM_DRIVER" = "virpipe" ]; then sleep 1 fi - -RESULTS_CSV=$RESULTS/results.csv -FAILURES_CSV=$RESULTS/failures.csv - export LD_PRELOAD=$TEST_LD_PRELOAD if [ -z "$DEQP_SUITE" ]; then @@ -214,7 +210,7 @@ if [ -n "$FLAKES_CHANNEL" ]; then python3 $INSTALL/report-flakes.py \ --host irc.oftc.net \ --port 6667 \ - --results $RESULTS_CSV \ + --results $RESULTS/results.csv \ --known-flakes $INSTALL/deqp-$GPU_VERSION-flakes.txt \ --channel "$FLAKES_CHANNEL" \ --runner "$CI_RUNNER_DESCRIPTION" \ diff --git a/.gitlab-ci/piglit/piglit-runner.sh b/.gitlab-ci/piglit/piglit-runner.sh index 5c4b88ed0f0..3d12363e831 100755 --- a/.gitlab-ci/piglit/piglit-runner.sh +++ b/.gitlab-ci/piglit/piglit-runner.sh @@ -53,9 +53,6 @@ fi set +e -RESULTS_CSV=$RESULTS/results.csv -FAILURES_CSV=$RESULTS/failures.csv - export LD_PRELOAD=$TEST_LD_PRELOAD piglit-runner \ @@ -86,7 +83,7 @@ if [ -n "$FLAKES_CHANNEL" ]; then python3 $INSTALL/report-flakes.py \ --host irc.oftc.net \ --port 6667 \ - --results $RESULTS_CSV \ + --results $RESULTS/results.csv \ --known-flakes $INSTALL/piglit-$GPU_VERSION-flakes.txt \ --channel "$FLAKES_CHANNEL" \ --runner "$CI_RUNNER_DESCRIPTION" \