From 0122c2cf362d54da220eb9be9c41586914e5b70d Mon Sep 17 00:00:00 2001
From: =?utf-8?q?Ond=C5=99ej=20Va=C5=A1=C3=ADk?= <address@hidden>
Date: Mon, 27 Apr 2009 17:29:53 +0200
Subject: [PATCH] tests: (cp) ensure that -a option doesn't silence --preserve=context

* tests/cp/cp-a-selinux: -a option should not silence error diagnostics
 from --preserve=context (when preserving context is required)
---
 tests/cp/cp-a-selinux |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/tests/cp/cp-a-selinux b/tests/cp/cp-a-selinux
index 8b7cc4d..b1359c0 100755
--- a/tests/cp/cp-a-selinux
+++ b/tests/cp/cp-a-selinux
@@ -78,6 +78,14 @@ cp --preserve=context f g 2> out && fail=1
 # Here, we *do* expect the destination to be empty.
 test -s g && fail=1
 
+rm -f g
+echo > g
+# Check if -a option doesn't silence --preserve=context option diagnostics
+cp -a --preserve=context f g 2> out2 && fail=1
+
+# Here, we *do* expect the destination to be empty.
+test -s g && fail=1
+
 # An alternative to the current approach would be to run in a confined
 # domain (maybe creating/loading it) that lacks the required permissions
 # to the file type.
@@ -87,11 +95,14 @@ test -s g && fail=1
 #   Operation not supported
 sed "s/ .g' to .*//" out > k
 mv k out
+sed "s/ .g' to .*//" out2 > k
+mv k out2
 
 cat <<\EOF > exp || fail=1
 cp: failed to set the security context of
 EOF
 
 compare out exp || fail=1
+compare out2 exp || fail=1
 
 Exit $fail
-- 
1.5.6.1.156.ge903b