first pass at capturing newly introduced warnings

diff --git a/do_build b/do_build
index a49f1b4cb89afc7380499b8f6ea8c12f842aa66d..b002f5ef56b36f662eae9dc76c5d43636acc23aa 100755 (executable)
--- 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 7b13a50edda2ce45e9f706f18bd6cac0d308f016..829340135074150ea93ccb6a35fd7993fe1a6dfb 100755 (executable)
--- 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 06661f9a9af8569ed6b152d95759577d3f85e876..ca55e9fd871202ebf873ae55500de75db6010dfa 100755 (executable)
--- 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 99ffa84f2cb164af13015aaff121539856326e80..bc3ec5fee4a6307e4826f5c873984dcf5344b4f4 100755 (executable)
--- 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
 }