From: Eric Blake <eblake@redhat.com>
Date: Fri, 1 Oct 2010 21:43:23 +0000 (-0600)
Subject: tests: output --version of program under test
X-Git-Tag: v8.6~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4f304d7218b1ffd659684ae287a57beb297f2e7;p=thirdparty%2Fcoreutils.git

tests: output --version of program under test

This touches all new tests added since commit b062bbd9, when
init.cfg was added.  Older tests still exist that could use
conversion, but we can address those later.

* tests/sample-test: Restore hint for --version output.
* tests/misc/stat-birthtime: Include --version if verbose.
* tests/misc/tr-case-class: Likewise.
* tests/misc/stat-mount: Likewise.
* tests/misc/sort-unique: Likewise.
* tests/misc/sort-benchmark-random: Likewise.
Suggested by Jim Meyering.
---

diff --git a/tests/misc/sort-benchmark-random b/tests/misc/sort-benchmark-random
index 3325381158..135534454a 100755
--- a/tests/misc/sort-benchmark-random
+++ b/tests/misc/sort-benchmark-random
@@ -19,6 +19,7 @@
 # Written by Glen Lenker.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
+test "$VERBOSE" = yes && sort --version
 
 very_expensive_
 
diff --git a/tests/misc/sort-unique b/tests/misc/sort-unique
index e186d348a0..e659febd01 100755
--- a/tests/misc/sort-unique
+++ b/tests/misc/sort-unique
@@ -16,12 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if test "$VERBOSE" = yes; then
-  set -x
-  sort --version
-fi
-
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+test "$VERBOSE" = yes && sort --version
 
 cat > in <<\EOF
 1
diff --git a/tests/misc/stat-birthtime b/tests/misc/stat-birthtime
index 38e5d5947c..4490ee8084 100755
--- a/tests/misc/stat-birthtime
+++ b/tests/misc/stat-birthtime
@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
+test "$VERBOSE" = yes && stat --version
 
 # Whether birthtime is supported or not, it better not change even when
 # [acm]time are modified.  :)
diff --git a/tests/misc/stat-mount b/tests/misc/stat-mount
index a99291f6de..039ce50407 100755
--- a/tests/misc/stat-mount
+++ b/tests/misc/stat-mount
@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
+test "$VERBOSE" = yes && stat --version
 
 df_mnt=$(df -P . | sed -n '2s/.* \([^ ]*$\)/\1/p')
 stat_mnt=$(stat -c%m .) || fail=1
diff --git a/tests/misc/tr-case-class b/tests/misc/tr-case-class
index d81c676c3e..14c6b0ea06 100755
--- a/tests/misc/tr-case-class
+++ b/tests/misc/tr-case-class
@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
+test "$VERBOSE" = yes && tr --version
 
 # Ensure we support translation of case classes with extension
 echo '01234567899999999999999999' > exp
diff --git a/tests/sample-test b/tests/sample-test
index 85b779f07c..51408ce8c2 100644
--- a/tests/sample-test
+++ b/tests/sample-test
@@ -17,6 +17,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
+test "$VERBOSE" = yes && FIXME --version
+
 # FIXME: skip_if_root_
 # FIXME: require_root_