diff --git a/travis/.travis.yml.example-full b/travis/.travis.yml.example-full index 205d59d..e9c2bd1 100644 --- a/travis/.travis.yml.example-full +++ b/travis/.travis.yml.example-full @@ -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) diff --git a/travis/build.sh b/travis/build.sh index f983867..421c59e 100755 --- a/travis/build.sh +++ b/travis/build.sh @@ -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