1f349/dendrite
4
0
Fork 0
mirror of https://github.com/1f349/dendrite.git synced 2024-11-22 11:41:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: show-expected-fail-tests.sh ignores # in whitelist and strips quotes in test names in output (#943)

Browse Source 
Signed-off-by: Alex Chen <minecnly@gmail.com>
This commit is contained in:
Alex Chen 2020-03-31 22:53:09 +08:00 committed by GitHub
parent 8fbe9f4078
commit 2c8950221e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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