From 28488c12146daad269c4a57c2000231d5f5781e0 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 21 May 2010 14:55:36 +0200 Subject: [PATCH] tests: fix cp-a-selinux to skip cleanly upon mkfs failure * tests/cp/cp-a-selinux: Initialize skip, to avoid a syntax error in subsequent "test". Remove redirect-to-/dev/null, now that output is always to a log file. --- tests/cp/cp-a-selinux | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/cp/cp-a-selinux b/tests/cp/cp-a-selinux index b65070a..cff8731 100755 --- a/tests/cp/cp-a-selinux +++ b/tests/cp/cp-a-selinux @@ -45,10 +45,9 @@ test -s err && fail=1 #there must be no stderr output for -a ls -Z e | grep $ctx || fail=1 ls -Z f | grep $ctx || fail=1 - +skip=0 # Create a file system, then mount it with the context=... option. -dd if=/dev/zero of=blob bs=8192 count=200 > /dev/null 2>&1 \ - || skip=1 +dd if=/dev/zero of=blob bs=8192 count=200 || skip=1 mkdir mnt || skip=1 mkfs -t ext2 -F blob || skip_test_ "failed to create an ext2 file system" -- 2.7.4