Merge pull request #2451 from rgerhards/travis-require-mac

Travis: "tactical" modifications
This commit is contained in:
Rainer Gerhards 2018-01-31 11:34:57 +01:00 committed by GitHub
commit 5c35bdd632
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions

View File

@ -26,7 +26,7 @@ matrix:
# this feature is used for multiple build matrix entries
#- env: RUN="docker-alpine.sh"
#- env: RUN="docker-ubuntu-devel.sh"
- env: RUN="run-osx.sh", CFLAGS="-g"
#- env: RUN="run-osx.sh", CFLAGS="-g"
exclude:
- compiler: "gcc"

View File

@ -395,8 +395,10 @@ TESTS += \
endif
if ENABLE_OMPROG
# see https://github.com/rsyslog/rsyslog/issues/2403
# TODO: re-enable!
# omprog-cleanup.sh
TESTS += \
omprog-cleanup.sh \
omprog-cleanup-with-outfile.sh \
omprog-noterm-cleanup.sh \
omprog-noterm-default.sh \