From: Jim Meyering <jim@meyering.net>
Date: Fri, 13 Oct 2006 15:25:37 +0000 (+0000)
Subject: * src/du-tests: Clean up a little, though it's still not portable.
X-Git-Tag: COREUTILS-6_4~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8552234cb58fa8bb17a3ee53ee4bfafd5d2e1ec1;p=thirdparty%2Fcoreutils.git

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

diff --git a/ChangeLog b/ChangeLog
index f41885552a..021f692764 100644
--- 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 21b586a0cd..4fffc9f398 100755
--- 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