diff options
| author | Tomeu Vizoso <tomeu.vizoso@collabora.com> | 2020-03-24 12:58:30 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-03-26 09:30:48 +0000 |
| commit | 92f3c51560f9eb2387b1d929f694244c0b7bd577 (patch) | |
| tree | 822ba14faa2b9c06594384f23131cdbe141daedb /.gitlab-ci/deqp-runner.sh | |
| parent | b94c277fd1e7e8008ccc37aa2f4dd547ef92688b (diff) | |
| download | mesa-92f3c51560f9eb2387b1d929f694244c0b7bd577.tar.gz | |
gitlab-ci: Place files from the Mesa repo into the build tarball
There's some files from the .gitlab-ci directory that are needed in the
test stage and that, because the Mesa repository isn't checked out in
that stage, need to be made available through other means.
Because those files are going to be needed in LAVA devices, place them
ino the tarball containing the built files so it's available to both
gitlab-ci runners and LAVA devices.
Before those files were passed in the artifacts of the Gitlab CI job,
but this commit places them into the built tarball so scripts later in
the pipeline don't need to account for this discrepancy.
Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4295>
Diffstat (limited to '.gitlab-ci/deqp-runner.sh')
| -rwxr-xr-x | .gitlab-ci/deqp-runner.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index ed95ba53578..1dda8e942d5 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -31,7 +31,7 @@ if [ -z "$DEQP_SKIPS" ]; then exit 1 fi -ARTIFACTS=`pwd`/artifacts +INSTALL=`pwd`/install # Set up the driver environment. export LD_LIBRARY_PATH=`pwd`/install/lib/ @@ -66,7 +66,7 @@ if [ ! -s /tmp/case-list.txt ]; then fi if [ -n "$DEQP_EXPECTED_FAILS" ]; then - XFAIL="--xfail-list $ARTIFACTS/$DEQP_EXPECTED_FAILS" + XFAIL="--xfail-list $INSTALL/$DEQP_EXPECTED_FAILS" fi set +e @@ -83,7 +83,7 @@ run_cts() { --deqp $deqp \ --output $output \ --caselist $caselist \ - --exclude-list $ARTIFACTS/$DEQP_SKIPS \ + --exclude-list $INSTALL/$DEQP_SKIPS \ $XFAIL \ $JOB \ --allow-flakes true \ |