Skip to content

Commit 9ee46b4

Browse files
authored
Merge pull request #25923 from rfan1/apache2_prefork
Fix prefork modules' path for Apache test on sle16.1
2 parents f8c339d + 62bc3d3 commit 9ee46b4

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

tests/console/apache.pm

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,10 @@ sub run {
144144
assert_script_run q{sed -ie 's/^User daemon$/User wwwrun/' /tmp/prefork/httpd.conf};
145145
assert_script_run q{sed -ie 's/^Group daemon$/Group www/' /tmp/prefork/httpd.conf};
146146

147+
# https://bugzilla.suse.com/show_bug.cgi?id=1265305
148+
# modules for prefork reside in /usr/lib64/apache2-prefork now on sle16.1
149+
assert_script_run q{sed -i 's#/usr/lib64/apache2#/usr/lib64/apache2-prefork#g' /tmp/prefork/httpd.conf} if is_sle('>=16.1');
150+
147151
# Run and test this new environment
148152
assert_script_run 'httpd-prefork -f /tmp/prefork/httpd.conf';
149153
assert_script_run 'until ps aux|grep wwwrun|grep -E httpd\(2\)?-prefork; do echo waiting for httpd-prefork pid; done';

0 commit comments

Comments
 (0)