Updates to QA scrdiff script to keep package configure macros in sync.

2 files changed, 15 insertions, 86 deletions

diff --git a/tools/srcdiff b/tools/srcdiff
index 4ad70bf1..d366f4cb 100755
--- a/tools/srcdiff
+++ b/tools/srcdiff
@@ -73,9 +73,24 @@ sub straightdiff {
 	}
 }
 
+#
+# xfstests directory m4 directory is a repository of all of the
+# custom m4 macros used in the packages we look after.
+#
+sub m4macrodiff {
+	my ( $package ) = @_;
+
+	foreach (`ls cmd/$package/m4/*.m4`) {
+		my $m4 = `basename $_`;
+		chomp($m4);
+		straightdiff $m4, "cmd/$package/m4", "cmd/xfstests/m4";
+	}
+}
+
 my $first = shift @pkglist;
 foreach (@pkglist) {
 	print "\n=== Checking $_ package ===\n";
+	m4macrodiff $_;
 	straightdiff 'buildrules', "cmd/$first/include", "cmd/$_/include";
 	straightdiff 'buildmacros', "cmd/$first/include", "cmd/$_/include";
 	straightdiff 'Makefile', "cmd/$first/build", "cmd/$_/build";
diff --git a/tools/srctest b/tools/srctest
deleted file mode 100644
index 12d3332d..00000000
--- a/tools/srctest
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh -x
-# 
-# Simple script which does the following:
-#	o  Generates a src tarball from a WORKAREA
-#	o  Copies it over to ~/test and unpacks it
-#	o  Generates a src tarball from src tarball
-#	o  Compares the build status' ... reports problems
-#	o  removes ~/test
-# 
-
-package="$1"
-tmpdir="$HOME/test"
-
-if [ -z "$package" ]
-then
-	echo "srctest requires one argument - package name"
-	exit 1
-fi
-
-if [ -z "$WORKAREA" ]
-then
-	echo "WORKAREA is not set -- aborting."
-	exit 1
-fi
-
-if [ -d $tmpdir ]
-then
-	echo "$tmpdir exists already -- aborting."
-	exit 1
-else
-	mkdir $tmpdir
-	if [ ! -d $tmpdir ]
-	then
-		echo "Cannot create $tmpdir -- aborting."
-		exit 1
-	fi
-fi
-
-# 
-# Pleasantries are now out of the way, lets proceed.
-# NB: If something goes wrong we'll leave the unpacked
-# source alone for consumption by a human.
-# 
-
-_cleanup()
-{
-	if [ $status -eq 0 ]
-	then
-		rm -fr $tmpdir
-	else
-		echo "Problem?  -- leaving $tmpdir for inspection"
-	fi
-}
-
-_buildme()
-{
-	cd $1
-
-	if ./Makepkgs
-	then
-		:
-	else
-		echo Makepkgs thinks theres a problem in $1
-		exit 1
-	fi
-
-	if [ ! -f build/$package-*.src.tar.gz ]
-	then
-		echo Makepkgs failed to create build/package-*.src.tar.gz
-		exit 1
-	fi
-}
-
-status=1
-trap "_cleanup; exit \$status" 0 1 2 3 15
-
-# first, build from the WORKAREA
-_buildme $WORKAREA/cmd/$package
-
-cd $tmpdir
-gunzip < $WORKAREA/cmd/$package/build/$package-*.src.tar.gz | tar xf -
-
-# now, cross check the src build
-_buildme $tmpdir/$package-*
-
-status=0