From 289ab26c1f6db8510ca7537e53417ffd1b7a1a08 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 26 May 2016 15:01:21 +1000
Subject: [PATCH] first pass at capturing newly introduced warnings

---
 do_build          | 35 +++++++++++++++++++++++++++++++++++
 do_merge          |  2 +-
 merge_akpm        |  4 ++--
 merge_old_version |  2 +-
 4 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/do_build b/do_build
index a49f1b4..b002f5e 100755
--- a/do_build
+++ b/do_build
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+tree=
+if [ "$1" ]; then
+	tree=$1
+	shift
+fi
+
 tools_dir=$(dirname "$0")
 . "$tools_dir/common.sh"
 
@@ -7,6 +13,20 @@ set -e
 
 bparent=$(dirname "$build_dir")
 
+line="$(tail -n 1 $SHA1_FILE)"
+
+# strip everything after the first tab character
+stree=${line%%	*}
+if [ "$tree" ]; then
+	[ "$tree" = "$stree" ] || {
+		echo "That is not the last tree merged ($tree v $stree)" 1>&2
+		exit 1
+	}
+else
+	tree="$stree"
+fi
+obdir="$bparent/old/$tree"
+
 cmd="/bin/sh"
 [ "$build_host" ] &&
 	cmd="ssh root@$build_host unshare -n su $(id -u -n)"
@@ -26,6 +46,8 @@ $cmd <<-EOF
 	git reset --hard next || exit 1
 	touch .scmversion || exit 1
 
+	[ -d "$obdir" ] || mkdir -p "$obdir" || exit 1
+
 	echo Building: x86_64 allmodconfig
 	d="$bparent/x86_64_allmodconfig"
 	[ -d \$d ] || mkdir \$d || exit 1
@@ -141,5 +163,18 @@ $cmd <<-EOF
 		cat \$log_x86
 	fi
 
+	for i in \$log_x86 \$log_ppc \$log_arm \$log_perf; do
+		b=\$(basename \$i)
+		if [ -f $obdir/\$b ]; then
+			if [ \$(wc -l <$obdir/\$b) -ne \$(wc -l <\$i) ]; then
+				echo "=================================================="
+				echo " log \$i changed number of lines"
+				echo "=================================================="
+				diff -u $obdir/\$b \$i 2>&1 | less
+			fi
+		fi
+		mv \$i $obdir/\$b
+	done
+
 	rm .scmversion
 EOF
diff --git a/do_merge b/do_merge
index 7b13a50..8293401 100755
--- a/do_merge
+++ b/do_merge
@@ -191,7 +191,7 @@ for h in $heads; do
 			bash -i || exit
 		}
 	}
-	"$bin_dir/do_build" || {
+	"$bin_dir/do_build" "$tree" || {
 		echo Build failed 1>&2
 		notify-send -t 0 -u critical "linux-next build failed for $tree!"
 		pushover "linux-next build failed for $tree!"
diff --git a/merge_akpm b/merge_akpm
index 06661f9..ca55e9f 100755
--- a/merge_akpm
+++ b/merge_akpm
@@ -68,7 +68,7 @@ $no_build ||
 		echo git push failed 1>&2
 		bash -i || exit
 	}
-	"$bin_dir/do_build" || {
+	"$bin_dir/do_build" akpm-current || {
 		echo Build failed 1>&2
 		bash -i || exit
 	}
@@ -128,7 +128,7 @@ $no_build ||
 		echo git push failed 1>&2
 		bash -i || exit
 	}
-	"$bin_dir/do_build" || {
+	"$bin_dir/do_build" akpm || {
 		echo Build failed 1>&2
 		bash -i || exit
 	}
diff --git a/merge_old_version b/merge_old_version
index 99ffa84..bc3ec5f 100755
--- a/merge_old_version
+++ b/merge_old_version
@@ -100,7 +100,7 @@ git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next |
 	bash -i || exit
 }
 
-"$bin_dir/do_build" || {
+"$bin_dir/do_build" "$tree" || {
 	echo Build failed 1>&2
 	bash -i || exit
 }
-- 
2.39.2