From fe7ed2bdf135817e7550f1c08ca6cb393c74932e Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Fri, 1 May 2020 17:41:02 +0100 Subject: [PATCH] Fix newline at end --- show-expected-fail-tests.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/show-expected-fail-tests.sh b/show-expected-fail-tests.sh index baa4435e0..4a3f85c49 100755 --- a/show-expected-fail-tests.sh +++ b/show-expected-fail-tests.sh @@ -80,8 +80,8 @@ done <<< "${passed_but_expected_fail}" # TODO: Check that the same test doesn't appear twice in the whitelist|blacklist # Trim test output strings -tests_to_add=$(IFS=$'\n' echo "${tests_to_add[*]}") -already_in_whitelist=$(IFS=$'\n' echo "${already_in_whitelist[*]}") +tests_to_add=$(IFS=$'\n' echo "${tests_to_add[*]%%'\n'}") +already_in_whitelist=$(IFS=$'\n' echo "${already_in_whitelist[*]%%'\n'}") # Format output with markdown for buildkite annotation rendering purposes if [ -n "${tests_to_add}" ] && [ -n "${already_in_whitelist}" ]; then @@ -91,14 +91,14 @@ fi if [ -n "${tests_to_add}" ]; then echo "**ERROR**: The following tests passed but are not present in \`$2\`. Please append them to the file:" echo "\`\`\`" - echo -e "${tests_to_add}" + echo -e "${tests_to_add}" echo "\`\`\`" fi if [ -n "${already_in_whitelist}" ]; then echo "**WARN**: Tests in the whitelist still marked as **expected fail**:" echo "\`\`\`" - echo -e "${already_in_whitelist}" + echo -e "${already_in_whitelist}" echo "\`\`\`" fi