diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/tools/scripts/nightly.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh index 8ca8273720..60bd7b90de 100644 --- a/usr/src/tools/scripts/nightly.sh +++ b/usr/src/tools/scripts/nightly.sh @@ -1285,8 +1285,13 @@ fi # Check if we have sufficient data to continue... [[ -v CODEMGR_WS ]] || fatal_error "Error: Variable CODEMGR_WS not set." -[[ -d "${CODEMGR_WS}" ]] || fatal_error "Error: ${CODEMGR_WS} is not a directory." -[[ -f "${CODEMGR_WS}/usr/src/Makefile" ]] || fatal_error "Error: ${CODEMGR_WS}/usr/src/Makefile not found." +if [[ "${NIGHTLY_OPTIONS}" == ~(F)n ]] ; then + # Check if the gate data are valid if we don't do a "bringover" below + [[ -d "${CODEMGR_WS}" ]] || \ + fatal_error "Error: ${CODEMGR_WS} is not a directory." + [[ -f "${CODEMGR_WS}/usr/src/Makefile" ]] || \ + fatal_error "Error: ${CODEMGR_WS}/usr/src/Makefile not found." +fi # # place ourselves in a new task, respecting BUILD_PROJECT if set. @@ -2504,6 +2509,11 @@ if [[ "$O_FLAG" = y && "$CLOSED_IS_PRESENT" != "yes" ]]; then exit 1 fi +# Safeguards +[[ -v CODEMGR_WS ]] || fatal_error "Error: Variable CODEMGR_WS not set." +[[ -d "${CODEMGR_WS}" ]] || fatal_error "Error: ${CODEMGR_WS} is not a directory." +[[ -f "${CODEMGR_WS}/usr/src/Makefile" ]] || fatal_error "Error: ${CODEMGR_WS}/usr/src/Makefile not found." + echo "\n==== Build environment ====\n" | tee -a $build_environ_file >> $LOGFILE # System |