Merge pull request #3378 from airween/v2/testfix

fix: 'make test' is able to run again

Author: airween

tests/Makefile.am

@@ -40,23 +40,26 @@ msc_test_CFLAGS = @APR_CFLAGS@ \
     @LUA_CFLAGS@ \
     @MODSEC_EXTRA_CFLAGS@ \
     @PCRE_CFLAGS@ \
+    @PCRE2_CFLAGS@ \
     @YAJL_CFLAGS@ \
     @SSDEEP_CFLAGS@
-    
+
 msc_test_CPPFLAGS = -I$(top_srcdir)/apache2 \
     @APR_CPPFLAGS@ \
     @CURL_CPPFLAGS@ \
     @LIBXML2_CFLAGS@ \
     @LIBXML2_CPPFLAGS@ \
-    @PCRE_CPPFLAGS@
-    
+    @PCRE_CPPFLAGS@ \
+    @PCRE2_CPPFLAGS@
+
 msc_test_LDADD = @APR_LDADD@ \
     @APU_LDADD@ \
     @CURL_LDADD@ \
     @LIBXML2_CFLAGS@ \
     @LIBXML2_LDADD@ \
     @LUA_LDADD@ \
     @PCRE_LDADD@ \
+    @PCRE2_LDADD@ \
     @YAJL_LDADD@ \
     @SSDEEP_CFLAGS@
 
@@ -67,6 +70,7 @@ msc_test_LDFLAGS = @APR_LDFLAGS@ \
     @LIBXML2_LDFLAGS@ \
     @LUA_LDFLAGS@ \
     @PCRE_LDFLAGS@ \
+    @PCRE2_LDFLAGS@ \
     @YAJL_LDFLAGS@ \
     @SSDEEP_LDFLAGS@
 

tests/msc_test.c

@@ -81,7 +81,7 @@ char DSOLOCAL *real_server_signature = NULL;
 int DSOLOCAL remote_rules_fail_action = REMOTE_RULES_ABORT_ON_FAIL;
 char DSOLOCAL *remote_rules_fail_message = NULL;
 module AP_MODULE_DECLARE_DATA security2_module = {
-    NULL,
+    STANDARD20_MODULE_STUFF,
     NULL,
     NULL,
     NULL,