From 40bce55e33e40c85c31f626ab5b79c3bedf13872 Mon Sep 17 00:00:00 2001
From: David Steele <david.steele@samsung.com>
Date: Wed, 23 Aug 2017 19:31:33 +0100
Subject: [PATCH] Added option to test harness execution to only summarize
 failures

Change-Id: Ifa0402acb152565dccfa7a6adda6b29667202fc9
---
 automated-tests/execute.sh                                       | 9 ++++++---
 .../src/dali-adaptor-internal/tct-dali-adaptor-internal-core.cpp | 6 +++---
 automated-tests/src/dali-adaptor/tct-dali-adaptor-core.cpp       | 6 +++---
 .../tct-dali-platform-abstraction-core.cpp                       | 6 +++---
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/automated-tests/execute.sh b/automated-tests/execute.sh
index bc51cfb..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 <testcase>\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;;
@@ -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
diff --git a/automated-tests/src/dali-adaptor-internal/tct-dali-adaptor-internal-core.cpp b/automated-tests/src/dali-adaptor-internal/tct-dali-adaptor-internal-core.cpp
index 37f40d0..1dfb194 100644
--- a/automated-tests/src/dali-adaptor-internal/tct-dali-adaptor-internal-core.cpp
+++ b/automated-tests/src/dali-adaptor-internal/tct-dali-adaptor-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-adaptor/tct-dali-adaptor-core.cpp b/automated-tests/src/dali-adaptor/tct-dali-adaptor-core.cpp
index dfaa9a4..86e70c9 100644
--- a/automated-tests/src/dali-adaptor/tct-dali-adaptor-core.cpp
+++ b/automated-tests/src/dali-adaptor/tct-dali-adaptor-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-platform-abstraction/tct-dali-platform-abstraction-core.cpp b/automated-tests/src/dali-platform-abstraction/tct-dali-platform-abstraction-core.cpp
index b651450..d839c4f 100644
--- a/automated-tests/src/dali-platform-abstraction/tct-dali-platform-abstraction-core.cpp
+++ b/automated-tests/src/dali-platform-abstraction/tct-dali-platform-abstraction-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