8 files changed, 39 insertions, 56 deletions

diff --git a/auto_tests/CMakeLists.txt b/auto_tests/CMakeLists.txt
deleted file mode 100644
index c0b6aee4..00000000
--- a/auto_tests/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-cmake_minimum_required(VERSION 2.6.0)
-cmake_policy(SET CMP0011 NEW)
-
-include_directories(${CHECK_INCLUDE_DIRS})
-
-find_package(Check REQUIRED)
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/messenger_test.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/crypto_test.cmake)
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/friends_test.cmake)
-
-include( CTest )
-enable_testing()
-
-add_test(messenger messenger_test)
-add_test(crypto crypto_test)
-# TODO enable once test is fixed
-#add_test(friends friends_test)
-
-add_custom_target(
-    test COMMAND ${CMAKE_CTEST_COMMAND} -V 
-    DEPENDS messenger_test crypto_test
-)
diff --git a/auto_tests/Makefile.inc b/auto_tests/Makefile.inc
new file mode 100644
index 00000000..bd883a79
--- /dev/null
+++ b/auto_tests/Makefile.inc
@@ -0,0 +1,34 @@
+if BUILD_TESTS
+
+TESTS = messenger_autotest crypto_test
+
+check_PROGRAMS = messenger_autotest crypto_test
+
+messenger_autotest_SOURCES = \
+                        $(top_srcdir)/auto_tests/messenger_test.c
+
+messenger_autotest_CFLAGS = \
+                        $(LIBSODIUM_CFLAGS) \
+                        $(CHECK_CFLAGS)
+
+messenger_autotest_LDADD = \
+                        $(LIBSODIUM_LDFLAGS) \
+                        libtoxcore.la \
+                        $(LIBSODIUM_LIBS) \
+                        $(CHECK_LIBS)
+
+
+crypto_test_SOURCES =   $(top_srcdir)/auto_tests/crypto_test.c
+
+crypto_test_CFLAGS =    $(LIBSODIUM_CFLAGS) \
+                        $(CHECK_CFLAGS)
+
+crypto_test_LDADD =     $(LIBSODIUM_LDFLAGS) \
+                        libtoxcore.la \
+                        $(LIBSODIUM_LIBS) \
+                        $(CHECK_LIBS)
+
+endif
+
+EXTRA_DIST +=           $(top_srcdir)/auto_tests/friends_test.c
+
diff --git a/auto_tests/cmake/crypto_test.cmake b/auto_tests/cmake/crypto_test.cmake
deleted file mode 100644
index 9ca9a331..00000000
--- a/auto_tests/cmake/crypto_test.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 2.6.0)
-project(crypto_test C)
-set(exe_name crypto_test)
-
-add_executable(${exe_name}
-    crypto_test.c)
-
-linkCoreLibraries(${exe_name})
-add_dependencies(${exe_name} Check)
-target_link_libraries(${exe_name} check)
diff --git a/auto_tests/cmake/friends_test.cmake b/auto_tests/cmake/friends_test.cmake
deleted file mode 100644
index 5c2d0fc6..00000000
--- a/auto_tests/cmake/friends_test.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 2.6.0)
-project(friends_test C)
-set(exe_name friends_test)
-
-add_executable(${exe_name}
-    friends_test.c)
-
-linkCoreLibraries(${exe_name})
-add_dependencies(${exe_name} Check)
-target_link_libraries(${exe_name} check)
diff --git a/auto_tests/cmake/messenger_test.cmake b/auto_tests/cmake/messenger_test.cmake
deleted file mode 100644
index 084586bb..00000000
--- a/auto_tests/cmake/messenger_test.cmake
+++ /dev/null
@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 2.6.0)
-project(messenger_test C)
-set(exe_name messenger_test)
-
-add_executable(${exe_name}
-    messenger_test.c)
-
-linkCoreLibraries(${exe_name})
-add_dependencies(${exe_name} Check)
-target_link_libraries(${exe_name} check)
diff --git a/auto_tests/crypto_test.c b/auto_tests/crypto_test.c
index 01c545c8..b3ce6259 100644
--- a/auto_tests/crypto_test.c
+++ b/auto_tests/crypto_test.c
@@ -1,4 +1,4 @@
-#include "../core/net_crypto.h"
+#include "../toxcore/net_crypto.h"
 #include <sys/types.h>
 #include <stdint.h>
 #include <string.h>
diff --git a/auto_tests/friends_test.c b/auto_tests/friends_test.c
index b6223489..0426c18d 100644
--- a/auto_tests/friends_test.c
+++ b/auto_tests/friends_test.c
@@ -18,8 +18,8 @@
  *      times. This is used both to ensure that we don't loop forever on a broken build,
  *      and that we don't get too slow with messaging. The current time is 15 seconds. */
 
-#include "../core/friend_requests.h"
-#include "../core/Messenger.h"
+#include "../toxcore/friend_requests.h"
+#include "../toxcore/Messenger.h"
 #include <assert.h>
 #include <unistd.h>
 #include <sys/mman.h>
diff --git a/auto_tests/messenger_test.c b/auto_tests/messenger_test.c
index 9de69409..deac749b 100644
--- a/auto_tests/messenger_test.c
+++ b/auto_tests/messenger_test.c
@@ -10,7 +10,8 @@
  *      checking that status changes are received, messages can be sent, etc.
  *      All of that is done in a separate test, with two local clients running. */
 
-#include "../core/Messenger.h"
+#include "../toxcore/Messenger.h"
+#include "../toxcore/Lossless_UDP.h"
 #include <sys/types.h>
 #include <stdint.h>
 #include <string.h>