From ac8c6d18ca3dc6d43304bd29da8a4e86b76b415d Mon Sep 17 00:00:00 2001
From: muhammad-ammar <mammar@gmail.com>
Date: Fri, 31 Oct 2014 07:48:56 +0000
Subject: [PATCH] Correct script exit status TE-567

---
 scripts/run_unit_tests.sh | 44 +++++++++++++++++++++++++++++++++++++++
 scripts/run_ut.sh         | 21 -------------------
 tddium.yml                |  2 +-
 3 files changed, 45 insertions(+), 22 deletions(-)
 create mode 100755 scripts/run_unit_tests.sh
 delete mode 100755 scripts/run_ut.sh

diff --git a/scripts/run_unit_tests.sh b/scripts/run_unit_tests.sh
new file mode 100755
index 0000000000..dce6b3d4c9
--- /dev/null
+++ b/scripts/run_unit_tests.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+EXIT=0
+
+store_exit_code() {
+    code=$?
+    if [ ${code} -ne 0 ]
+    then
+        EXIT=${code}
+    fi
+}
+
+
+echo 'Configuring jscover...'
+mkdir -p jscover-dist && wget http://files.edx.org/testeng/JSCover-1.0.2.zip -P jscover-dist && unzip jscover-dist/JSCover-1.0.2.zip -d jscover-dist/ && cp jscover-dist/target/dist/JSCover-all.jar jscover-dist && export JSCOVER_JAR=$PWD/jscover-dist/JSCover-all.jar
+store_exit_code
+echo 'jscover configured'
+
+paver test
+store_exit_code
+
+echo 'Collecting Coverage...'
+paver coverage
+store_exit_code
+echo 'Coverage Collection Completed'
+
+
+current_path=`pwd`
+reports_path=${current_path}/reports
+dest_path=${HOME}/results/${TDDIUM_SESSION_ID}/session/
+unit_combined_rpt=${reports_path}/diff_coverage_combined.html
+
+echo 'Copying '${unit_combined_rpt}' to '${dest_path}
+cp -f ${unit_combined_rpt} ${dest_path}
+store_exit_code
+echo 'Copied '${unit_combined_rpt}
+
+echo 'Merging unit coverage reports...'
+python ./scripts/cov_merge.py unit && python ./scripts/metrics/publish.py
+store_exit_code
+echo 'Unit coverage reports merged'
+
+exit ${EXIT}
+
diff --git a/scripts/run_ut.sh b/scripts/run_ut.sh
deleted file mode 100755
index fddacc9f65..0000000000
--- a/scripts/run_ut.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-mkdir -p jscover-dist && wget http://files.edx.org/testeng/JSCover-1.0.2.zip -P jscover-dist && unzip jscover-dist/JSCover-1.0.2.zip -d jscover-dist/ && cp jscover-dist/target/dist/JSCover-all.jar jscover-dist && export JSCOVER_JAR=$PWD/jscover-dist/JSCover-all.jar && paver test
-
-echo '******************************************************'
-
-echo 'Collecting Coverage...'
-
-paver coverage
-
-echo 'Coverage Collection Completed'
-
-
-current_path=`pwd`
-reports_path=$current_path/reports
-dest_path=$HOME/results/$TDDIUM_SESSION_ID/session/
-unit_combined_rpt=$reports_path/diff_coverage_combined.html
-
-echo 'Copying '$unit_combined_rpt' to '$dest_path
-
-cp -f $unit_combined_rpt $dest_path
-
-echo '******************************************************'
diff --git a/tddium.yml b/tddium.yml
index dfb77a8a84..1ca5e5f2e4 100644
--- a/tddium.yml
+++ b/tddium.yml
@@ -36,7 +36,7 @@ tddium:
       - "reports/diff_quality/diff_quality_pylint.html"
     - :type: junit
       :mode: basic
-      :command: bash ./scripts/run_ut.sh && python ./scripts/cov_merge.py unit && python ./scripts/metrics/publish.py
+      :command: bash ./scripts/run_unit_tests.sh
       :invocation: single
       :output: exit-status
       :report_files: