From 41687e7a27729ea047b35075286de69b1147c345 Mon Sep 17 00:00:00 2001 From: David Steele Date: Wed, 23 Aug 2017 19:36:26 +0100 Subject: [PATCH] Added option to test harness execution to only summarize failures Change-Id: I6c235eb492302c5ee9fb4b85f51d50a7c20ac7be --- automated-tests/execute.sh | 13 +++++++++---- .../tct-dali-toolkit-internal-core.cpp | 6 +++--- .../dali-toolkit-styling/tct-dali-toolkit-styling-core.cpp | 6 +++--- .../tct-dali-toolkit-third-party-core.cpp | 6 +++--- automated-tests/src/dali-toolkit/tct-dali-toolkit-core.cpp | 6 +++--- 5 files changed, 21 insertions(+), 16 deletions(-) diff --git a/automated-tests/execute.sh b/automated-tests/execute.sh index 989560f..902ba11 100755 --- a/automated-tests/execute.sh +++ b/automated-tests/execute.sh @@ -1,6 +1,6 @@ #!/bin/bash -TEMP=`getopt -o dhsSm --long debug,help,serial,tct,modules -n 'execute.sh' -- "$@"` +TEMP=`getopt -o dhsSmf --long debug,help,failnorerun,serial,tct,modules -n 'execute.sh' -- "$@"` if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi @@ -11,6 +11,7 @@ function usage { echo -e "Usage: execute.sh [-d][-s|-S|-r] [module|testcase]" echo -e " execute.sh\t\tExecute test cases from all modules in parallel" + echo -e " execute.sh -f \tExecute test cases from all modules in parallel without rerunning failed test cases" echo -e " execute.sh -d \tDebug testcase" echo -e " execute.sh [module]\tExecute test cases from the given module in parallel" echo -e " execute.sh -s [module]\t\tExecute test cases in serial using Testkit-Lite" @@ -23,11 +24,13 @@ opt_tct=0 opt_serial="" opt_modules=0 opt_debug=0 +opt_noFailedRerun=""; while true ; do case "$1" in -h|--help) usage ;; -d|--debug) opt_debug=1 ; shift ;; -s|--tct) opt_tct=1 ; shift ;; + -f|--nofailedrerun) opt_noFailedRerun="-f" ; shift ;; -S|--serial) opt_serial="-s" ; shift ;; -m|--modules) opt_modules=1 ; shift ;; --) shift; break;; @@ -75,7 +78,7 @@ rm -f tct*core-tests.xml # Clean up old coverage data if [ -d ../build/tizen ] ; then - rm -f ../build/tizen/dali-toolkit/.libs/*.gcda + rm -f ../build/tizen/dali/.libs/*.gcda fi find build \( -name "*.gcda" \) -exec rm '{}' \; @@ -116,7 +119,7 @@ else do echo -e "$ASCII_BOLD" echo -e "Executing $mod$ASCII_RESET" - build/src/$mod/tct-$mod-core -r $opt_serial + build/src/$mod/tct-$mod-core $opt_serial $opt_noFailedRerun done summary_end @@ -126,7 +129,7 @@ else summary_start module=$1 shift; - build/src/$module/tct-$module-core -r $opt_serial $* + build/src/$module/tct-$module-core $opt_serial $opt_noFailedRerun $* summary_end else @@ -138,7 +141,9 @@ else ret=$? if [ $ret -ne 6 ] ; then if [ $opt_debug -ne 0 ] ; then + echo DEBUGGING: gdb --args build/src/$mod/tct-$mod-core $1 + else echo $output if [ $ret -eq 0 ] ; then echo -e "\nPassed" ; fi diff --git a/automated-tests/src/dali-toolkit-internal/tct-dali-toolkit-internal-core.cpp b/automated-tests/src/dali-toolkit-internal/tct-dali-toolkit-internal-core.cpp index fcf09c6..39ed044 100644 --- a/automated-tests/src/dali-toolkit-internal/tct-dali-toolkit-internal-core.cpp +++ b/automated-tests/src/dali-toolkit-internal/tct-dali-toolkit-internal-core.cpp @@ -8,7 +8,7 @@ int main(int argc, char * const argv[]) { int result = TestHarness::EXIT_STATUS_BAD_ARGUMENT; - const char* optString = "rs"; + const char* optString = "sf"; bool optRerunFailed(true); bool optRunSerially(false); @@ -18,8 +18,8 @@ int main(int argc, char * const argv[]) nextOpt = getopt( argc, argv, optString ); switch(nextOpt) { - case 'r': - optRerunFailed = true; + case 'f': + optRerunFailed = false; break; case 's': optRunSerially = true; diff --git a/automated-tests/src/dali-toolkit-styling/tct-dali-toolkit-styling-core.cpp b/automated-tests/src/dali-toolkit-styling/tct-dali-toolkit-styling-core.cpp index 6e99684..ef04d46 100644 --- a/automated-tests/src/dali-toolkit-styling/tct-dali-toolkit-styling-core.cpp +++ b/automated-tests/src/dali-toolkit-styling/tct-dali-toolkit-styling-core.cpp @@ -8,7 +8,7 @@ int main(int argc, char * const argv[]) { int result = TestHarness::EXIT_STATUS_BAD_ARGUMENT; - const char* optString = "rs"; + const char* optString = "sf"; bool optRerunFailed(true); bool optRunSerially(false); @@ -18,8 +18,8 @@ int main(int argc, char * const argv[]) nextOpt = getopt( argc, argv, optString ); switch(nextOpt) { - case 'r': - optRerunFailed = true; + case 'f': + optRerunFailed = false; break; case 's': optRunSerially = true; diff --git a/automated-tests/src/dali-toolkit-third-party/tct-dali-toolkit-third-party-core.cpp b/automated-tests/src/dali-toolkit-third-party/tct-dali-toolkit-third-party-core.cpp index df212a2..d188f08 100644 --- a/automated-tests/src/dali-toolkit-third-party/tct-dali-toolkit-third-party-core.cpp +++ b/automated-tests/src/dali-toolkit-third-party/tct-dali-toolkit-third-party-core.cpp @@ -8,7 +8,7 @@ int main(int argc, char * const argv[]) { int result = TestHarness::EXIT_STATUS_BAD_ARGUMENT; - const char* optString = "rs"; + const char* optString = "sf"; bool optRerunFailed(true); bool optRunSerially(false); @@ -18,8 +18,8 @@ int main(int argc, char * const argv[]) nextOpt = getopt( argc, argv, optString ); switch(nextOpt) { - case 'r': - optRerunFailed = true; + case 'f': + optRerunFailed = false; break; case 's': optRunSerially = true; diff --git a/automated-tests/src/dali-toolkit/tct-dali-toolkit-core.cpp b/automated-tests/src/dali-toolkit/tct-dali-toolkit-core.cpp index b603310..5e64bd3 100644 --- a/automated-tests/src/dali-toolkit/tct-dali-toolkit-core.cpp +++ b/automated-tests/src/dali-toolkit/tct-dali-toolkit-core.cpp @@ -8,7 +8,7 @@ int main(int argc, char * const argv[]) { int result = TestHarness::EXIT_STATUS_BAD_ARGUMENT; - const char* optString = "rs"; + const char* optString = "sf"; bool optRerunFailed(true); bool optRunSerially(false); @@ -18,8 +18,8 @@ int main(int argc, char * const argv[]) nextOpt = getopt( argc, argv, optString ); switch(nextOpt) { - case 'r': - optRerunFailed = true; + case 'f': + optRerunFailed = false; break; case 's': optRunSerially = true; -- 2.7.4