diff options
| author | Stefan Eissing <icing@apache.org> | 2022-02-25 09:58:48 +0000 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2022-02-25 09:58:48 +0000 |
| commit | b501e09c4ba326e9d006f871383c90a3925f1658 (patch) | |
| tree | 89c42fe7d3f9c18f156e3e49e895aac51febbc15 /test/pyhttpd | |
| parent | 6f01f20be9efd06e242d727d06e5de1113de353d (diff) | |
| download | httpd-b501e09c4ba326e9d006f871383c90a3925f1658.tar.gz | |
*) 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
Diffstat (limited to 'test/pyhttpd')
| -rw-r--r-- | test/pyhttpd/config.ini.in | 2 | ||||
| -rw-r--r-- | test/pyhttpd/env.py | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/test/pyhttpd/config.ini.in b/test/pyhttpd/config.ini.in index 81ecee3d43..80cab2ba32 100644 --- 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 c08320a883..35eb092fd5 100644 --- 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: |