[tests] move src/test_*.c to src/t/

10 files changed, 23 insertions, 23 deletions

diff --git a/.gitignore b/.gitignore
index ad0ed0d7..fc6317cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.exe
 *~
 .deps/
+.dirstamp
 .libs/
 .sconf_temp
 .sconsign.dblite
diff --git a/configure.ac b/configure.ac
index eda1eabf..ff1b0656 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ AC_CONFIG_MACRO_DIR([m4])
 
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([1.13 -Wall -Wno-portability -Wno-override foreign dist-xz tar-ustar serial-tests silent-rules])
+AM_INIT_AUTOMAKE([1.13 -Wall -Wno-portability -Wno-override foreign dist-xz tar-ustar serial-tests silent-rules subdir-objects])
 
 dnl @synopsis TRY_CFLAGS [compiler flags]
 dnl @summary check whether compiler supports given flags and adds them to CFLAGS
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 70f614e7..f876fbf7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -645,20 +645,20 @@ add_and_install_library(mod_webdav mod_webdav.c)
 add_and_install_library(mod_wstunnel mod_wstunnel.c)
 
 add_executable(test_buffer
-	test_buffer.c
+	t/test_buffer.c
 	buffer.c
 )
 add_test(NAME test_buffer COMMAND test_buffer)
 
 add_executable(test_base64
-	test_base64.c
+	t/test_base64.c
 	buffer.c
 	base64.c
 )
 add_test(NAME test_base64 COMMAND test_base64)
 
 add_executable(test_configfile
-	test_configfile.c
+	t/test_configfile.c
 	buffer.c
 	array.c
 	data_config.c
@@ -671,7 +671,7 @@ add_executable(test_configfile
 add_test(NAME test_configfile COMMAND test_configfile)
 
 add_executable(test_request
-	test_request.c
+	t/test_request.c
 	request.c
 	buffer.c
 	array.c
diff --git a/src/Makefile.am b/src/Makefile.am
index b662b69f..3160388f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,14 @@
 AM_CFLAGS = $(FAM_CFLAGS) $(LIBUNWIND_CFLAGS)
 
-noinst_PROGRAMS=test_buffer test_base64 test_configfile test_request
+noinst_PROGRAMS=t/test_buffer t/test_base64 t/test_configfile t/test_request
 sbin_PROGRAMS=lighttpd lighttpd-angel
 LEMON=$(top_builddir)/src/lemon$(BUILD_EXEEXT)
 
 TESTS=\
-	test_buffer$(EXEEXT) \
-	test_base64$(EXEEXT) \
-	test_configfile$(EXEEXT) \
-	test_request$(EXEEXT)
+	t/test_buffer$(EXEEXT) \
+	t/test_base64$(EXEEXT) \
+	t/test_configfile$(EXEEXT) \
+	t/test_request$(EXEEXT)
 
 lemon$(BUILD_EXEEXT): lemon.c
 	$(AM_V_CC)$(CC_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ $(srcdir)/lemon.c
@@ -511,17 +511,17 @@ lighttpd_LDFLAGS = -export-dynamic
 
 endif
 
-test_buffer_SOURCES = test_buffer.c buffer.c
-test_buffer_LDADD = $(LIBUNWIND_LIBS)
+t_test_buffer_SOURCES = t/test_buffer.c buffer.c
+t_test_buffer_LDADD = $(LIBUNWIND_LIBS)
 
-test_base64_SOURCES = test_base64.c base64.c buffer.c
-test_base64_LDADD = $(LIBUNWIND_LIBS)
+t_test_base64_SOURCES = t/test_base64.c base64.c buffer.c
+t_test_base64_LDADD = $(LIBUNWIND_LIBS)
 
-test_configfile_SOURCES = test_configfile.c buffer.c array.c data_config.c data_string.c http_kv.c vector.c log.c sock_addr.c
-test_configfile_LDADD = $(PCRE_LIB) $(LIBUNWIND_LIBS)
+t_test_configfile_SOURCES = t/test_configfile.c buffer.c array.c data_config.c data_string.c http_kv.c vector.c log.c sock_addr.c
+t_test_configfile_LDADD = $(PCRE_LIB) $(LIBUNWIND_LIBS)
 
-test_request_SOURCES = test_request.c request.c buffer.c array.c data_string.c http_kv.c log.c sock_addr.c
-test_request_LDADD = $(LIBUNWIND_LIBS)
+t_test_request_SOURCES = t/test_request.c request.c buffer.c array.c data_string.c http_kv.c log.c sock_addr.c
+t_test_request_LDADD = $(LIBUNWIND_LIBS)
 
 noinst_HEADERS   = $(hdr)
 EXTRA_DIST = \
diff --git a/src/meson.build b/src/meson.build
index 05c66ff0..7a47d078 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -687,20 +687,20 @@ executable('lighttpd', configparser,
 )
 
 test('test_buffer', executable('test_buffer',
-	sources: ['test_buffer.c', 'buffer.c'],
+	sources: ['t/test_buffer.c', 'buffer.c'],
 	dependencies: common_flags + libunwind,
 	build_by_default: false,
 ))
 
 test('test_base64', executable('test_base64',
-	sources: ['test_base64.c', 'buffer.c', 'base64.c'],
+	sources: ['t/test_base64.c', 'buffer.c', 'base64.c'],
 	dependencies: common_flags + libunwind,
 	build_by_default: false,
 ))
 
 test('test_configfile', executable('test_configfile',
 	sources: [
-		'test_configfile.c',
+		't/test_configfile.c',
 		'buffer.c',
 		'array.c',
 		'data_config.c',
@@ -716,7 +716,7 @@ test('test_configfile', executable('test_configfile',
 
 test('test_request', executable('test_request',
 	sources: [
-		'test_request.c',
+		't/test_request.c',
 		'request.c',
 		'buffer.c',
 		'array.c',
diff --git a/src/test_base64.c b/src/t/test_base64.c
index 71c9c7ca..71c9c7ca 100644
--- a/src/test_base64.c
+++ b/src/t/test_base64.c
diff --git a/src/test_buffer.c b/src/t/test_buffer.c
index 9c63b7dc..9c63b7dc 100644
--- a/src/test_buffer.c
+++ b/src/t/test_buffer.c
diff --git a/src/test_configfile.c b/src/t/test_configfile.c
index 251de631..251de631 100644
--- a/src/test_configfile.c
+++ b/src/t/test_configfile.c
diff --git a/src/test_request.c b/src/t/test_request.c
index b73127e1..b73127e1 100644
--- a/src/test_request.c
+++ b/src/t/test_request.c
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 993ef38a..98cfb954 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -19,7 +19,6 @@ set(T_FILES
 	core-keepalive.t
 	core-request.t
 	core-response.t
-	core.t
 	core-var-include.t
 	lowercase.t
 	mod-access.t