From 5116103826c1776be0661bd591acd08fbefe9767 Mon Sep 17 00:00:00 2001
From: Pádraig Brady <P@draigBrady.com>
Date: Tue, 10 May 2011 08:14:16 +0100
Subject: tests: refactor more tests to use mkfifo_or_skip_

* tests/cp/existing-perm-race: s/mkfifo/mkfifo_or_skip_/
* tests/cp/file-perm-race: Likewise.
* tests/cp/parent-perm-race: Likewise.
* tests/cp/special-f: Likewise.
* tests/dd/reblock: Likewise.
* tests/ls/file-type: Likewise.
* tests/misc/cat-buf: Likewise.
* tests/misc/mknod: Likewise.
* tests/misc/printf-surprise: Likewise.
* tests/misc/selinux: Likewise.
* tests/misc/sort-spinlock-abuse: Likewise.
* tests/misc/stdbuf: Likewise.
* tests/misc/tac-continue: Likewise.
* tests/init.cfg: Improve the error message when skipping.
---
 tests/cp/existing-perm-race | 3 +--
 tests/cp/file-perm-race     | 3 +--
 tests/cp/parent-perm-race   | 3 +--
 tests/cp/special-f          | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'tests/cp')

diff --git a/tests/cp/existing-perm-race b/tests/cp/existing-perm-race
index 6afe1a2fa..a2a6493fa 100755
--- a/tests/cp/existing-perm-race
+++ b/tests/cp/existing-perm-race
@@ -30,8 +30,7 @@ g2=$2
 
 
 umask 077
-mkfifo fifo ||
-  skip_test_ "fifos not supported"
+mkfifo_or_skip_ fifo
 
 touch fifo-copy &&
 chgrp $g1 fifo &&
diff --git a/tests/cp/file-perm-race b/tests/cp/file-perm-race
index 1e84b1eb5..41f01efce 100755
--- a/tests/cp/file-perm-race
+++ b/tests/cp/file-perm-race
@@ -23,8 +23,7 @@ print_ver_ cp
 require_local_dir_
 
 umask 022
-mkfifo fifo ||
-  skip_test_ "fifos not supported"
+mkfifo_or_skip_ fifo
 
 # Copy a fifo's contents.  That way, we can examine the
 # destination permissions before they're finalized.
diff --git a/tests/cp/parent-perm-race b/tests/cp/parent-perm-race
index 4af3b69d0..366efbaa7 100755
--- a/tests/cp/parent-perm-race
+++ b/tests/cp/parent-perm-race
@@ -29,8 +29,7 @@ chmod g+s d 2>/dev/null # The cp test is valid either way.
 
 for attr in mode ownership
 do
-  mkfifo $attr/fifo ||
-    skip_test_ "fifos not supported"
+  mkfifo_or_skip_ $attr/fifo
 
   # Copy a fifo's contents.  That way, we can examine d/$attr's
   # state while cp is running.
diff --git a/tests/cp/special-f b/tests/cp/special-f
index fb7550077..3f63921f1 100755
--- a/tests/cp/special-f
+++ b/tests/cp/special-f
@@ -20,8 +20,8 @@
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 print_ver_ cp
 
-mkfifo fifo ||
-  skip_test_ "fifos not supported"
+mkfifo_or_skip_ fifo
+
 touch e || framework-failure
 
 
-- 
cgit v1.2.3-54-g00ecf