[LV-tools-commit] toolchain/scripts compare_buildlog.sh,1.7,1.8

[Jan-Benedict G. <jb...@us...>]

Update of /cvsroot/linux-vax/toolchain/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21013

Modified Files:
	compare_buildlog.sh 
Log Message:
- Rework the way uninteresting stuff is taken out of the log files. The
  actual work is now done in a separate function and no longer duplicated
  at the two places where it used to be.
- Additional statements also take care for the fuzz in build logs when
  checking was requested. The testing framework printed stuff like eg.
  the (daily) bumped version number, which isn't really interesting for
  us, since we only build snapshots (whose checkout-time is about the
  start time of the script, which is put into the last lines of every
  run_test_build run.)


Index: compare_buildlog.sh
===================================================================
RCS file: /cvsroot/linux-vax/toolchain/scripts/compare_buildlog.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- compare_buildlog.sh	3 Mar 2006 08:05:45 -0000	1.7
+++ compare_buildlog.sh	19 Mar 2006 14:55:48 -0000	1.8
@@ -3,13 +3,27 @@
 TEMP1FILE="`_Tempfile`"
 TEMP2FILE="`_Tempfile`"
 
+function cleanup() {
+	sed -e 's/[[:digit:]]\{8\}-[[:digit:]]\{6\}/xxxxxxxx-xxxxxx/g' |
+		sed -e 's#^/tmp/cc......\.s#/tmp/ccXXXXXX.s#' |
+		grep -v 'make.*Nothing to be done for.*all-am' |
+		sed -e 's/\(Test Run By \).*\( on \).*$/\1SOMEUSER\2SOMETIMESTAMP/g' |
+		sed -e 's#^\(\.\./as-new \)[[:digit:]]\{8\}$#\1xxxxxxxx#g' |
+		sed -e 's#^\(.*/binutils/ld/ld-new \)[[:digit:]]\{8\}$#\1xxxxxxxx#g' |
+		sed -e 's#^\(Version .*nm-new \)[[:digit:]]\{8\}#\1xxxxxxxx#g' |
+		sed -e 's#^\(Version .*objcopy \)[[:digit:]]\{8\}#\1xxxxxxxx#g' |
+		sed -e 's#^\(Version .*objdump \)[[:digit:]]\{8\}#\1xxxxxxxx#g' |
+		sed -e 's#^\(Version .*readelf \)[[:digit:]]\{8\}#\1xxxxxxxx#g' |
+		sed -e 's#^\(Version .*size \)[[:digit:]]\{8\}#\1xxxxxxxx#g'
+}
+
 if [ $# -ne 2 ]; then
 	echo "$0 buildlog1 buildlog2" >&2
 	exit 1
 fi
 
-[ -r "${1}" ] && cat "$1" | sed -e 's/[[:digit:]]\{8\}-[[:digit:]]\{6\}/xxxxxxxx-xxxxxx/g' | sed -e 's#^/tmp/cc......\.s#/tmp/ccXXXXXX.s#' | grep -v 'make.*Nothing to be done for.*all-am' > "${TEMP1FILE}"
-[ -r "${2}" ] && cat "$2" | sed -e 's/[[:digit:]]\{8\}-[[:digit:]]\{6\}/xxxxxxxx-xxxxxx/g' | sed -e 's#^/tmp/cc......\.s#/tmp/ccXXXXXX.s#' | grep -v 'make.*Nothing to be done for.*all-am' > "${TEMP2FILE}"
+[ -r "${1}" ] && cat "$1" | cleanup > "${TEMP1FILE}"
+[ -r "${2}" ] && cat "$2" | cleanup > "${TEMP2FILE}"
 
 _Diff "${TEMP1FILE}" "${TEMP2FILE}"