[tests] reenable test_mod_ssi in cmake

(Instead, workaround added for libtool)
(There must be better ways to do this, but I don't know them right now)

src/CMakeLists.txt

@@ -959,31 +959,32 @@ add_executable(test_mod_simple_vhost
 )
 add_test(NAME test_mod_simple_vhost COMMAND test_mod_simple_vhost)
 
-#add_executable(test_mod_ssi
-#	t/test_mod_ssi.c
-#	request.c
-#	base64.c
-#	buffer.c
-#	burl.c
-#	array.c
-#	chunk.c
-#	fdevent.c
-#	http-header-glue.c
-#	http_cgi.c
-#	http_chunk.c
-#	http_date.c
-#	http_etag.c
-#	http_header.c
-#	http_kv.c
-#	log.c
-#	fdlog.c
-#	sock_addr.c
-#	stat_cache.c
-#	fdevent_fdnode.c
-#	algo_splaytree.c
-#	ck.c
-#)
-#add_test(NAME test_mod_ssi COMMAND test_mod_ssi)
+add_executable(test_mod_ssi
+	t/test_mod_ssi.c
+	mod_ssi_exprparser.c
+	request.c
+	base64.c
+	buffer.c
+	burl.c
+	array.c
+	chunk.c
+	fdevent.c
+	http-header-glue.c
+	http_cgi.c
+	http_chunk.c
+	http_date.c
+	http_etag.c
+	http_header.c
+	http_kv.c
+	log.c
+	fdlog.c
+	sock_addr.c
+	stat_cache.c
+	fdevent_fdnode.c
+	algo_splaytree.c
+	ck.c
+)
+add_test(NAME test_mod_ssi COMMAND test_mod_ssi)
 
 add_executable(test_mod_staticfile
 	t/test_mod_staticfile.c
@@ -1170,7 +1171,7 @@ endif()
 
 if(HAVE_LIBFAM)
 	target_link_libraries(lighttpd fam)
-	#target_link_libraries(test_mod_ssi fam)
+	target_link_libraries(test_mod_ssi fam)
 	target_link_libraries(test_mod_staticfile fam)
 endif()
 
@@ -1294,8 +1295,8 @@ if(WITH_LIBUNWIND)
 	add_target_properties(test_mod_indexfile COMPILE_FLAGS ${LIBUNWIND_CFLAGS})
 	target_link_libraries(test_mod_simple_vhost ${LIBUNWIND_LDFLAGS})
 	add_target_properties(test_mod_simple_vhost COMPILE_FLAGS ${LIBUNWIND_CFLAGS})
-	#target_link_libraries(test_mod_ssi ${LIBUNWIND_LDFLAGS})
-	#add_target_properties(test_mod_ssi COMPILE_FLAGS ${LIBUNWIND_CFLAGS})
+	target_link_libraries(test_mod_ssi ${LIBUNWIND_LDFLAGS})
+	add_target_properties(test_mod_ssi COMPILE_FLAGS ${LIBUNWIND_CFLAGS})
 	target_link_libraries(test_mod_staticfile ${LIBUNWIND_LDFLAGS})
 	add_target_properties(test_mod_staticfile COMPILE_FLAGS ${LIBUNWIND_CFLAGS})
 	target_link_libraries(test_mod_userdir ${LIBUNWIND_LDFLAGS})

src/Makefile.am

@@ -672,6 +672,8 @@ t_test_mod_indexfile_LDADD = $(LIBUNWIND_LIBS) $(FAM_LIBS)
 t_test_mod_simple_vhost_SOURCES = t/test_mod_simple_vhost.c buffer.c array.c log.c fdlog.c ck.c
 t_test_mod_simple_vhost_LDADD = $(LIBUNWIND_LIBS)
 
+t_test_mod_ssi_CPPFLAGS = -DINCLUDE_MOD_SSI_EXPRPARSER_C
+t_test_mod_ssi_DEPENDENCIES = mod_ssi_exprparser.h
 t_test_mod_ssi_SOURCES = t/test_mod_ssi.c request.c base64.c buffer.c burl.c array.c chunk.c fdevent.c http-header-glue.c http_cgi.c http_chunk.c http_date.c http_etag.c http_header.c http_kv.c log.c fdlog.c sock_addr.c stat_cache.c fdevent_fdnode.c algo_splaytree.c ck.c
 t_test_mod_ssi_LDADD = $(LIBUNWIND_LIBS) $(FAM_LIBS)
 

src/meson.build

@@ -997,6 +997,7 @@ test('test_mod_simple_vhost', executable('test_mod_simple_vhost',
 test('test_mod_ssi', executable('test_mod_ssi',
 	sources: [
 		't/test_mod_ssi.c',
+		ssi_exprparser,
 		'request.c',
 		'base64.c',
 		'buffer.c',

src/t/test_mod_ssi.c

@@ -4,11 +4,14 @@
 #include <sys/types.h>
 #include <assert.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <unistd.h>
 
 #include "mod_ssi.c"
 #include "mod_ssi_expr.c"
+#ifdef INCLUDE_MOD_SSI_EXPRPARSER_C
 #include "mod_ssi_exprparser.c"
+#endif
 #include "fdlog.h"
 
 static void test_mod_ssi_reset (request_st * const r, handler_ctx * const hctx)