ci: Run GLES test suites in different docker processes

The GLES test suites have a rather long run time, so split the runs
for the differeent GLES versions.

Signed-off-by: Gert Wollny <gert.wollny@collabora.com>-ne
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>.
macos/master
Gert Wollny 5 years ago
parent af7069aab4
commit 27fac2e8ac
  1. 29
      ci/.gitlab-ci.yml
  2. 36
      ci/run_tests.sh

@ -123,17 +123,38 @@ cts gl - gl host:
TEST_SUITE: '--deqp-gl-gl-tests' TEST_SUITE: '--deqp-gl-gl-tests'
extends: .tests extends: .tests
cts gles - gl host: cts gles2 - gl host:
variables: variables:
TEST_SUITE: '--deqp-gl-gles-tests' TEST_SUITE: '--deqp-gl-gles2-tests'
extends: .tests extends: .tests
cts gles3 - gl host:
variables:
TEST_SUITE: '--deqp-gl-gles3-tests'
extends: .tests
cts gles31 - gl host:
variables:
TEST_SUITE: '--deqp-gl-gles31-tests'
extends: .tests
cts gl - gles host: cts gl - gles host:
variables: variables:
TEST_SUITE: '--deqp-gles-gl-tests' TEST_SUITE: '--deqp-gles-gl-tests'
extends: .tests extends: .tests
cts gles - gles host: cts gles2 - gles host:
variables:
TEST_SUITE: '--deqp-gles-gles2-tests'
extends: .tests
cts gles3 - gles host:
variables:
TEST_SUITE: '--deqp-gles-gles3-tests'
extends: .tests
cts gles31 - gles host:
variables: variables:
TEST_SUITE: '--deqp-gles-gles-tests' TEST_SUITE: '--deqp-gles-gles31-tests'
extends: .tests extends: .tests

@ -78,6 +78,18 @@ run_deqp()
TEST_SUITE="--gles2 --gles3 --gles31" TEST_SUITE="--gles2 --gles3 --gles31"
fi fi
if [ "$SUITE" = "gles2" ]; then
TEST_SUITE="--gles2"
fi
if [ "$SUITE" = "gles3" ]; then
TEST_SUITE="--gles3"
fi
if [ "$SUITE" = "gles31" ]; then
TEST_SUITE="--gles31"
fi
BACKENDS="" BACKENDS=""
if [[ -z "$HARDWARE_ONLY" ]]; then if [[ -z "$HARDWARE_ONLY" ]]; then
BACKENDS="${BACKENDS} --backend vtest-softpipe" BACKENDS="${BACKENDS} --backend vtest-softpipe"
@ -133,6 +145,18 @@ parse_input()
run_deqp gl gles run_deqp gl gles
;; ;;
--deqp-gl-gles2-tests)
run_deqp gl gles2
;;
--deqp-gl-gles3-tests)
run_deqp gl gles3
;;
--deqp-gl-gles31-tests)
run_deqp gl gles31
;;
--deqp-gles-gl-tests) --deqp-gles-gl-tests)
run_deqp gles gl run_deqp gles gl
;; ;;
@ -141,6 +165,18 @@ parse_input()
run_deqp gles gles run_deqp gles gles
;; ;;
--deqp-gles-gles2-tests)
run_deqp gles gles2
;;
--deqp-gles-gles3-tests)
run_deqp gles gles3
;;
--deqp-gles-gles31-tests)
run_deqp gles gles31
;;
--piglit-gl) --piglit-gl)
run_piglit gl run_piglit gl
;; ;;

Loading…
Cancel
Save