mirror of
https://github.com/hoernschen/dendrite.git
synced 2024-12-27 07:28:27 +00:00
Fix: show-expected-fail-tests.sh ignores # in whitelist and strips quotes in test names in output (#943)
Signed-off-by: Alex Chen <minecnly@gmail.com>
This commit is contained in:
parent
8fbe9f4078
commit
2c8950221e
1 changed files with 3 additions and 3 deletions
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue