Merge "Fix dbus methods for mptcp" into tizen

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e39e645..f187136 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,5 +130,5 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/config/security-network-config.conf DESTINATIO
 
 ADD_SUBDIRECTORY(plugin/headed)
 ADD_SUBDIRECTORY(plugin/telephony)
-ADD_SUBDIRECTORY(unittest)
+ADD_SUBDIRECTORY(haltests)
 ADD_SUBDIRECTORY(gtest)

diff --git a/unittest/CMakeLists.txt b/haltests/CMakeLists.txt
similarity index 100%
rename from unittest/CMakeLists.txt
rename to haltests/CMakeLists.txt

diff --git a/unittest/unittest.h b/haltests/haltests.h
similarity index 100%
rename from unittest/unittest.h
rename to haltests/haltests.h

diff --git a/unittest/net-config-haltests.cpp b/haltests/net-config-haltests.cpp
similarity index 99%
rename from unittest/net-config-haltests.cpp
rename to haltests/net-config-haltests.cpp
index c8ff764..11ae2a7 100755 (executable)
--- a/unittest/net-config-haltests.cpp
+++ b/haltests/net-config-haltests.cpp
@@ -24,7 +24,7 @@
 #include <wifi-direct.h>
 #include <softap.h>
 #include <system_info.h>
-#include "unittest.h"
+#include "haltests.h"
 
 using ::testing::InitGoogleTest;
 using ::testing::Test;