(AutomatedTests) Split internal tests to Devel & internal

Change-Id: I7258d887c23e4cb4266d5ceab66d91025779eb50

diff --git a/automated-tests/src/dali-devel/CMakeLists.txt b/automated-tests/src/dali-devel/CMakeLists.txt
new file mode 100644 (file)
index 0000000..39a58b0
--- /dev/null
+++ b/automated-tests/src/dali-devel/CMakeLists.txt
@@ -0,0 +1,67 @@
+SET(PKG_NAME "dali-devel")
+
+SET(EXEC_NAME "tct-${PKG_NAME}-core")
+SET(RPM_NAME "core-${PKG_NAME}-tests")
+
+SET(CAPI_LIB "dali-devel")
+
+SET(TC_SOURCES
+        utc-Dali-Atlas.cpp
+        utc-Dali-AnimatableMesh.cpp
+        utc-Dali-Context.cpp
+        utc-Dali-Constrainer.cpp
+        utc-Dali-DistanceField.cpp
+        utc-Dali-DynamicsBodyConfig.cpp
+        utc-Dali-DynamicsShape.cpp
+        utc-Dali-DynamicsWorld.cpp
+        utc-Dali-DynamicsWorldConfig.cpp
+        utc-Dali-Hash.cpp
+        utc-Dali-HitTestAlgorithm.cpp
+        utc-Dali-Material.cpp
+        utc-Dali-MeshActor.cpp
+        utc-Dali-MeshData.cpp
+        utc-Dali-Mutex.cpp
+        utc-Dali-Scripting.cpp
+)
+
+LIST(APPEND TC_SOURCES
+        mesh-builder.cpp
+        ../dali/dali-test-suite-utils/test-harness.cpp
+        ../dali/dali-test-suite-utils/dali-test-suite-utils.cpp
+        ../dali/dali-test-suite-utils/test-application.cpp
+        ../dali/dali-test-suite-utils/test-dynamics.cpp
+        ../dali/dali-test-suite-utils/test-gesture-manager.cpp
+        ../dali/dali-test-suite-utils/test-gl-abstraction.cpp
+        ../dali/dali-test-suite-utils/test-gl-sync-abstraction.cpp
+        ../dali/dali-test-suite-utils/test-native-image.cpp
+        ../dali/dali-test-suite-utils/test-platform-abstraction.cpp
+        ../dali/dali-test-suite-utils/test-render-controller.cpp
+        ../dali/dali-test-suite-utils/test-trace-call-stack.cpp
+)
+
+PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
+     dali-core
+)
+
+SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -O0 -ggdb --coverage -Wall -Werror=return-type")
+
+FOREACH(directory ${${CAPI_LIB}_LIBRARY_DIRS})
+    SET(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -L${directory}")
+ENDFOREACH(directory ${CAPI_LIB_LIBRARY_DIRS})
+
+INCLUDE_DIRECTORIES(
+    ../../..
+    .
+    ${${CAPI_LIB}_INCLUDE_DIRS}
+    ../dali/dali-test-suite-utils
+)
+
+ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
+TARGET_LINK_LIBRARIES(${EXEC_NAME}
+    ${${CAPI_LIB}_LIBRARIES}
+    -lpthread
+)
+
+INSTALL(PROGRAMS ${EXEC_NAME}
+    DESTINATION ${BIN_DIR}/${EXEC_NAME}
+)

diff --git a/automated-tests/src/dali-internal/mesh-builder.cpp b/automated-tests/src/dali-devel/mesh-builder.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/mesh-builder.cpp
rename to automated-tests/src/dali-devel/mesh-builder.cpp

diff --git a/automated-tests/src/dali-internal/mesh-builder.h b/automated-tests/src/dali-devel/mesh-builder.h
similarity index 100%
rename from automated-tests/src/dali-internal/mesh-builder.h
rename to automated-tests/src/dali-devel/mesh-builder.h

diff --git a/automated-tests/src/dali-devel/tct-dali-devel-core.cpp b/automated-tests/src/dali-devel/tct-dali-devel-core.cpp
new file mode 100644 (file)
index 0000000..69d3233
--- /dev/null
+++ b/automated-tests/src/dali-devel/tct-dali-devel-core.cpp
@@ -0,0 +1,40 @@
+#include <string.h>
+#include <getopt.h>
+#include <stdlib.h>
+#include <test-harness.h>
+#include "tct-dali-devel-core.h"
+
+int main(int argc, char * const argv[])
+{
+  int result = TestHarness::EXIT_STATUS_BAD_ARGUMENT;
+
+  const char* optString = "r";
+  bool optRerunFailed(false);
+
+  int nextOpt = 0;
+  do
+  {
+    nextOpt = getopt( argc, argv, optString );
+    switch(nextOpt)
+    {
+      case 'r':
+        optRerunFailed = true;
+        break;
+      case '?':
+        TestHarness::Usage(argv[0]);
+        exit(TestHarness::EXIT_STATUS_BAD_ARGUMENT);
+        break;
+    }
+  } while( nextOpt != -1 );
+
+  if( optind == argc ) // no testcase name in argument list
+  {
+    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;
+}

diff --git a/automated-tests/src/dali-internal/utc-Dali-AnimatableMesh.cpp b/automated-tests/src/dali-devel/utc-Dali-AnimatableMesh.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-AnimatableMesh.cpp
rename to automated-tests/src/dali-devel/utc-Dali-AnimatableMesh.cpp

diff --git a/automated-tests/src/dali-internal/utc-Dali-Atlas.cpp b/automated-tests/src/dali-devel/utc-Dali-Atlas.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-Atlas.cpp
rename to automated-tests/src/dali-devel/utc-Dali-Atlas.cpp

diff --git a/automated-tests/src/dali-internal/utc-Dali-Constrainer.cpp b/automated-tests/src/dali-devel/utc-Dali-Constrainer.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-Constrainer.cpp
rename to automated-tests/src/dali-devel/utc-Dali-Constrainer.cpp

diff --git a/automated-tests/src/dali-internal/utc-Dali-Context.cpp b/automated-tests/src/dali-devel/utc-Dali-Context.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-Context.cpp
rename to automated-tests/src/dali-devel/utc-Dali-Context.cpp

diff --git a/automated-tests/src/dali-internal/utc-Dali-DistanceField.cpp b/automated-tests/src/dali-devel/utc-Dali-DistanceField.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-DistanceField.cpp
rename to automated-tests/src/dali-devel/utc-Dali-DistanceField.cpp

diff --git a/automated-tests/src/dali-internal/utc-Dali-DynamicsBody.cpp b/automated-tests/src/dali-devel/utc-Dali-DynamicsBody.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-DynamicsBody.cpp
rename to automated-tests/src/dali-devel/utc-Dali-DynamicsBody.cpp

diff --git a/automated-tests/src/dali-internal/utc-Dali-DynamicsBodyConfig.cpp b/automated-tests/src/dali-devel/utc-Dali-DynamicsBodyConfig.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-DynamicsBodyConfig.cpp
rename to automated-tests/src/dali-devel/utc-Dali-DynamicsBodyConfig.cpp

diff --git a/automated-tests/src/dali-internal/utc-Dali-DynamicsJoint.cpp b/automated-tests/src/dali-devel/utc-Dali-DynamicsJoint.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-DynamicsJoint.cpp
rename to automated-tests/src/dali-devel/utc-Dali-DynamicsJoint.cpp

diff --git a/automated-tests/src/dali-internal/utc-Dali-DynamicsShape.cpp b/automated-tests/src/dali-devel/utc-Dali-DynamicsShape.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-DynamicsShape.cpp
rename to automated-tests/src/dali-devel/utc-Dali-DynamicsShape.cpp

diff --git a/automated-tests/src/dali-internal/utc-Dali-DynamicsWorld.cpp b/automated-tests/src/dali-devel/utc-Dali-DynamicsWorld.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-DynamicsWorld.cpp
rename to automated-tests/src/dali-devel/utc-Dali-DynamicsWorld.cpp

diff --git a/automated-tests/src/dali-internal/utc-Dali-DynamicsWorldConfig.cpp b/automated-tests/src/dali-devel/utc-Dali-DynamicsWorldConfig.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-DynamicsWorldConfig.cpp
rename to automated-tests/src/dali-devel/utc-Dali-DynamicsWorldConfig.cpp

diff --git a/automated-tests/src/dali-internal/utc-Dali-Hash.cpp b/automated-tests/src/dali-devel/utc-Dali-Hash.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-Hash.cpp
rename to automated-tests/src/dali-devel/utc-Dali-Hash.cpp

diff --git a/automated-tests/src/dali-internal/utc-Dali-HitTestAlgorithm.cpp b/automated-tests/src/dali-devel/utc-Dali-HitTestAlgorithm.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-HitTestAlgorithm.cpp
rename to automated-tests/src/dali-devel/utc-Dali-HitTestAlgorithm.cpp

diff --git a/automated-tests/src/dali-internal/utc-Dali-Material.cpp b/automated-tests/src/dali-devel/utc-Dali-Material.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-Material.cpp
rename to automated-tests/src/dali-devel/utc-Dali-Material.cpp

diff --git a/automated-tests/src/dali-internal/utc-Dali-MeshActor.cpp b/automated-tests/src/dali-devel/utc-Dali-MeshActor.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-MeshActor.cpp
rename to automated-tests/src/dali-devel/utc-Dali-MeshActor.cpp

diff --git a/automated-tests/src/dali-internal/utc-Dali-MeshData.cpp b/automated-tests/src/dali-devel/utc-Dali-MeshData.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-MeshData.cpp
rename to automated-tests/src/dali-devel/utc-Dali-MeshData.cpp

diff --git a/automated-tests/src/dali-internal/utc-Dali-Mutex.cpp b/automated-tests/src/dali-devel/utc-Dali-Mutex.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-Mutex.cpp
rename to automated-tests/src/dali-devel/utc-Dali-Mutex.cpp

diff --git a/automated-tests/src/dali-internal/utc-Dali-Scripting.cpp b/automated-tests/src/dali-devel/utc-Dali-Scripting.cpp
similarity index 100%
rename from automated-tests/src/dali-internal/utc-Dali-Scripting.cpp
rename to automated-tests/src/dali-devel/utc-Dali-Scripting.cpp

diff --git a/automated-tests/src/dali-internal/CMakeLists.txt b/automated-tests/src/dali-internal/CMakeLists.txt
index 217e8fe..fc3eda3 100644 (file)
--- a/automated-tests/src/dali-internal/CMakeLists.txt
+++ b/automated-tests/src/dali-internal/CMakeLists.txt
@@ -6,22 +6,6 @@ SET(RPM_NAME "core-${PKG_NAME}-tests")
 SET(CAPI_LIB "dali-internal")
 
 SET(TC_SOURCES
-        utc-Dali-Atlas.cpp
-        utc-Dali-AnimatableMesh.cpp
-        utc-Dali-Context.cpp
-        utc-Dali-Constrainer.cpp
-        utc-Dali-DistanceField.cpp
-        utc-Dali-DynamicsBodyConfig.cpp
-        utc-Dali-DynamicsShape.cpp
-        utc-Dali-DynamicsWorld.cpp
-        utc-Dali-DynamicsWorldConfig.cpp
-        utc-Dali-Hash.cpp
-        utc-Dali-HitTestAlgorithm.cpp
-        utc-Dali-Material.cpp
-        utc-Dali-MeshActor.cpp
-        utc-Dali-MeshData.cpp
-        utc-Dali-Mutex.cpp
-        utc-Dali-Scripting.cpp
         utc-Dali-Internal-Handles.cpp
         utc-Dali-Internal-ImageFactory.cpp
         utc-Dali-Internal-Mesh.cpp
@@ -33,7 +17,7 @@ SET(TC_SOURCES
 )
 
 LIST(APPEND TC_SOURCES
-        mesh-builder.cpp
+        ../dali-devel/mesh-builder.cpp
         ../dali/dali-test-suite-utils/test-harness.cpp
         ../dali/dali-test-suite-utils/dali-test-suite-utils.cpp
         ../dali/dali-test-suite-utils/test-application.cpp
@@ -62,12 +46,12 @@ INCLUDE_DIRECTORIES(
     .
     ${${CAPI_LIB}_INCLUDE_DIRS}
     ../dali/dali-test-suite-utils
+    ../dali-devel
 )
 
 ADD_EXECUTABLE(${EXEC_NAME} ${EXEC_NAME}.cpp ${TC_SOURCES})
 TARGET_LINK_LIBRARIES(${EXEC_NAME}
     ${${CAPI_LIB}_LIBRARIES}
-    -lpthread
 )
 
 INSTALL(PROGRAMS ${EXEC_NAME}