Merge "Reconfigured dynamics test cases" into tizen

diff --git a/automated-tests/CMakeLists.txt b/automated-tests/CMakeLists.txt
index 9e15203..c27852a 100644 (file)
--- a/automated-tests/CMakeLists.txt
+++ b/automated-tests/CMakeLists.txt
@@ -9,3 +9,5 @@ INCLUDE_DIRECTORIES(
 )
 
 ADD_SUBDIRECTORY(src)
+
+SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ")

diff --git a/automated-tests/CMakeLists.txt.in b/automated-tests/CMakeLists.txt.in
new file mode 100644 (file)
index 0000000..191c421
--- /dev/null
+++ b/automated-tests/CMakeLists.txt.in
@@ -0,0 +1,13 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+PROJECT(tct_coreapi_utc)
+
+INCLUDE(FindPkgConfig)
+SET(BIN_DIR "/opt/usr/bin")
+
+INCLUDE_DIRECTORIES(
+       src/common
+)
+
+ADD_SUBDIRECTORY(src)
+
+SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} @DYNAMICS_SUPPORT@")

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsBody.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsBody.cpp
index 2068928..41d452d 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsBody.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsBody.cpp
@@ -23,8 +23,11 @@
 
 int UtcDaliDynamicsBodyConstructor(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsBodyConstructor - DynamicsBody::DynamicsBody()");
-
   TestApplication application;
 
   // start up
@@ -62,6 +65,10 @@ int UtcDaliDynamicsBodyConstructor(void)
 
 int UtcDaliDynamicsBodyGetMass(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -90,11 +97,16 @@ int UtcDaliDynamicsBodyGetMass(void)
 
   tet_infoline("UtcDaliDynamicsBodyGetMass - DynamicsBody::GetMass");
   DALI_TEST_EQUALS( testMass, actor.GetDynamicsBody().GetMass(), Math::MACHINE_EPSILON_0, TEST_LOCATION );
+
   END_TEST;
 }
 
 int UtcDaliDynamicsBodyGetElasticity(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -128,6 +140,10 @@ int UtcDaliDynamicsBodyGetElasticity(void)
 
 int UtcDaliDynamicsBodySetLinearVelocity(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsBodySetLinearVelocity - DynamicsBody::SetLinearVelocity");
 
   TestApplication application;
@@ -171,6 +187,10 @@ int UtcDaliDynamicsBodySetLinearVelocity(void)
 
 int UtcDaliDynamicsBodySetAngularVelocity(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsBodySetAngularVelocity - DynamicsBody::SetAngularVelocity");
 
   TestApplication application;
@@ -214,6 +234,10 @@ int UtcDaliDynamicsBodySetAngularVelocity(void)
 
 int UtcDaliDynamicsBodySetKinematic(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -258,6 +282,10 @@ int UtcDaliDynamicsBodySetKinematic(void)
 
 int UtcDaliDynamicsBodyIsKinematic(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -298,6 +326,10 @@ int UtcDaliDynamicsBodyIsKinematic(void)
 
 int UtcDaliDynamicsBodySetSleepEnabled(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsBodySetSleepEnabled");
 
   TestApplication application;
@@ -346,6 +378,10 @@ int UtcDaliDynamicsBodySetSleepEnabled(void)
 
 int UtcDaliDynamicsBodyGetSleepEnabled(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsBodyGetSleepEnabled");
 
   TestApplication application;
@@ -382,6 +418,10 @@ int UtcDaliDynamicsBodyGetSleepEnabled(void)
 
 int UtcDaliDynamicsBodyWakeUp(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsBodyWakeUp");
 
   TestApplication application;
@@ -426,6 +466,10 @@ int UtcDaliDynamicsBodyWakeUp(void)
 
 int UtcDaliDynamicsBodyAddAnchor(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsBodyAddAnchor - DynamicsBody::AddAnchor()");
 
   TestApplication application;
@@ -486,6 +530,10 @@ int UtcDaliDynamicsBodyAddAnchor(void)
 
 int UtcDaliDynamicsBodyConserveVolume(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsBodyConserveVolume");
 
   TestApplication application;
@@ -520,6 +568,10 @@ int UtcDaliDynamicsBodyConserveVolume(void)
 
 int UtcDaliDynamicsBodyConserveShape(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsBodyConserveShape");
 
   TestApplication application;

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsBodyConfig.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsBodyConfig.cpp
index 17baffd..0ab81f3 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsBodyConfig.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsBodyConfig.cpp
@@ -27,6 +27,11 @@ using namespace Dali;
 
 int UtcDaliDynamicsBodyConfigNew(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
+
   tet_infoline("UtcDaliDynamicsBodyConfigNew - DynamicsBodyConfig::New()");
 
   TestApplication application;
@@ -54,6 +59,10 @@ int UtcDaliDynamicsBodyConfigNew(void)
 
 int UtcDaliDynamicsBodyConfigConstructor(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsBodyConfigConstructor - DynamicsBodyConfig::DynamicsBodyConfig()");
 
   TestApplication application;
@@ -87,6 +96,10 @@ int UtcDaliDynamicsBodyConfigConstructor(void)
 
 int UtcDaliDynamicsBodyConfigType(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -117,6 +130,10 @@ int UtcDaliDynamicsBodyConfigType(void)
 
 int UtcDaliDynamicsBodyConfigSetShape01(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsBodyConfigSetShape01 - DynamicsBodyConfig::SetShape(const DynamicsShape::ShapeType,const Vector3&)");
 
   TestApplication application;
@@ -149,6 +166,10 @@ int UtcDaliDynamicsBodyConfigSetShape01(void)
 
 int UtcDaliDynamicsBodyConfigSetShape02(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsBodyConfigSetShape02 - DynamicsBodyConfig::SetShape(DynamicsShape)");
 
   TestApplication application;
@@ -182,6 +203,10 @@ int UtcDaliDynamicsBodyConfigSetShape02(void)
 
 int UtcDaliDynamicsBodyConfigGetShape(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsBodyConfigGetShape - DynamicsBodyConfig::GetShape");
 
   TestApplication application;
@@ -209,6 +234,10 @@ int UtcDaliDynamicsBodyConfigGetShape(void)
 
 int UtcDaliDynamicsBodyConfigMass(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -243,6 +272,10 @@ int UtcDaliDynamicsBodyConfigMass(void)
 
 int UtcDaliDynamicsBodyConfigElasticity(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -277,6 +310,10 @@ int UtcDaliDynamicsBodyConfigElasticity(void)
 
 int UtcDaliDynamicsBodyConfigFriction(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -311,6 +348,10 @@ int UtcDaliDynamicsBodyConfigFriction(void)
 
 int UtcDaliDynamicsBodyConfigLinearDamping(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -345,6 +386,10 @@ int UtcDaliDynamicsBodyConfigLinearDamping(void)
 
 int UtcDaliDynamicsBodyConfigAngularDamping(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -379,6 +424,10 @@ int UtcDaliDynamicsBodyConfigAngularDamping(void)
 
 int UtcDaliDynamicsBodyConfigLinearSleepVelocity(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -413,6 +462,10 @@ int UtcDaliDynamicsBodyConfigLinearSleepVelocity(void)
 
 int UtcDaliDynamicsBodyConfigAngularSleepVelocity(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -447,6 +500,10 @@ int UtcDaliDynamicsBodyConfigAngularSleepVelocity(void)
 
 int UtcDaliDynamicsBodyConfigCollisionGroup(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -481,6 +538,10 @@ int UtcDaliDynamicsBodyConfigCollisionGroup(void)
 
 int UtcDaliDynamicsBodyConfigCollisionMask(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -515,6 +576,10 @@ int UtcDaliDynamicsBodyConfigCollisionMask(void)
 
 int UtcDaliDynamicsBodyConfigAnchorHardness(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -549,6 +614,10 @@ int UtcDaliDynamicsBodyConfigAnchorHardness(void)
 
 int UtcDaliDynamicsBodyConfigVolumeConservation(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsBodyConfigVolumeConservation");
 
   TestApplication application;
@@ -578,6 +647,10 @@ int UtcDaliDynamicsBodyConfigVolumeConservation(void)
 
 int UtcDaliDynamicsBodyConfigShapeConservation(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsBodyConfigShapeConservation");
 
   TestApplication application;

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsJoint.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsJoint.cpp
index 2da0996..1be8e8c 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsJoint.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsJoint.cpp
@@ -43,6 +43,10 @@ int UtcDaliDynamicsJointConstructor(void)
 
 int UtcDaliDynamicsJointLinearLimit(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -80,6 +84,10 @@ int UtcDaliDynamicsJointLinearLimit(void)
 
 int UtcDaliDynamicsJointAngularLimit(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -113,6 +121,10 @@ int UtcDaliDynamicsJointAngularLimit(void)
 
 int UtcDaliDynamicsJointEnableSpring(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -146,6 +158,10 @@ int UtcDaliDynamicsJointEnableSpring(void)
 
 int UtcDaliDynamicsJointSetSpringStiffness(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -179,6 +195,10 @@ int UtcDaliDynamicsJointSetSpringStiffness(void)
 
 int UtcDaliDynamicsJointSetSpringCenterPoint(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -212,6 +232,10 @@ int UtcDaliDynamicsJointSetSpringCenterPoint(void)
 
 int UtcDaliDynamicsJointEnableMotor(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -245,6 +269,10 @@ int UtcDaliDynamicsJointEnableMotor(void)
 
 int UtcDaliDynamicsJointSetMotorVelocity(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -278,6 +306,10 @@ int UtcDaliDynamicsJointSetMotorVelocity(void)
 
 int UtcDaliDynamicsJointSetMotorForce(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up
@@ -311,6 +343,10 @@ int UtcDaliDynamicsJointSetMotorForce(void)
 
 int UtcDaliDynamicsJointGetActor(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsShape.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsShape.cpp
index c0a462f..57730ad 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsShape.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsShape.cpp
@@ -25,6 +25,10 @@ using namespace Dali;
 
 int UtcDaliDynamicsShapeConstructor(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsShapeConstructor - DynamicsShape::DynamicsShape");
 
   TestApplication application;
@@ -60,6 +64,10 @@ int UtcDaliDynamicsShapeConstructor(void)
 
 int UtcDaliDynamicsShapeNewCapsule(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsShapeNewCapsule - DynamicsShape::NewCapsule");
 
   TestApplication application;
@@ -91,6 +99,10 @@ int UtcDaliDynamicsShapeNewCapsule(void)
 
 int UtcDaliDynamicsShapeNewCone(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsShapeNewCone - DynamicsShape::NewCone");
 
   TestApplication application;
@@ -121,6 +133,10 @@ int UtcDaliDynamicsShapeNewCone(void)
 
 int UtcDaliDynamicsShapeNewCube(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsShapeNewCube - DynamicsShape::NewCube");
 
   TestApplication application;
@@ -150,6 +166,10 @@ int UtcDaliDynamicsShapeNewCube(void)
 
 int UtcDaliDynamicsShapeNewCylinder(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsShapeNewCylinder - DynamicsShape::NewCylinder");
 
   TestApplication application;
@@ -179,6 +199,10 @@ int UtcDaliDynamicsShapeNewCylinder(void)
 
 int UtcDaliDynamicsShapeNewMesh(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsShapeNewMesh - DynamicsShape::NewMesh");
 
   TestApplication application;
@@ -208,6 +232,10 @@ int UtcDaliDynamicsShapeNewMesh(void)
 
 int UtcDaliDynamicsShapeNewSphere(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsShapeNewSphere - DynamicsShape::NewSphere");
 
   TestApplication application;
@@ -237,6 +265,10 @@ int UtcDaliDynamicsShapeNewSphere(void)
 
 int UtcDaliDynamicsShapeGetType(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsShapeGetType - DynamicsShape::GetType");
 
   TestApplication application;

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsWorld.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsWorld.cpp
index 6b107e8..05ae43f 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsWorld.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsWorld.cpp
@@ -25,6 +25,10 @@ using namespace Dali;
 
 int UtcDaliStageInitializeDynamics(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   Stage stage = Stage::GetCurrent();
@@ -60,6 +64,10 @@ int UtcDaliStageTerminateDynamics(void)
 
 int UtcDaliDynamicsWorldConstructor(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsWorldConstructor - DynamicsWorld::DynamicsWorld");
 
   TestApplication application;
@@ -83,6 +91,10 @@ int UtcDaliDynamicsWorldConstructor(void)
 
 int UtcDaliDynamicsWorldGravity(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
   TraceCallStack& trace( application.GetPlatform().GetTrace() );
   trace.Enable( true );
@@ -121,6 +133,10 @@ int UtcDaliDynamicsWorldGravity(void)
 
 int UtcDaliDynamicsWorldDebugDrawMode(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
   TraceCallStack& trace( application.GetPlatform().GetTrace() );
   trace.Enable( true );
@@ -160,6 +176,10 @@ int UtcDaliDynamicsWorldDebugDrawMode(void)
 
 int UtcDaliDynamicsWorldRootActor(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up

diff --git a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsWorldConfig.cpp b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsWorldConfig.cpp
index 3e71dd3..e8adfa4 100644 (file)
--- a/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsWorldConfig.cpp
+++ b/automated-tests/src/dali-unmanaged/utc-Dali-DynamicsWorldConfig.cpp
@@ -26,6 +26,10 @@ using namespace Dali;
 
 int UtcDaliDynamicsWorldConfigConstructor(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsWorldConfigConstructor - DynamicsWorldConfig::DynamicsWorldConfig");
 
   TestApplication application;
@@ -48,6 +52,10 @@ int UtcDaliDynamicsWorldConfigConstructor(void)
 
 int UtcDaliDynamicsWorldConfigNew(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   tet_infoline("UtcDaliDynamicsWorldConfigNew - DynamicsWorldConfig::New");
 
   TestApplication application;
@@ -66,6 +74,10 @@ int UtcDaliDynamicsWorldConfigNew(void)
 
 int UtcDaliDynamicsWorldConfigType(void)
 {
+#if !defined(DYNAMICS_SUPPORT)
+  tet_infoline("No dynamics support compiled\n");
+  return 0;
+#endif
   TestApplication application;
 
   // start up

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 67d743a..a262632 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -74,9 +74,12 @@ if test "x$enable_emscripten" = "xyes"; then
   enable_backtrace="no"
 fi
 
+DYNAMICS_SUPPORT=
 if test "x$dynamics_support" = "xyes"; then
   DALI_CFLAGS="$DALI_CFLAGS -DDYNAMICS_SUPPORT"
+  DYNAMICS_SUPPORT=-DDYNAMICS_SUPPORT
 fi
+AC_SUBST(DYNAMICS_SUPPORT)
 
 # Must come after Emscripten feature test
 if test "x$enable_backtrace" = "xyes"; then
@@ -123,6 +126,7 @@ AC_CONFIG_FILES([
  Makefile
  dali-core/Makefile
  dali-core.pc
+ ../../automated-tests/CMakeLists.txt
 ])
 
 AC_OUTPUT