From 60c4b8a0e5387d8a5f40caebdaecab8388225f63 Mon Sep 17 00:00:00 2001
From: "Evgeny Grin (Karlson2k)" <k2k@narod.ru>
Date: Mon, 22 Jul 2024 16:55:52 +0200
Subject: [PATCH] Moved client-server tests to dedicated dir

---
 src/tests/Makefile.am                         |  3 +-
 src/tests/basic/Makefile.am                   | 19 --------
 src/tests/client_server/Makefile.am           | 44 +++++++++++++++++++
 src/tests/{basic => client_server}/libtest.c  |  0
 src/tests/{basic => client_server}/libtest.h  |  0
 .../libtest_convenience.c                     |  0
 .../libtest_convenience_client_request.c      |  0
 .../libtest_convenience_server_reply.c        |  0
 .../test_client_server.c                      |  0
 9 files changed, 45 insertions(+), 21 deletions(-)
 create mode 100644 src/tests/client_server/Makefile.am
 rename src/tests/{basic => client_server}/libtest.c (100%)
 rename src/tests/{basic => client_server}/libtest.h (100%)
 rename src/tests/{basic => client_server}/libtest_convenience.c (100%)
 rename src/tests/{basic => client_server}/libtest_convenience_client_request.c (100%)
 rename src/tests/{basic => client_server}/libtest_convenience_server_reply.c (100%)
 rename src/tests/{basic => client_server}/test_client_server.c (100%)

diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 61a9c0d1..753d51b9 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,6 +1,5 @@
 # This Makefile.am is in the public domain
 
-SUBDIRS = basic
-
+SUBDIRS = basic client_server
 
 .NOTPARALLEL:
diff --git a/src/tests/basic/Makefile.am b/src/tests/basic/Makefile.am
index 824e016d..5617ac14 100644
--- a/src/tests/basic/Makefile.am
+++ b/src/tests/basic/Makefile.am
@@ -17,18 +17,6 @@ if USE_COVERAGE
   AM_CFLAGS += -fprofile-arcs -ftest-coverage
 endif
 
-noinst_LTLIBRARIES = \
-  libmhdt.la
-
-libmhdt_la_SOURCES = \
-  libtest.c libtest.h \
-  libtest_convenience.c \
-  libtest_convenience_client_request.c \
-  libtest_convenience_server_reply.c
-libmhdt_la_LIBADD = \
-  -lpthread \
-  -lcurl
-
 LDADD = $(top_builddir)/src/mhd2/libmicrohttpd2.la
 
 $(top_builddir)/src/mhd2/libmicrohttpd2.la: $(top_builddir)/src/mhd2/Makefile
@@ -36,7 +24,6 @@ $(top_builddir)/src/mhd2/libmicrohttpd2.la: $(top_builddir)/src/mhd2/Makefile
 	$(am__cd) $(top_builddir)/src/mhd2 && $(MAKE) $(AM_MAKEFLAGS) libmicrohttpd2.la
 
 check_PROGRAMS = \
-  test_client_server \
   test_create_destroy \
   test_create_start_destroy \
   test_create_destroy_ipv4 \
@@ -117,12 +104,6 @@ endif
 
 TESTS = $(check_PROGRAMS)
 
-test_client_server_SOURCES = \
-  test_client_server.c
-test_client_server_LDADD = \
-  libmhdt.la \
-  $(top_builddir)/src/mhd2/libmicrohttpd2.la
-
 # The universal sources used in all tests
 basic_test_sources = test_basic_checks.c
 
diff --git a/src/tests/client_server/Makefile.am b/src/tests/client_server/Makefile.am
new file mode 100644
index 00000000..b4e2e2b0
--- /dev/null
+++ b/src/tests/client_server/Makefile.am
@@ -0,0 +1,44 @@
+# This Makefile.am is in the public domain
+EMPTY_ITEM =
+
+AM_CPPFLAGS = \
+  -I$(top_srcdir)/src/include \
+  -I$(top_srcdir)/src/mhd2 \
+  -DMHD_CPU_COUNT=$(CPU_COUNT) \
+  $(CPPFLAGS_ac)
+
+AM_CFLAGS = $(CFLAGS_ac)
+
+AM_LDFLAGS = $(LDFLAGS_ac)
+
+AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac)
+
+if USE_COVERAGE
+  AM_CFLAGS += -fprofile-arcs -ftest-coverage
+endif
+
+LDADD = $(top_builddir)/src/mhd2/libmicrohttpd2.la
+
+$(top_builddir)/src/mhd2/libmicrohttpd2.la: $(top_builddir)/src/mhd2/Makefile
+	@echo ' cd $(top_builddir)/src/mhd2 && $(MAKE) $(AM_MAKEFLAGS) libmicrohttpd2.la'; \
+	$(am__cd) $(top_builddir)/src/mhd2 && $(MAKE) $(AM_MAKEFLAGS) libmicrohttpd2.la
+
+check_PROGRAMS = \
+  test_client_server \
+
+noinst_LTLIBRARIES = \
+  libmhdt.la
+
+libmhdt_la_SOURCES = \
+  libtest.c libtest.h \
+  libtest_convenience.c \
+  libtest_convenience_client_request.c \
+  libtest_convenience_server_reply.c
+libmhdt_la_LIBADD = \
+  -lpthread \
+  -lcurl
+
+test_client_server_SOURCES = \
+  test_client_server.c
+test_client_server_LDADD = \
+  libmhdt.la
diff --git a/src/tests/basic/libtest.c b/src/tests/client_server/libtest.c
similarity index 100%
rename from src/tests/basic/libtest.c
rename to src/tests/client_server/libtest.c
diff --git a/src/tests/basic/libtest.h b/src/tests/client_server/libtest.h
similarity index 100%
rename from src/tests/basic/libtest.h
rename to src/tests/client_server/libtest.h
diff --git a/src/tests/basic/libtest_convenience.c b/src/tests/client_server/libtest_convenience.c
similarity index 100%
rename from src/tests/basic/libtest_convenience.c
rename to src/tests/client_server/libtest_convenience.c
diff --git a/src/tests/basic/libtest_convenience_client_request.c b/src/tests/client_server/libtest_convenience_client_request.c
similarity index 100%
rename from src/tests/basic/libtest_convenience_client_request.c
rename to src/tests/client_server/libtest_convenience_client_request.c
diff --git a/src/tests/basic/libtest_convenience_server_reply.c b/src/tests/client_server/libtest_convenience_server_reply.c
similarity index 100%
rename from src/tests/basic/libtest_convenience_server_reply.c
rename to src/tests/client_server/libtest_convenience_server_reply.c
diff --git a/src/tests/basic/test_client_server.c b/src/tests/client_server/test_client_server.c
similarity index 100%
rename from src/tests/basic/test_client_server.c
rename to src/tests/client_server/test_client_server.c