X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=blobdiff_plain;f=tools%2Fsrcdiff;h=ed3f25313a6515913a0cb930a33dc397ed82cba7;hp=7638dc731febf67a5411f0944d7ab927f4a8ca25;hb=3ef12e382456faea5ff49d4261685d377f4fcab7;hpb=1f43ad9a0f4a520255d0efb6745977faca7b4196

diff --git a/tools/srcdiff b/tools/srcdiff
index 7638dc73..ed3f2531 100755
--- a/tools/srcdiff
+++ b/tools/srcdiff
@@ -20,7 +20,7 @@ use strict;
 #     > s/^.* (xfs\w+|\*xfs\w+|xlog\w+|\*xlog\w+) \(.*/\1/ && { $count++ }'
 #     > echo $file
 #     > done
-# (compare this to "srcdiff | fgrep Total:") ... repeat for logprint.
+# (compare this to "srcdiff | fgrep Total:")
 # 
 
 die "WORKAREA not set" unless defined $ENV{'WORKAREA'};
@@ -30,12 +30,12 @@ my $quiet=0;
 my $usage=0;
 
 foreach (@ARGV) {
-    if (/^-q$/) {
-        $quiet++;
-    } else {
-        print STDERR "Illegal option $_\n";
-        $usage++;
-    }
+	if (/^-q$/) {
+		$quiet++;
+	} else {
+		print STDERR "Illegal option $_\n";
+		$usage++;
+	}
 }
 
 if ($usage) {
@@ -43,6 +43,7 @@ if ($usage) {
     exit 1;
 }
 
+my @pkglist = qw( attr acl dmapi xfsdump xfsprogs );
 my @difflist = qw(
 	xfs_ag.h  xfs_alloc.h  xfs_alloc_btree.h xfs_arch.h
 	xfs_attr_leaf.h  xfs_attr_sf.h  xfs_bit.h  xfs_bmap.h
@@ -62,28 +63,32 @@ sub straightdiff {
 	my ( $file, $prefix1, $prefix2 ) = @_;
 
 	`diff $prefix1/$file $prefix2/$file >/dev/null 2>&1`;
-        if (!$quiet) {
-	    print sprintf("\t%-35s ... ", $file);
-	    if ($? != 0)	{ print "FAILED\n"; }
-	    else		{ print "ok\n"; }
-        } elsif ($? != 0) { 
+	if (!$quiet) {
+		print sprintf("\t%-35s ... ", $file);
+		if ($? != 0)	{ print "FAILED\n"; }
+		else		{ print "ok\n"; }
+	} elsif ($? != 0) { 
 	        printf("\t%-35s ... ", $file);
-                print "FAILED\n"; 
-        }
+		print "FAILED\n"; 
+	}
 }
 
+my $first = shift @pkglist;
+foreach (@pkglist) {
+	print "\n=== Checking $_ package ===\n";
+	straightdiff 'buildrules', "cmd/$first/include", "cmd/$_/include";
+	straightdiff 'buildmacros', "cmd/$first/include", "cmd/$_/include";
+}
 print "\n=== Checking headers ===\n";
 foreach (@difflist) {
 	straightdiff $_, 'cmd/xfsprogs/include', 'linux/fs/xfs';
 }
 straightdiff 'xfs_cred.h', 'cmd/xfsprogs/include', 'linux/fs/xfs/linux';
 straightdiff 'xfs_fs.h', 'cmd/xfsprogs/include', 'linux/include/linux';
-straightdiff 'attr_kern.h', 'cmd/attr/include', 'linux/fs/xfs/linux';
-straightdiff 'attributes.h', 'cmd/attr/include', 'linux/include/linux';
 straightdiff 'dmapi_kern.h', 'cmd/dmapi/include', 'linux/include/linux';
 straightdiff 'dmapi.h', 'cmd/dmapi/include', 'linux/include/linux';
-straightdiff 'arch.h', 'cmd/xfsprogs/include', 'linux/fs/xfs_support';
-straightdiff 'xqm.h', 'cmd/xfsprogs/include', 'linux/include/linux';
+straightdiff 'arch.h', 'cmd/xfsprogs/include', 'linux/fs/xfs/support';
+straightdiff 'quotaio_xfs.h', 'cmd/xfsdump/include', 'linux/include/linux';
 
 # 
 # setstate