Integrated sh tests into build.sh

Author: anurse

.gitignore

@@ -1,6 +1,7 @@
 # Things related to tests
 .pester/
 testwork/
+.urchin*
 
 # Ignore the folder created when pushing to Home - It should be cleaned up by the task, but sometimes isn't.
 .pushkvm/

makefile.shade

@@ -30,5 +30,8 @@ default KVM_DEPLOY_BRANCH="${Environment.GetEnvironmentVariable("KVM_DEPLOY_BRAN
 #run-ps1-tests target='test' if='!IsLinux'
 	exec program='powershell' commandline='-ExecutionPolicy RemoteSigned -NoProfile -NoLogo -Command & "${Path.Combine(TEST_DIR, "ps1", "Run-Tests.ps1")} ${IsTeamCity?"-TeamCity":""}'
 
+#run-sh-tests target='test' if='IsLinux'
+    exec program='${Path.Combine(TEST_DIR, "sh", "run-tests") ${IsTeamCity?"-t ":""}-v'
+
 #push-kvm-ps1 target='deploy' if='!String.IsNullOrEmpty(KVM_DEPLOY_REPO) && !String.IsNullOrEmpty(KVM_DEPLOY_BRANCH)'
 	push-kvm repo="${KVM_DEPLOY_REPO}" branch="${KVM_DEPLOY_BRANCH}" files="kvm.cmd;kvm.ps1" baseMessage=":arrow_up: kvm.ps1, kvm.cmd"

test/sh/run-tests

@@ -21,6 +21,35 @@ requires node
 requires npm
 requires curl
 
+USAGE="usage: $0 [<options>] <test directory>"
+
+runtests_help() {
+	cat <<EOF
+
+$USAGE
+
+-t 			Writes TeamCity status messages to the output.
+-v          Write stdout for tests that succeed.
+-h          This help.
+
+EOF
+}
+
+# Read arguments
+while [ $# -gt 0 ]
+do
+    case "$1" in
+        -t) TEAMCITY=1;;
+		-v) VERBOSE=1;;
+        -h|--help) runtests_help
+          exit 0;;
+        -*) runtests_help >&2
+            exit 1;;
+        *)  break;;
+    esac
+    shift
+done
+
 verbose "Running in $SCRIPT_DIR"
 
 # Set up a test environment

test/sh/tests/.urchin.log

@@ -101,10 +101,6 @@ recurse() {
     fi
     exit_code="$?"
 
-    # Write out teamcity status right away to get the most accurate timing possible
-    [ $exit_code -ne 0 ] && teamcity "testFailed name='$TEST_NAME'"
-    teamcity "testFinished name='$TEST_NAME'"
-    
     run_setup_teardown "teardown" "$stdout_file"
 
     indent $indent_level
@@ -123,7 +119,10 @@ recurse() {
       printf '\033[31m' # Print output captured from failed test in red.
       cat "$stdout_file"
       printf '\033[0m'
+      teamcity "testFailed name='$TEST_NAME'"
     fi
+
+    teamcity "testFinished name='$TEST_NAME'"
   fi