diff options
author | Bruce Forstall <brucefo@microsoft.com> | 2018-03-01 18:10:55 -0800 |
---|---|---|
committer | Bruce Forstall <brucefo@microsoft.com> | 2018-03-01 18:10:55 -0800 |
commit | 1d4796fc072b3ec9c8a80765a9c4dab26fa30281 (patch) | |
tree | 166de46bdfbbbc4105968cf1bfcb3156686fd1f6 /tests | |
parent | 287cff2d0908876b4dedac61d7faa871b5fbe21e (diff) | |
download | coreclr-1d4796fc072b3ec9c8a80765a9c4dab26fa30281.tar.gz coreclr-1d4796fc072b3ec9c8a80765a9c4dab26fa30281.tar.bz2 coreclr-1d4796fc072b3ec9c8a80765a9c4dab26fa30281.zip |
Generalize runtest.sh test exclusion files
Allow leading '#' as a comment character for all testsUnsupported and
testsFailing files.
Generalize testsFailingOnArm64.txt to testsFailing.$ARCH.txt
Generalize testsUnsupportedOnARM32.txt to testsUnsupported.$ARCH.txt
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/runtest.sh | 18 | ||||
-rw-r--r-- | tests/testsFailing.arm64.txt (renamed from tests/testsFailingOnArm64.txt) | 0 | ||||
-rw-r--r-- | tests/testsUnsupported.arm.txt (renamed from tests/testsUnsupportedOnARM32.txt) | 0 |
3 files changed, 10 insertions, 8 deletions
diff --git a/tests/runtest.sh b/tests/runtest.sh index 7e3fd986db..64d12e7d80 100755 --- a/tests/runtest.sh +++ b/tests/runtest.sh @@ -471,10 +471,17 @@ declare -a playlistTests function read_array { local theArray=() + if [ ! -f "$1" ]; then + return + fi + # bash in Mac OS X doesn't support 'readarray', so using alternate way instead. # readarray -t theArray < "$1" + # Any line that starts with '#' is ignored. while IFS='' read -r line || [ -n "$line" ]; do - theArray[${#theArray[@]}]=$line + if [[ $line != "#"* ]]; then + theArray[${#theArray[@]}]=$line + fi done < "$1" echo ${theArray[@]} } @@ -482,18 +489,13 @@ function read_array { function load_unsupported_tests { # Load the list of tests that are not supported on this platform. These tests are disabled (skipped) permanently. unsupportedTests=($(read_array "$(dirname "$0")/testsUnsupportedOutsideWindows.txt")) - if [ "$ARCH" == "arm" ]; then - unsupportedTests+=($(read_array "$(dirname "$0")/testsUnsupportedOnARM32.txt")) - fi + unsupportedTests+=($(read_array "$(dirname "$0")/testsUnsupported.$ARCH.txt")) } function load_failing_tests { # Load the list of tests that fail on this platform. These tests are disabled (skipped) temporarily, pending investigation. failingTests=($(read_array "$(dirname "$0")/testsFailingOutsideWindows.txt")) - - if [ "$ARCH" == "arm64" ]; then - failingTests+=($(read_array "$(dirname "$0")/testsFailingOnArm64.txt")) - fi + failingTests+=($(read_array "$(dirname "$0")/testsFailing.$ARCH.txt")) } function load_playlist_tests { diff --git a/tests/testsFailingOnArm64.txt b/tests/testsFailing.arm64.txt index 3b85ff6b37..3b85ff6b37 100644 --- a/tests/testsFailingOnArm64.txt +++ b/tests/testsFailing.arm64.txt diff --git a/tests/testsUnsupportedOnARM32.txt b/tests/testsUnsupported.arm.txt index c39174ef6b..c39174ef6b 100644 --- a/tests/testsUnsupportedOnARM32.txt +++ b/tests/testsUnsupported.arm.txt |