From 6faa6645c7a15dbddad859508e1f766bf1cef639 Mon Sep 17 00:00:00 2001
From: Yuri Pankov <ypankov@tintri.com>
Date: Sun, 25 Sep 2022 07:11:58 +0200
Subject: 15012 nightly should fail if tools build failed Reviewed by:
 Alexander Eremin <aeremin@tintri.com> Reviewed by: Guy Morrogh
 <gmorrogh@tintri.com> Reviewed by: Toomas Soome <tsoome@me.com> Approved by:
 Dan McDonald <danmcd@mnx.io>

---
 usr/src/tools/scripts/nightly | 53 ++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 26 deletions(-)

(limited to 'usr/src')

diff --git a/usr/src/tools/scripts/nightly b/usr/src/tools/scripts/nightly
index dc9bbce8d2..03a0b0da0a 100755
--- a/usr/src/tools/scripts/nightly
+++ b/usr/src/tools/scripts/nightly
@@ -378,11 +378,11 @@ function bootstrap_tools {
 }
 
 #
-# Build and install the onbld tools.
+# Build and install the tools.
 #
 # usage: build_tools DESTROOT
 #
-# returns non-zero status if the build was successful.
+# returns zero status if the build was successful.
 #
 function build_tools {
 	DESTROOT=$1
@@ -1633,31 +1633,32 @@ if [[ "$t_FLAG" == "y" ]]; then
 	build_tools ${TOOLS_PROTO}
 	if (( $? != 0 )); then
 		build_ok=n
-	else
-		STABS=${TOOLS_PROTO}/opt/onbld/bin/${MACH}/stabs
-		export STABS
-		CTFSTABS=${TOOLS_PROTO}/opt/onbld/bin/${MACH}/ctfstabs
-		export CTFSTABS
-		GENOFFSETS=${TOOLS_PROTO}/opt/onbld/bin/genoffsets
-		export GENOFFSETS
-
-		CTFCONVERT=${TOOLS_PROTO}/opt/onbld/bin/${MACH}/ctfconvert
-		export CTFCONVERT
-		CTFMERGE=${TOOLS_PROTO}/opt/onbld/bin/${MACH}/ctfmerge
-		export CTFMERGE
-
-		PATH="${TOOLS_PROTO}/opt/onbld/bin/${MACH}:${PATH}"
-		PATH="${TOOLS_PROTO}/opt/onbld/bin:${PATH}"
-		export PATH
-
-		echo "\n==== New environment settings. ====\n" >> $LOGFILE
-		echo "STABS=${STABS}" >> $LOGFILE
-		echo "CTFSTABS=${CTFSTABS}" >> $LOGFILE
-		echo "CTFCONVERT=${CTFCONVERT}" >> $LOGFILE
-		echo "CTFMERGE=${CTFMERGE}" >> $LOGFILE
-		echo "PATH=${PATH}" >> $LOGFILE
-		echo "ONBLD_TOOLS=${ONBLD_TOOLS}" >> $LOGFILE
+		exit 1
 	fi
+
+	STABS=${TOOLS_PROTO}/opt/onbld/bin/${MACH}/stabs
+	export STABS
+	CTFSTABS=${TOOLS_PROTO}/opt/onbld/bin/${MACH}/ctfstabs
+	export CTFSTABS
+	GENOFFSETS=${TOOLS_PROTO}/opt/onbld/bin/genoffsets
+	export GENOFFSETS
+
+	CTFCONVERT=${TOOLS_PROTO}/opt/onbld/bin/${MACH}/ctfconvert
+	export CTFCONVERT
+	CTFMERGE=${TOOLS_PROTO}/opt/onbld/bin/${MACH}/ctfmerge
+	export CTFMERGE
+
+	PATH="${TOOLS_PROTO}/opt/onbld/bin/${MACH}:${PATH}"
+	PATH="${TOOLS_PROTO}/opt/onbld/bin:${PATH}"
+	export PATH
+
+	echo "\n==== New environment settings. ====\n" >> $LOGFILE
+	echo "STABS=${STABS}" >> $LOGFILE
+	echo "CTFSTABS=${CTFSTABS}" >> $LOGFILE
+	echo "CTFCONVERT=${CTFCONVERT}" >> $LOGFILE
+	echo "CTFMERGE=${CTFMERGE}" >> $LOGFILE
+	echo "PATH=${PATH}" >> $LOGFILE
+	echo "ONBLD_TOOLS=${ONBLD_TOOLS}" >> $LOGFILE
 fi
 
 # timestamp the start of the normal build; the findunref tool uses it.
-- 
cgit v1.2.3