From 782d3860eb0134c81d4a4204b7caab72cda3bd1d Mon Sep 17 00:00:00 2001
From: Alex Richardson
Date: Fri, 25 Sep 2020 10:12:56 +0100
Subject: tests: Move copy-pasted code into a shared helper .sh

Also fix a few shellcheck warnings related to printf while doing so.
---
 test/typecheck/run_tests.sh | 38 ++------------------------------------
 1 file changed, 2 insertions(+), 36 deletions(-)

(limited to 'test/typecheck')

diff --git a/test/typecheck/run_tests.sh b/test/typecheck/run_tests.sh
index e0720baf..bfc77899 100755
--- a/test/typecheck/run_tests.sh
+++ b/test/typecheck/run_tests.sh
@@ -4,47 +4,13 @@ set -e
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 SAILDIR="$DIR/../.."
 
-RED='\033[0;91m'
-GREEN='\033[0;92m'
-YELLOW='\033[0;93m'
-NC='\033[0m'
-
 mkdir -p $DIR/rtpass
 mkdir -p $DIR/rtpass2
 
 rm -f $DIR/tests.xml
 
-pass=0
-fail=0
-
-XML=""
-
-function green {
-    (( pass += 1 ))
-    printf "$1: ${GREEN}$2${NC}\n"
-    XML+="    <testcase name=\"$1\"/>\n"
-}
-
-function yellow {
-    (( fail += 1 ))
-    printf "$1: ${YELLOW}$2${NC}\n"
-    XML+="    <testcase name=\"$1\">\n      <error message=\"$2\">$2</error>\n    </testcase>\n"
-}
-
-function red {
-    (( fail += 1 ))
-    printf "$1: ${RED}$2${NC}\n"
-    XML+="    <testcase name=\"$1\">\n      <error message=\"$2\">$2</error>\n    </testcase>\n"
-}
-
-function finish_suite {
-    printf "$1: Passed ${pass} out of $(( pass + fail ))\n\n"
-    XML="  <testsuite name=\"$1\" tests=\"$(( pass + fail ))\" failures=\"${fail}\" timestamp=\"$(date)\">\n$XML  </testsuite>\n"
-    printf "$XML" >> $DIR/tests.xml
-    XML=""
-    pass=0
-    fail=0
-}
+# shellcheck source=../test_helpers.sh
+source "$SAILDIR/test/test_helpers.sh"
 
 printf "<testsuites>\n" >> $DIR/tests.xml
 
-- 
cgit v1.2.3