Updated test script to capture failed tests and return non-zero exit code.

jgebal · jgebal · commit d34c9a69c501 · 2017-08-03T00:55:55.000+01:00
Fixed sonar properties.
Moved new tests to the end of the build process.
diff --git a/.travis.yml b/.travis.yml
@@ -85,10 +85,10 @@ before_script:
 script:
   - if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/install.sh; fi
   - if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/install_utplsql_release.sh; fi
-  - if [ "${TRAVIS_TAG}" = "" ]; then bash test/install_and_run_tests.sh; fi
   - if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/create_additional_grants_for_old_tests.sh; fi
   - if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/run_examples.sh; fi
   - if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/run_old_tests.sh; fi
+  - if [ "${TRAVIS_TAG}" = "" ]; then bash test/install_and_run_tests.sh; fi
   - if [ "${TRAVIS_TAG}" = "" ] && [ "${TRAVIS_REPO_SLUG}" = "${UTPLSQL_REPO}" ]; then sonar-scanner; fi
   - if [ "${TRAVIS_TAG}" = "" ]; then bash .travis/coveralls_uploader.sh; fi
   - bash .travis/build_docs.sh
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -9,9 +9,9 @@ sonar.projectVersion=v3.0.2
 # If not set, SonarQube starts looking for source code from the directory containing
 # the sonar-project.properties file.
 sonar.sources=./source
-sonar.coverageReportPaths=./tests/coverage.xml,coverage.xml
+sonar.coverageReportPaths=./test/coverage.xml,coverage.xml
 sonar.tests=./test
-sonar.testExecutionReportPaths=test_results.xml
+sonar.testExecutionReportPaths=./test/test_results.xml
 sonar.links.issue=https://github.com/utPLSQL/utPLSQL/issues
 sonar.links.ci=https://travis-ci.org/utPLSQL/utPLSQL
 sonar.links.homepage=https://github.com/utPLSQL/utPLSQL
diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh
@@ -1,14 +1,20 @@
 #!/bin/bash
 set -ev
 
-cd test
+#cd test
+#
+#"$SQLCLI" ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@//${CONNECTION_STR} @install_tests.sql
+#
+#cd ..
+#
+#utPLSQL-cli/bin/utplsql run ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@${CONNECTION_STR} \
+#-source_path=source -test_path=tests \
+#-f=ut_documentation_reporter  -c -o=test_results.log -s \
+#-f=ut_coverage_sonar_reporter -o=coverage.xml \
+#-f=ut_sonar_test_reporter     -o=test_results.xml
 
-"$SQLCLI" ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@//${CONNECTION_STR} @install_tests.sql
+status_line_regex="^[0-9]+ tests, ([0-9]+) failed, ([0-9]+) errored.*"
 
-cd ..
+RC=$(cat test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/")
 
-utPLSQL-cli/bin/utplsql run ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@${CONNECTION_STR} \
--source_path=source -test_path=tests \
--f=ut_documentation_reporter  -c \
--f=ut_coverage_sonar_reporter -o=coverage.xml \
--f=ut_sonar_test_reporter     -o=test_results.xml
+exit $RC
