Commit 63fd073e authored by Tom Daley's avatar Tom Daley

Support custom webserver_configtest

parent 22b31ae8
Pipeline #12906 failed with stage
in 9 minutes and 47 seconds
......@@ -40,7 +40,8 @@ def _setup_paths(project_settings):
# then do optional settings
for setting in ['cvs_project', 'cvs_rsh', 'svnuser', 'svnpass', 'test_cmd',
'port', 'user', 'host', 'python_bin', 'webserver_cmd']:
'port', 'user', 'host', 'python_bin', 'webserver_cmd',
'webserver_configtest']:
copy_setting(setting)
# now do settings with defaults
......@@ -1045,6 +1046,11 @@ def webserver_configtest():
'apache_redhat': '/usr/sbin/httpd -S',
'apache_debian': '/usr/sbin/apache2ctl -S',
}
if env.webserver_configtest:
sudo(env.webserver_configtest)
return
if env.webserver:
key = env.webserver + '_' + _linux_type()
if key in tests:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment