X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fexecute.sh;h=7703340d40120c4061b2c8c6139110ff4f9fbf8f;hp=989560fe0fec8bfffc3b851152ddffdf5249f35e;hb=41d36118a13932bcf1db39b780ac437fcda8aa08;hpb=0b98fd2bb35714d1b888ca2de530f8d6be8050f8

diff --git a/automated-tests/execute.sh b/automated-tests/execute.sh
index 989560f..7703340 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;;
@@ -74,9 +77,8 @@ fi
 rm -f tct*core-tests.xml
 
 # Clean up old coverage data
-if [ -d ../build/tizen ] ; then
-    rm -f ../build/tizen/dali-toolkit/.libs/*.gcda
-fi
+[ -d ../build/tizen ] && rm -f ../build/tizen/dali/.libs/*.gcda
+[ -d ../build/tizen-cmake ] && find ../build/tizen-cmake/ -name \*.gcda -exec rm {} \;
 
 find build \( -name "*.gcda" \) -exec rm '{}' \;
 
@@ -116,7 +118,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 +128,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 +140,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