#
# NB: to cross check that srcdiff is finding all the functions in the
# user source file, providing you have "mkproto" installed, you
-# can "cd cmd/xfsprogs/libxfs" and cut&paste this in a bourne shell:
+# can "cd xfsprogs/libxfs" and cut&paste this in a bourne shell:
# $ for file in xfs_*.c; do
# > mkproto -nps < $file | perl -ne '
# > END { print " $count\t- " }
#
die "WORKAREA not set" unless defined $ENV{'WORKAREA'};
+die "KWORKAREA not set" unless defined $ENV{'KWORKAREA'};
chdir $ENV{'WORKAREA'};
+my $kworkarea = $ENV{'KWORKAREA'};
my $xdiff = $ENV{'XDIFF'};
-my $quiet=0;
-my $usage=0;
+my $quiet = 0;
+my $usage = 0;
foreach (@ARGV) {
if (/^-q$/) {
xfs_imap.h xfs_ialloc_btree.h xfs_inode.h xfs_inode_item.h
xfs_inum.h xfs_log.h xfs_log_priv.h xfs_log_recover.h
xfs_mount.h xfs_quota.h xfs_rtalloc.h
- xfs_sb.h xfs_trans.h xfs_trans_space.h xfs_types.h
- xfs_fs.h xfs_acl.h xfs_cap.h xfs_mac.h
+ xfs_sb.h xfs_trans.h xfs_trans_space.h xfs_types.h xfs_fs.h
);
sub straightdiff {
`diff $prefix1/$file $prefix2/$file >/dev/null 2>&1`;
if (!$quiet) {
print sprintf("\t%-35s ... ", $file);
- if ($? != 0) { print "FAILED\n"; }
+ if ($? != 0) { printf("FAILED\n(%s/%s differs to %s/%s)\n",
+ $prefix1, $file, $prefix2, $file); }
else { print "ok\n"; }
- } elsif ($? != 0) {
- printf("\t%-35s ... ", $file);
- print "FAILED\n";
+
+ } elsif ($? != 0) {
+ printf("\t%-35s ... FAILED\n(%s/%s differs to %s/%s)\n",
+ $file, $prefix1, $file, $prefix2, $file);
}
}
sub m4macrodiff {
my ( $package ) = @_;
- foreach (`ls cmd/$package/m4/*.m4`) {
+ foreach (`ls $package/m4/*.m4`) {
my $m4 = `basename $_`;
chomp($m4);
- straightdiff $m4, "cmd/$package/m4", "cmd/xfstests/m4";
+ straightdiff $m4, "$package/m4", "xfstests/m4";
}
}
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";
- straightdiff 'Makefile', "cmd/$first/build/rpm", "cmd/$_/build/rpm";
- straightdiff 'Makefile', "cmd/$first/build/tar", "cmd/$_/build/tar";
+ straightdiff 'buildrules', "$first/include", "$_/include";
+ straightdiff 'buildmacros', "$first/include", "$_/include";
+ straightdiff 'Makefile', "$first/build", "$_/build";
+ straightdiff 'Makefile', "$first/build/rpm", "$_/build/rpm";
+ straightdiff 'Makefile', "$first/build/tar", "$_/build/tar";
}
print "\n=== Checking headers ===\n";
foreach (@difflist) {
- straightdiff $_, 'cmd/xfsprogs/include', 'linux/fs/xfs';
+ straightdiff $_, 'xfsprogs/include', "$kworkarea/fs/xfs";
}
-straightdiff 'dmapi_kern.h', 'cmd/dmapi/include', 'linux/fs/xfs/dmapi';
-straightdiff 'dmapi.h', 'cmd/dmapi/include', 'linux/fs/xfs/dmapi';
+straightdiff 'dmapi_kern.h', 'dmapi/include', "$kworkarea/fs/xfs/dmapi";
+straightdiff 'dmapi.h', 'dmapi/include', "$kworkarea/fs/xfs/dmapi";
#
# setstate
print "( Total: $count routine$plural checked in $file )\n" unless ($quiet);
}
-# cmd/xfsprogs/{libxfs,libxlog}/* fs/xfs/*
+# xfsprogs/{libxfs,libxlog}/* fs/xfs/*
my @funclist = qw(
xfs_alloc.c xfs_alloc_btree.c xfs_attr_leaf.c
xfs_bmap.c xfs_bmap_btree.c xfs_btree.c xfs_da_btree.c
print "\n=== Checking libxfs code ===\n";
foreach (@funclist) {
- functiondiff $_, 'cmd/xfsprogs/libxfs', 'linux/fs/xfs';
+ functiondiff $_, 'xfsprogs/libxfs', "$kworkarea/fs/xfs";
}
print "\n=== Checking libxlog code ===\n";
-functiondiff 'xfs_log_recover.c', 'cmd/xfsprogs/libxlog', 'linux/fs/xfs';
+functiondiff 'xfs_log_recover.c', 'xfsprogs/libxlog', "$kworkarea/fs/xfs";