From 6af3fff0c25b70f966ab9f2b2d3dfba3f633c9a7 Mon Sep 17 00:00:00 2001 From: Matthew Olsson Date: Thu, 2 Jul 2020 18:12:22 -0700 Subject: [PATCH] LibJS: Reformat run-tests.sh output - Use emojis instead of the pass/fail text - Fix the new version of the script to run inside Serenity - Don't print erroneous output after 'Output:'; start on a newline instead - Skip 'run-tests.sh' while testing --- Libraries/LibJS/Tests/run-tests.sh | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Libraries/LibJS/Tests/run-tests.sh b/Libraries/LibJS/Tests/run-tests.sh index 83fa455f29..5a518361ad 100755 --- a/Libraries/LibJS/Tests/run-tests.sh +++ b/Libraries/LibJS/Tests/run-tests.sh @@ -16,25 +16,26 @@ test_count=0 GLOBIGNORE=test-common.js -test_files=$(find . -type f -name "*.js" | cut -c 3- | sort) +# FIXME: Support "find -name" in Serenity to remove the file name checks below +test_files=$(find . -type f | cut -b 3- | sort) for f in $test_files; do - if [ "$f" = "test-common.js" ]; then + if [ "$f" = "test-common.js" ] || [ "$f" = "run-tests.sh" ]; then continue fi (( ++test_count )) done for f in $test_files; do - if [ "$f" = "test-common.js" ]; then + if [ "$f" = "test-common.js" ] || [ "$f" = "run-tests.sh" ]; then continue fi result="$("$js_program" "$@" -t "$f" 2>/dev/null)" if [ "$result" = "PASS" ]; then (( ++pass_count )) - echo -ne "( \033[32;1mPass\033[0m ) " + echo -ne " ✅ " else - echo -ne "( \033[31;1mFail\033[0m ) " + echo -ne " ❌ " (( ++fail_count )) fi echo -ne "\033]9;${count};${test_count}\033\\" @@ -42,15 +43,14 @@ for f in $test_files; do if [ "$result" != "PASS" ]; then if [ -z "$result" ]; then - echo -e " \033[31;1mNo output. Did you forget 'console.log(\"PASS\");'?\033[0m" + echo -e " \033[31;1mNo output. Did you forget 'console.log(\"PASS\");'?\033[0m" else readarray -t split_result <<< "$result"; - echo -ne " \033[31;1mOutput:\033[0m " - echo "${split_result[0]}"; + echo -e " \033[31;1mOutput:\033[0m " - for (( i = 1; i < ${#split_result[@]}; i++ )); do - echo " ${split_result[i]}" + for (( i = 0; i < ${#split_result[@]}; i++ )); do + echo " ${split_result[i]}" done fi fi