VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-01 16:41:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor CI changes:

Browse Source 
- Add --enable-reduced-exports test.
- test running apachectl -V in the TEST_INSTALL case
- test running httpd -V in the SKIP_TESTING case
- rejig to exit if SKIP_TESTING, un-nest the if block around testing
  (no functional change from this part)

Github: closes #405


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915513 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2024-02-01 15:34:22 +00:00
parent aa1476072e
commit c76ebdba43
2 changed files with 203 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/linux.yml vendored
View File

@ -248,6 +248,11 @@ jobs:
TEST_INSTALL=1 TEST_INSTALL=1
TEST_MOD_TLS=1 TEST_MOD_TLS=1
CLEAR_CACHE=1 CLEAR_CACHE=1
- name: Configured w/reduced exports
config: --enable-reduced-exports --enable-maintainer-mode
env: |
SKIP_TESTING=1
TEST_INSTALL=1
# ------------------------------------------------------------------------- # -------------------------------------------------------------------------
### TODO if: *condition_not_24x ### TODO if: *condition_not_24x
### TODO: Fails because :i386 packages are not being found. ### TODO: Fails because :i386 packages are not being found.

16
test/travis_run_linux.sh
View File

@ -86,6 +86,8 @@ make $MFLAGS
if test -v TEST_INSTALL; then if test -v TEST_INSTALL; then
make install make install
pushd $PREFIX pushd $PREFIX
# Basic sanity tests of the installed server.
./bin/apachectl -V
test `./bin/apxs -q PREFIX` = $PREFIX test `./bin/apxs -q PREFIX` = $PREFIX
test `$PWD/bin/apxs -q PREFIX` = $PREFIX test `$PWD/bin/apxs -q PREFIX` = $PREFIX
./bin/apxs -g -n foobar ./bin/apxs -g -n foobar
@ -93,7 +95,18 @@ if test -v TEST_INSTALL; then
popd popd
fi fi
if ! test -v SKIP_TESTING; then if test -v SKIP_TESTING; then
# Check that httpd was built successfully, nothing more.
./httpd -V
exit 0
fi
###############################################################
### Everything below is only run if SKIP_TESTING was not set ##
###############################################################
: Running tests...
set +e set +e
RV=0 RV=0
@ -302,4 +315,3 @@ if ! test -v SKIP_TESTING; then
done done
exit $RV exit $RV
fi