From f2e64e375b548dd0cdcfa6d71237471a53b94680 Mon Sep 17 00:00:00 2001 From: Conrad Date: Thu, 16 Jan 2020 12:39:59 +0100 Subject: [PATCH] Added Unit Tests to prep script 2 --- prep.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/prep.sh b/prep.sh index 4b9e307..8d3ab76 100755 --- a/prep.sh +++ b/prep.sh @@ -1,3 +1,5 @@ +QMAKE_PATH = "/Users/$USER/Qt5.14.0/5.14.0/clang_64/bin/qmake" + printLine(){ echo "$2$1 \033[0m" } @@ -39,7 +41,7 @@ runDoxygen(){ runUnitTests(){ printLine "Running Unit Tests..." - qmake src/IntelliUnitTest.pro || { printLine "ERROR: qmake not found!" "\033[0;33m"; return; } + $QMAKE_PATH src/IntelliUnitTest.pro || { printLine "ERROR: qmake not found!" "\033[0;33m"; return; } cd src make || { printLine "ERROR: make not found!" "\033[0;33m"; return; } ./IntelliUnitTest @@ -58,6 +60,7 @@ prepareMerge(){ printLine "Merge Preparation started..." runUncrustify runCPPCheck + runUnitTests runDoxygen gitCommit printLine "Finished." "\033[0;32m" @@ -70,6 +73,7 @@ prepareRelease(){ cleanDir runUncrustify runCPPCheck + runUnitTests runDoxygen gitCommit printLine "Finished." "\033[0;32m"