From d5216bde253d7ad0110efcfe6d9cb03b9e1890d9 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 14 May 2019 10:38:21 +0100 Subject: [PATCH] ci: use --test-list when running piglit Instead of manually looping over the file, pass the file to the runner. Signed-off-by: Emil Velikov Reviewed-by: Elie Tournier --- ci/run_test_suite.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/ci/run_test_suite.sh b/ci/run_test_suite.sh index f5a9f84..cf4fe17 100755 --- a/ci/run_test_suite.sh +++ b/ci/run_test_suite.sh @@ -246,18 +246,17 @@ run_test_suite() PIGLIT_TESTS=" -x glx" if [ $VERIFY_UNRELIABLE_TESTS -eq 1 ]; then - UNRELIABLE_TESTS=$(cat $IGNORE_TESTS_FILE 2>/dev/null) - - for UNRELIABLE_TEST in $UNRELIABLE_TESTS; do - PIGLIT_TESTS="$PIGLIT_TESTS -t $UNRELIABLE_TEST" - done + # XXX: Fold the glx exception? + PIGLIT_TESTS_CMD="--test-list $TEST_FILE" else - PIGLIT_TESTS="$PIGLIT_TESTS -t $TEST_NAME" + # TODO: create test_file for normal runs + PIGLIT_TESTS_CMD="$PIGLIT_TESTS -t $TEST_NAME" + fi piglit run --platform x11_egl \ -l verbose \ - $PIGLIT_TESTS \ + $PIGLIT_TESTS_CMD \ gpu \ /tmp/ &> $LOG_FILE