X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Ftct-dali-toolkit-core.cpp;h=5e64bd370423ef168f1c25dd3754640cea60a83f;hp=d9c39e11c10ff454ef31f1d3306e42029c64f21b;hb=895e2909bd541d9f987923c40dabd9417f66325b;hpb=fa6279fb2830427d5ab569ca14e6ade1557ef2fa

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 d9c39e1..5e64bd3 100644
--- a/automated-tests/src/dali-toolkit/tct-dali-toolkit-core.cpp
+++ b/automated-tests/src/dali-toolkit/tct-dali-toolkit-core.cpp
@@ -1,31 +1,51 @@
-#include <stdio.h>
 #include <string.h>
+#include <getopt.h>
+#include <stdlib.h>
+#include <test-harness.h>
 #include "tct-dali-toolkit-core.h"
 
-int main(int argc, const char *argv[])
+int main(int argc, char * const argv[])
 {
-    int result = -1;
-    int i;
+  int result = TestHarness::EXIT_STATUS_BAD_ARGUMENT;
 
-    if (argc != 2) {
-        printf("Usage: %s <testcase name>\n", argv[0]);
-        return 2;
-    }
-
-    for (i = 0; tc_array[i].name; i++) {
-        if (!strcmp(argv[1], tc_array[i].name)) {
-            if (tc_array[i].startup)
-                tc_array[i].startup();
-
-            result = tc_array[i].function();
+  const char* optString = "sf";
+  bool optRerunFailed(true);
+  bool optRunSerially(false);
 
-            if (tc_array[i].cleanup)
-                tc_array[i].cleanup();
-
-            return result;
-        }
+  int nextOpt = 0;
+  do
+  {
+    nextOpt = getopt( argc, argv, optString );
+    switch(nextOpt)
+    {
+      case 'f':
+        optRerunFailed = false;
+        break;
+      case 's':
+        optRunSerially = true;
+        break;
+      case '?':
+        TestHarness::Usage(argv[0]);
+        exit(TestHarness::EXIT_STATUS_BAD_ARGUMENT);
+        break;
     }
+  } while( nextOpt != -1 );
 
-    printf("Unknown testcase name: \"%s\"\n", argv[1]);
-    return 2;
+  if( optind == argc ) // no testcase name in argument list
+  {
+    if( optRunSerially )
+    {
+      result = TestHarness::RunAll( argv[0], tc_array );
+    }
+    else
+    {
+      result = TestHarness::RunAllInParallel( argv[0], tc_array, optRerunFailed );
+    }
+  }
+  else
+  {
+    // optind is index of next argument - interpret as testcase name
+    result = TestHarness::FindAndRunTestCase(tc_array, argv[optind]);
+  }
+  return result;
 }