Make test suite runnable on Debian-likes #118
Conversation
tests/httpd.conf
Outdated
| ${NODEBIAN}LoadModule unixd_module modules/mod_unixd.so | ||
| LoadModule userdir_module modules/mod_userdir.so | ||
| LoadModule version_module modules/mod_version.so | ||
| ${NODEBIAN}LoadModule version_module modules/mod_version.so |
There was a problem hiding this comment.
I think we don't really use those NODEBIAN modules, perhaps we could simply comment those out and simplify it.
There was a problem hiding this comment.
I would prefer that as well, though I'm not sure to what degree they're actually used. I've commented them because they're built-in rather than separate modules on Debian, so they still could be being used there.
There was a problem hiding this comment.
If I comment the modules out, the test suite stops passing on Fedora.
There was a problem hiding this comment.
Oh, sorry then.
Looks fine otherwise.
tests/httpd.conf
Outdated
| ${NODEBIAN}LoadModule unixd_module modules/mod_unixd.so | ||
| LoadModule userdir_module modules/mod_userdir.so | ||
| LoadModule version_module modules/mod_version.so | ||
| ${NODEBIAN}LoadModule version_module modules/mod_version.so |
There was a problem hiding this comment.
Oh, sorry then.
Looks fine otherwise.
tests/magtests.py
Outdated
| distro = "Debian" | ||
| moddir = "/usr/lib/apache2/modules" | ||
| if not os.path.exists(moddir): | ||
| distro = "" |
There was a problem hiding this comment.
The above line seem extra
There was a problem hiding this comment.
Relic of earlier design. Fixed, thanks.
frozencemetery
force-pushed
the
debian_testsuite
branch
from
256eb0d to
5d09188
Compare
tests/magtests.py
Outdated
| 'HTTPPORT': WRAP_HTTP_PORT}) | ||
| 'HTTPPORT': WRAP_HTTP_PORT, | ||
| 'NODEBIAN': "#" if distro == "Debian" else "", | ||
| 'NOFEDORA': "#" if distro == "Fedora" else ""}) |
There was a problem hiding this comment.
Maybe this line isn't needed either (sorry for the broken review).
|
BTW, maybe the LoadModule issue could be also solved with IfModule condition, like: |
frozencemetery
force-pushed
the
debian_testsuite
branch
from
5d09188 to
e7438e9
Compare
This is mostly gunk around how the webserver is called and what is built-in versus a module. I have mostly added templating logic for commenting pieces of the conf file. Signed-off-by: Robbie Harwood <rharwood@redhat.com>
`make test` continues to be provided for compatibility. Signed-off-by: Robbie Harwood <rharwood@redhat.com>
frozencemetery
force-pushed
the
debian_testsuite
branch
from
e7438e9 to
4d031fe
Compare
|
Isaac Boukris <notifications@github.com> writes:
BTW, maybe the LoadModule issue could be also solved with IfModule
condition
I like that. Pushed new version.
I've also added a commit to allow `make check` to run the test suite.
|
2 participants
This is mostly gunk around how the webserver is called and what is
built-in versus a module. I have mostly added templating logic for
commenting pieces of the conf file.
Signed-off-by: Robbie Harwood rharwood@redhat.com
Right now, master is not passing the test suite on all systems (see #117), so this should perhaps wait to merge.
@tjaalton, this may be relevant to your interests.