1 Commits

Author SHA1 Message Date
Ralph Lange
ecb7e43660 travis: fix for EXTRA with quotes/spaces 2020-04-23 17:43:21 +02:00
2 changed files with 3 additions and 2 deletions

View File

@@ -53,6 +53,7 @@ script:
# SET source setup file # SET source setup file
# ADD_MODULES extra modules (for a specific job) # ADD_MODULES extra modules (for a specific job)
# EXTRA content will be added to make command line # EXTRA content will be added to make command line
# (embedded quotes must be escaped as \\\")
# STATIC set to YES for static build (default: NO) # STATIC set to YES for static build (default: NO)
# TEST set to NO to skip running the tests (default: YES) # TEST set to NO to skip running the tests (default: YES)
# VV set to make build scripts verbose (default: unset) # VV set to make build scripts verbose (default: unset)

View File

@@ -13,7 +13,7 @@ export EPICS_BASE
[ -z "$EPICS_HOST_ARCH" -a -f $EPICS_BASE/startup/EpicsHostArch.pl ] && EPICS_HOST_ARCH=$(perl $EPICS_BASE/startup/EpicsHostArch.pl) [ -z "$EPICS_HOST_ARCH" -a -f $EPICS_BASE/startup/EpicsHostArch.pl ] && EPICS_HOST_ARCH=$(perl $EPICS_BASE/startup/EpicsHostArch.pl)
export EPICS_HOST_ARCH export EPICS_HOST_ARCH
make -j2 $EXTRA [ -z "$EXTRA" ] && make -j2 || make -j2 "$EXTRA"
ret=0 ret=0
@@ -21,7 +21,7 @@ if [ "$TEST" != "NO" ]
then then
make tapfiles || ret=$? make tapfiles || ret=$?
make -s test-results make -sk test-results
fi fi
exit $ret exit $ret