* src/du-tests: Clean up a little, though it's still not portable.

diff --git a/ChangeLog b/ChangeLog
index f41885552aaccb086ea5b37b4212d77b85d8f59e..021f6927643fbc19455d8b42f882922ddc403cef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-10-13  Jim Meyering  <jim@meyering.net>
 
+       * src/du-tests: Clean up a little, though it's still not portable.
+
        * .vg-suppressions: Add 3 more for debian unstable.
 
        * tests/ls/Test.pm: Remove long-unused file.

diff --git a/src/du-tests b/src/du-tests
index 21b586a0cd6e10d36f27af66a400bf675080cc3a..4fffc9f398c08fdcef5322747e965788115cbd4a 100755 (executable)
--- a/src/du-tests
+++ b/src/du-tests
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,11 +18,17 @@
 
 cat - <<\EOF > /dev/null
 Invoke e.g., like this
-DU1=du-4.5.2 DU2=du ./du-tests
+VG_PATH_PREFIX=/cu/src/vg: DU1=/cu/src/du DU2=/usr/bin/du ./du-tests
+Where /cu/src/vg/du is a valgrind wrapper around du,
+and DU1 refers to the just-built du binary you want to test.
 EOF
 
-test -x "$DU1" || { echo DU1 envvar not set; exit 1; }
-test -x "$DU2" || { echo DU2 envvar not set; exit 1; }
+test -z "$DU1" && { echo DU1 envvar not set 1>&2; exit 1; }
+test -z "$DU2" && { echo DU2 envvar not set 1>&2; exit 1; }
+
+test -x "$DU1" || { echo $DU1 not executable 1>&2; exit 1; }
+test -x "$DU2" || { echo $DU2 not executable 1>&2; exit 1; }
+
 # Expects $DU1 and $DU2 to be the binaries to compare.
 d1=$(mktemp -d)
 cp -a $DU1 $d1/du
@@ -47,6 +53,6 @@ for args in  \
   ; do
   echo Args: $args ======================
   diff -u --label=$DU1 --label=$DU2 \
-    <(PATH=$d1 du $args 2>&1) <(PATH=$d2 du $args 2>&1)
+    <(PATH=$VG_PATH_PREFIX$d1 du $args 2>&1) <(PATH=$d2 du $args 2>&1)
 done
 rm -rf $d1 $d2