From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Jan 2017 22:39:30 +0000 (+1100)
Subject: merge sanitise_log into do_build
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;ds=sidebyside;h=107dc93fabd33b6a0d67b760841f60066be63036;p=next-scripts

merge sanitise_log into do_build

don't actually modify the logs
---

diff --git a/do_build b/do_build
index a63a9fb..918fef9 100755
--- a/do_build
+++ b/do_build
@@ -48,6 +48,17 @@ $cmd <<-EOF
 
 	[ -d "$obdir" ] || mkdir -p "$obdir" || exit 1
 
+	sanitise_log() {
+		sed -r '
+/^[.[:digit:]]+user [.[:digit:]]+system [:.[:digit:]]+elapsed [[:digit:]]+%CPU \([[:digit:]]+avgtext\+[[:digit:]]+avgdata [[:digit:]]+maxresident\)k$/d
+/^[[:digit:]]+inputs\+[[:digit:]]+outputs \([[:digit:]]+major\+[[:digit:]]+minor\)pagefaults [[:digit:]]+swaps$/d
+/^Setup is [[:digit:]]+ bytes \(padded to [[:digit:]]+ bytes\)\.$/d
+/^System is [[:digit:]]+ kB$/d
+/^CRC [[:xdigit:]]+$/d
+/^Kernel: arch\/x86\/boot\/bzImage is ready  \(#[[:digit:]]+\)$/d
+' | grep -vxFf $bparent/log-ignore
+	}
+
 	show_log() {
 		arch=\$1
 		conf=\$2
@@ -59,11 +70,11 @@ $cmd <<-EOF
 		echo " \$arch \$conf build OK - log follows"
 		echo "\$sep"
 		cat \$log
-		$tools_dir/sanitise_log \$log >\$log.san
-		mv -f \$log.san \$log
 		b=\$(basename \$log)
 		if [ -f $obdir/\$b ]; then
-			if [ \$(wc -l <$obdir/\$b) -lt \$(grep -v -x -F -f $bparent/log-ignore <\$log | wc -l) ]; then
+			olen=\$(sanitise_log $obdir/\$b | wc -l)
+			len=\$(sanitise_log \$log | wc -l)
+			if [ \$olen -lt \$len ]; then
 				echo "\$sep"
 				echo " log \$b increased number of lines"
 				echo "\$sep"
diff --git a/sanitise_log b/sanitise_log
deleted file mode 100755
index 5765893..0000000
--- a/sanitise_log
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sed -rf
-
-/^[.[:digit:]]+user [.[:digit:]]+system [:.[:digit:]]+elapsed [[:digit:]]+%CPU \([[:digit:]]+avgtext\+[[:digit:]]+avgdata [[:digit:]]+maxresident\)k$/d
-/^[[:digit:]]+inputs\+[[:digit:]]+outputs \([[:digit:]]+major\+[[:digit:]]+minor\)pagefaults [[:digit:]]+swaps$/d
-/^Setup is [[:digit:]]+ bytes \(padded to [[:digit:]]+ bytes\)\.$/d
-/^System is [[:digit:]]+ kB$/d
-/^CRC [[:xdigit:]]+$/d
-/^Kernel: arch\/x86\/boot\/bzImage is ready  \(#[[:digit:]]+\)$/d