third_party
/
virglrenderer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ci: Use a variable for ignore_tests.txt path

Browse Source 
Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>
Signed-off-by: Jakob Bornecrantz <jakob@collabora.com>
Signed-off-by: Robert Foss <robert.foss@collabora.com>
macos/master
Robert Foss 6 years ago committed by Jakob Bornecrantz
parent e76002d07e
commit a5547fb7c8
1 changed files with 4 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      ci/run_test_suite.sh

7
ci/run_test_suite.sh
Unescape View File

@ -122,7 +122,7 @@ compare_previous()
# which enables us to ignore tests by driver # which enables us to ignore tests by driver
# BUT: We're not able to get the driver name and # BUT: We're not able to get the driver name and
# use it to disambiguate between HW-based drivers # use it to disambiguate between HW-based drivers
IGNORE_TESTS=$(cat $PREVIOUS_RESULTS_DIR/ignore_tests.txt 2>/dev/null) IGNORE_TESTS=$(cat $IGNORE_TESTS_FILE 2>/dev/null)
# Avoid introducing changes while doing this comparison # Avoid introducing changes while doing this comparison
TMP_RESULTS=$(mktemp /tmp/virgl_ci_results.XXXXXX) TMP_RESULTS=$(mktemp /tmp/virgl_ci_results.XXXXXX)
@ -237,7 +237,7 @@ run_test_suite()
PIGLIT_TESTS=" -x glx" PIGLIT_TESTS=" -x glx"
if [ $VERIFY_UNRELIABLE_TESTS -eq 1 ]; then if [ $VERIFY_UNRELIABLE_TESTS -eq 1 ]; then
UNRELIABLE_TESTS=$(cat $PREVIOUS_RESULTS_DIR/ignore_tests.txt 2>/dev/null) UNRELIABLE_TESTS=$(cat $IGNORE_TESTS_FILE 2>/dev/null)
if [[ -z $UNRELIABLE_TESTS ]]; then if [[ -z $UNRELIABLE_TESTS ]]; then
echo "Ignore - No unreliable tests found" echo "Ignore - No unreliable tests found"
return 0 return 0
@ -267,7 +267,7 @@ run_test_suite()
elif [ "$TEST_APP" = "deqp" ]; then elif [ "$TEST_APP" = "deqp" ]; then
if [ $VERIFY_UNRELIABLE_TESTS -eq 1 ]; then if [ $VERIFY_UNRELIABLE_TESTS -eq 1 ]; then
TEST_FILE="$PREVIOUS_RESULTS_DIR/ignore_tests.txt" TEST_FILE="$IGNORE_TESTS_FILE"
if [ ! -f $TEST_FILE ]; then if [ ! -f $TEST_FILE ]; then
echo "Ignore - No unreliable tests found" echo "Ignore - No unreliable tests found"
return 0 return 0
@ -323,6 +323,7 @@ create_result_dir()
TEST_PATH=${HOST_GL}_host${HOST_DRIVER}/${TEST_APP}_${TEST_NAME} TEST_PATH=${HOST_GL}_host${HOST_DRIVER}/${TEST_APP}_${TEST_NAME}
RESULTS_DIR=$VIRGL_PATH/results/${TEST_PATH} RESULTS_DIR=$VIRGL_PATH/results/${TEST_PATH}
PREVIOUS_RESULTS_DIR=$VIRGL_PATH/ci/previous_results/${TEST_PATH} PREVIOUS_RESULTS_DIR=$VIRGL_PATH/ci/previous_results/${TEST_PATH}
IGNORE_TESTS_FILE=$PREVIOUS_RESULTS_DIR/ignore_tests.txt
mkdir -p "$RESULTS_DIR" mkdir -p "$RESULTS_DIR"

Write Preview
Loading…
Cancel
Save