Removed unneeded sed from test-runner

jgebal · jgebal · commit 69b577caa464 · 2018-11-24T19:54:05.000Z
Changed `sed -r` to `sed -E` Resolves #796
diff --git a/.travis/get_project_build_version.sh b/.travis/get_project_build_version.sh
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-echo `sed -r "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/" <<< "${UTPLSQL_VERSION}"`
+echo `sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/" <<< "${UTPLSQL_VERSION}"`
diff --git a/.travis/get_project_version.sh b/.travis/get_project_version.sh
@@ -8,7 +8,7 @@ else
   version=`cat VERSION`
   #When on develop branch, add "-develop" to the version text
   if [[ "${CURRENT_BRANCH}" == "develop" ]]; then
-    version=`sed -r "s/(v?[0-9]+\.[0-9]+\.[0-9]+).*/\1-develop/" <<< "${version}"`
+    version=`sed -E "s/(v?[0-9]+\.[0-9]+\.[0-9]+).*/\1-develop/" <<< "${version}"`
   fi
 fi
 echo ${version}
diff --git a/test/install_and_run_tests.sh b/test/install_and_run_tests.sh
@@ -16,14 +16,6 @@ time utPLSQL-cli/bin/utplsql run ${UT3_USER}/${UT3_USER_PASSWORD}@${CONNECTION_S
 -f=ut_documentation_reporter  -o=min_test_results.log -s \
 -scc
 
-status_line_regex="^[0-9]+ tests, ([0-9]+) failed, ([0-9]+) errored.*"
-
-RC=$(cat min_test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/")
-
-if [ "$RC" == "1" ]; then
-   exit 1
-fi
-
 cd test
 
 time "$SQLCLI" ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@//${CONNECTION_STR} @install_tests.sql
@@ -44,10 +36,6 @@ time utPLSQL-cli/bin/utplsql run ${UT3_TESTER}/${UT3_TESTER_PASSWORD}@${CONNECTI
 
 status_line_regex="^[0-9]+ tests, ([0-9]+) failed, ([0-9]+) errored.*"
 
-#cat coverage.xml
-#cat test_results.xml
-
-RC=$(cat test_results.log | grep -E "${status_line_regex}" | sed -re "s/${status_line_regex}/\1\2/")
 
 exit $RC
 

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#!/usr/bin/env bash`
`2`		-echo `sed -r "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/" <<< "${UTPLSQL_VERSION}"`
	`2`	+echo `sed -E "s/(v?[0-9]+\.)([0-9]+\.)([0-9]+)(-.*)?/\1\2\3\.${UTPLSQL_BUILD_NO}\4/" <<< "${UTPLSQL_VERSION}"`