epics/ci-scripts
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

travis: fix for EXTRA with quotes/spaces

Browse Source
This commit is contained in:
Ralph Lange
2020-04-23 17:41:42 +02:00
parent 27f823139a
commit ecb7e43660
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
travis/.travis.yml.example-full
View File

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

4
travis/build.sh
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)
export EPICS_HOST_ARCH
make -j2 $EXTRA
[ -z "$EXTRA" ] && make -j2 || make -j2 "$EXTRA"
ret=0
@@ -21,7 +21,7 @@ if [ "$TEST" != "NO" ]
then
make tapfiles || ret=$?
make -s test-results
make -sk test-results
fi
exit $ret