Merge "Remove deprecated APIs in Tizen 3.0" into devel/master

diff --git a/automated-tests/src/dali-toolkit-third-party/utc-Dali-Flexbox-Layout.cpp b/automated-tests/src/dali-toolkit-third-party/utc-Dali-Flexbox-Layout.cpp
index 832d73e..465e7f3 100644 (file)
--- a/automated-tests/src/dali-toolkit-third-party/utc-Dali-Flexbox-Layout.cpp
+++ b/automated-tests/src/dali-toolkit-third-party/utc-Dali-Flexbox-Layout.cpp
@@ -15,6 +15,8 @@
  *
  */
 
+#include <cstdlib>
+
 #include <dali-toolkit-test-suite-utils.h>
 // GTest fails to compile with "error: return-statement with a value, in function returning 'void'" error
 // if using dali assert function so define new assert with returning void.
@@ -26,7 +28,7 @@
         fprintf(stderr, \
             "Following expression is not true:\n" \
                 "%s\n", #exp); \
-        return; \
+        std::abort(); \
     }
 #include <gtest/gtest.h>
 #undef GTEST_HAS_DEATH_TEST
@@ -76,10 +78,10 @@
 
 int UtcDaliFlexboxLayoutTest(void)
 {
-  ToolkitTestApplication application;
   tet_infoline("UtcDaliFlexboxLayoutTest");
-  int argc = 0;
-  testing::InitGoogleTest( &argc, static_cast<char**>(nullptr) );
+  int argc = 1;
+  const char* argv = "yoga-gtest";
+  testing::InitGoogleTest( &argc,  const_cast< char** >( &argv ) );
 
   // The test function is a 3rd party function that should return true if the test passes
   if( !RUN_ALL_TESTS() )