Move SockDiagTest into system/netd/server.

My recollection is that we decided to put unit tests next to
the corresponding code and integration tests into tests/.

Change-Id: I2dc1a074ba8d323253d9be3b2052d6b287bacc15

diff --git a/server/Android.mk b/server/Android.mk
index a2c0e89..270a722 100644 (file)
--- a/server/Android.mk
+++ b/server/Android.mk
@@ -127,3 +127,13 @@ LOCAL_SRC_FILES := FirewallControllerTest.cpp FirewallController.cpp
 LOCAL_MODULE_TAGS := tests
 LOCAL_SHARED_LIBRARIES := liblog libbase
 include $(BUILD_NATIVE_TEST)
+
+# Unit tests for SockDiag.cpp.
+include $(CLEAR_VARS)
+LOCAL_MODULE := SockDiagTest
+LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
+LOCAL_C_INCLUDES := system/netd/server
+LOCAL_SRC_FILES := SockDiagTest.cpp SockDiag.cpp
+LOCAL_MODULE_TAGS := tests
+LOCAL_SHARED_LIBRARIES := liblog
+include $(BUILD_NATIVE_TEST)

diff --git a/tests/sock_diag_test.cpp b/server/SockDiagTest.cpp
similarity index 100%
rename from tests/sock_diag_test.cpp
rename to server/SockDiagTest.cpp

diff --git a/tests/Android.mk b/tests/Android.mk
index 5d44c7b..b147694 100644 (file)
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -15,17 +15,6 @@
 #
 LOCAL_PATH := $(call my-dir)
 
-# Unit tests for SockDiag.cpp.
-# TODO: move from tests/ to server/
-include $(CLEAR_VARS)
-LOCAL_MODULE := sock_diag_test
-LOCAL_CFLAGS := -Wall -Werror -Wunused-parameter
-LOCAL_C_INCLUDES := system/netd/server
-LOCAL_SRC_FILES := sock_diag_test.cpp ../server/SockDiag.cpp
-LOCAL_MODULE_TAGS := tests
-LOCAL_SHARED_LIBRARIES := liblog
-include $(BUILD_NATIVE_TEST)
-
 # DNS responder tests.
 include $(CLEAR_VARS)
 LOCAL_MODULE := netd_test