ci: kill off custom --test

Unused and fairly convoluted for little reason. In practise we want a
full run when changes are made - fixing one test can easily regress
another.

Furthermore, this only works with deqp and does not throw a error when
attempted with piglit.

If needed we can reinstate this, it should handle both deqp and piglit.

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Signed-off-by: Elie Tournier <elie.tournier@collabora.com>
macos/master
Emil Velikov 6 years ago committed by Elie Tournier
parent adfed4c8c7
commit 62d05f2d30
  1. 21
      ci/run_test_suite.sh

@ -1,7 +1,5 @@
#!/bin/bash #!/bin/bash
trap "{ rm -f $TMP_TEST_FILE; }" EXIT
# Setup paths and import util functions # Setup paths and import util functions
. $(dirname $(readlink -f "$0"))/util.sh . $(dirname $(readlink -f "$0"))/util.sh
@ -34,16 +32,6 @@ parse_input()
BACKENDS="$BACKENDS gpu" BACKENDS="$BACKENDS gpu"
;; ;;
-t|--test)
TEST_NAME="$2"
shift
if [ -z "$TMP_TEST_FILE" ]; then
TMP_TEST_FILE=$(mktemp /tmp/deqp_test.XXXXXX)
TESTS="$TESTS custom"
fi
echo "$TEST_NAME" >> "$TMP_TEST_FILE"
;;
-v|--vtest) -v|--vtest)
BACKENDS="" BACKENDS=""
BACKENDS="$BACKENDS vtest-softpipe" BACKENDS="$BACKENDS vtest-softpipe"
@ -368,11 +356,6 @@ run_test_on_backends()
unset LIBGL_ALWAYS_SOFTWARE unset LIBGL_ALWAYS_SOFTWARE
unset VTEST_USE_EGL_SURFACELESS unset VTEST_USE_EGL_SURFACELESS
# If the custom test is being run, we're probably debugging
if [ "$TEST_NAME" = "custom" ]; then
export MESA_DEBUG=1
fi
case $BACKEND in case $BACKEND in
vtest-softpipe|softpipe) vtest-softpipe|softpipe)
export LIBGL_ALWAYS_SOFTWARE=1 export LIBGL_ALWAYS_SOFTWARE=1
@ -439,10 +422,6 @@ run_all_tests()
for TEST in $TESTS; do for TEST in $TESTS; do
case $TEST in case $TEST in
custom)
TEST_NAME="custom"
TEST_FILE="$TMP_TEST_FILE"
;;
gles2) gles2)
TEST_NAME="gles2" TEST_NAME="gles2"
TEST_FILE="$CTS_PATH/android/cts/master/gles2-master.txt" TEST_FILE="$CTS_PATH/android/cts/master/gles2-master.txt"

Loading…
Cancel
Save