From: Jim Meyering <meyering@redhat.com>
Date: Thu, 16 Aug 2012 06:59:27 +0000 (+0200)
Subject: tests: reverse args in Coreutils.pm-invoked diff, for consistency
X-Git-Tag: v8.19~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c98bfa3596c4a9f87b3c07976c47246a8ad8684;p=thirdparty%2Fcoreutils.git

tests: reverse args in Coreutils.pm-invoked diff, for consistency

* tests/Coreutils.pm (_compare_files): Reverse diff arguments so
that we invoke diff -c $expected $actual, which is consistent with
how init.sh-using tests invoke "compare exp out".
---

diff --git a/tests/Coreutils.pm b/tests/Coreutils.pm
index 0c8bb82c46..a0c1bba7dd 100644
--- a/tests/Coreutils.pm
+++ b/tests/Coreutils.pm
@@ -130,14 +130,14 @@ sub _compare_files ($$$$$)
 {
   my ($program_name, $test_name, $in_or_out, $actual, $expected) = @_;
 
-  my $differ = compare ($expected, $actual);
+  my $differ = compare ($actual, $expected);
   if ($differ)
     {
       my $info = (defined $in_or_out ? "std$in_or_out " : '');
       warn "$program_name: test $test_name: ${info}mismatch, comparing "
-        . "$actual (actual) and $expected (expected)\n";
+        . "$expected (expected) and $actual (actual)\n";
       # Ignore any failure, discard stderr.
-      system "diff -c $actual $expected 2>/dev/null";
+      system "diff -c $expected $actual 2>/dev/null";
     }
 
   return $differ;