*) test: assume that modules which do not appear in our list of DSO_MODULES

     or MPM_MODULES from configure are statically linked and do not need a load.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1898411 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/pyhttpd/config.ini.in b/test/pyhttpd/config.ini.in
index 81ecee3d436b5908d40ba50a78fa4355347b9833..80cab2ba32547134334aae036a543c862b7d9679 100644 (file)
--- a/test/pyhttpd/config.ini.in
+++ b/test/pyhttpd/config.ini.in
@@ -18,7 +18,7 @@ apachectl = @sbindir@/apachectl
 version = @HTTPD_VERSION@
 name = @progname@
 dso_modules = @DSO_MODULES@
-static_modules = @STATIC_MODULES@
+mpm_modules = @MPM_MODULES@
 
 [test]
 gen_dir = @abs_srcdir@/../gen

diff --git a/test/pyhttpd/env.py b/test/pyhttpd/env.py
index c08320a883413e9949a02bcc9db6178dcaa5aabc..35eb092fd52b7db616419dafff261c002b2d1755 100644 (file)
--- a/test/pyhttpd/env.py
+++ b/test/pyhttpd/env.py
@@ -77,7 +77,8 @@ class HttpdTestSetup:
     def make(self):
         self._make_dirs()
         self._make_conf()
-        if self.env.mpm_module is not None:
+        if self.env.mpm_module is not None \
+                and self.env.mpm_module in self.env.mpm_modules:
             self.add_modules([self.env.mpm_module])
         if self.env.ssl_module is not None:
             self.add_modules([self.env.ssl_module])
@@ -134,10 +135,10 @@ class HttpdTestSetup:
                 mod_path = os.path.join(self.env.libexec_dir, f"mod_{m}.so")
                 if os.path.isfile(mod_path):
                     fd.write(f"LoadModule {m}_module   \"{mod_path}\"\n")
-                elif m in self.env.static_modules:
-                    fd.write(f"#built static: LoadModule {m}_module   \"{mod_path}\"\n")
-                else:
+                elif m in self.env.dso_modules:
                     missing_mods.append(m)
+                else:
+                    fd.write(f"#built static: LoadModule {m}_module   \"{mod_path}\"\n")
                 loaded.add(m)
         if len(missing_mods) > 0:
             raise Exception(f"Unable to find modules: {missing_mods} "
@@ -203,7 +204,7 @@ class HttpdTestEnv:
         self._apachectl_stderr = None
 
         self._dso_modules = self.config.get('httpd', 'dso_modules').split(' ')
-        self._static_modules = self.config.get('httpd', 'static_modules').split(' ')
+        self._mpm_modules = self.config.get('httpd', 'mpm_modules').split(' ')
         self._mpm_module = f"mpm_{os.environ['MPM']}" if 'MPM' in os.environ else 'mpm_event'
         self._ssl_module = self.get_ssl_module()
         if len(self._ssl_module.strip()) == 0:
@@ -337,8 +338,8 @@ class HttpdTestEnv:
         return self._dso_modules
 
     @property
-    def static_modules(self) -> List[str]:
-        return self._static_modules
+    def mpm_modules(self) -> List[str]:
+        return self._mpm_modules
 
     @property
     def server_conf_dir(self) -> str: