diff options
| author | Jim Meyering <meyering@redhat.com> | 2011-05-13 18:36:29 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2011-05-13 18:38:52 +0200 |
| commit | 89d542f3d8fc97b3f9c45ad5beee9afdb68da152 (patch) | |
| tree | 5026c2a9ec8bec45b56b405440b1f1aa4f275d01 /tests/du | |
| parent | a085b6fc6c8fa03dac20f01f2f2b64b50b8bdf66 (diff) | |
| download | coreutils-89d542f3d8fc97b3f9c45ad5beee9afdb68da152.tar.xz | |
tests: use skip_test_, not skip_
skip_test_ emits its diagnostic both to FD 9 (tty), and to
FD 2 (usually the log file), whereas init.sh's skip_ emits
only to FD 9. Without that, the log is slightly less useful.
* tests/cp/fiemap-2: Use skip_test_, not skip_.
* tests/cp/fiemap-perf: Likewise.
* tests/du/bigtime: Likewise.
* tests/du/files0-from-dir: Likewise.
* tests/du/move-dir-while-traversing: Likewise.
* tests/init.sh: Likewise.
* tests/misc/sort-stale-thread-mem: Likewise.
* tests/misc/stat-nanoseconds: Likewise.
* tests/mv/i-3: Likewise.
* tests/mv/sticky-to-xpart: Likewise.
* tests/split/filter: Likewise.
Prompted by a report from Pádraig Brady.
Diffstat (limited to 'tests/du')
| -rwxr-xr-x | tests/du/bigtime | 6 | ||||
| -rwxr-xr-x | tests/du/files0-from-dir | 2 | ||||
| -rwxr-xr-x | tests/du/move-dir-while-traversing | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/du/bigtime b/tests/du/bigtime index d665cb820..03f9e76e0 100755 --- a/tests/du/bigtime +++ b/tests/du/bigtime @@ -30,10 +30,10 @@ case "$future_time" in *" $bignum "*) : ;; *' Dec 4 300627798676 '*) - skip_ "file system and localtime both handle big timestamps" ;; + skip_test_ "file system and localtime both handle big timestamps" ;; *) - skip_ "file system or localtime mishandles big time stamps: $future_time" ;; -esac || skip_ "file system cannot represent big time stamps" + skip_test_ "file system or localtime mishandles big time stamps: $future_time" ;; +esac || skip_test_ "file system cannot represent big time stamps" printf "0\t$bignum\tfuture\n" > exp || framework_failure_ printf "du: time $bignum is out of range\n" > err_ok || framework_failure_ diff --git a/tests/du/files0-from-dir b/tests/du/files0-from-dir index fc1e1844c..a72212239 100755 --- a/tests/du/files0-from-dir +++ b/tests/du/files0-from-dir @@ -25,7 +25,7 @@ mkdir dir # In that case, using --files0-from=dir would yield garbage, # interpreting the directory entry as a sequence of # NUL-separated file names. -cat dir > /dev/null && skip_ "cat dir/ succeeds" +cat dir > /dev/null && skip_test_ "cat dir/ succeeds" for prog in du wc; do $prog --files0-from=dir > /dev/null 2>err && fail=1 diff --git a/tests/du/move-dir-while-traversing b/tests/du/move-dir-while-traversing index 68302b8ff..0270389a6 100755 --- a/tests/du/move-dir-while-traversing +++ b/tests/du/move-dir-while-traversing @@ -21,7 +21,7 @@ print_ver_ du # We use a python-inotify script, so... python -m pyinotify -h > /dev/null \ - || skip_ 'python inotify package not installed' + || skip_test_ 'python inotify package not installed' # Move a directory "up" while du is processing its sub-directories. # While du is processing a hierarchy .../B/C/D/... this script |