mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-16 19:33:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into neilalexander/v3v4

Browse source
This commit is contained in:
Neil Alexander 2020-04-01 14:23:55 +01:00
parent 31d0d9cd42 2c8950221e
commit 0af6f5bbd4
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
show-expected-fail-tests.sh
View file

@ -60,7 +60,7 @@ while read -r test_name; do
# Ignore empty lines # Ignore empty lines
[ "${test_name}" = "" ] && continue [ "${test_name}" = "" ] && continue
grep "${test_name}" "${whitelist_file}" > /dev/null 2>&1 grep "^${test_name}" "${whitelist_file}" > /dev/null 2>&1
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then
# Check if this test name is blacklisted # Check if this test name is blacklisted
if printf '%s\n' "${blacklisted_tests[@]}" | grep -q -P "^${test_name}$"; then if printf '%s\n' "${blacklisted_tests[@]}" | grep -q -P "^${test_name}$"; then
@ -80,8 +80,8 @@ done <<< "${passed_but_expected_fail}"
# TODO: Check that the same test doesn't appear twice in the whitelist|blacklist # TODO: Check that the same test doesn't appear twice in the whitelist|blacklist
# Trim test output strings # Trim test output strings
tests_to_add=$(echo -e $tests_to_add | xargs) tests_to_add=$(echo -e $tests_to_add | xargs -d '\n')
already_in_whitelist=$(echo -e $already_in_whitelist | xargs) already_in_whitelist=$(echo -e $already_in_whitelist | xargs -d '\n')
# Format output with markdown for buildkite annotation rendering purposes # Format output with markdown for buildkite annotation rendering purposes
if [ -n "${tests_to_add}" ] && [ -n "${already_in_whitelist}" ]; then if [ -n "${tests_to_add}" ] && [ -n "${already_in_whitelist}" ]; then