commit: 275ca5400dfe6266a948da802aa19358b3475f95
Author: Jason Zaman <jason <AT> perfinion <DOT> com>
AuthorDate: Fri Jun 27 12:07:04 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jun 27 12:26:20 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=275ca540
misc/install-xattr: test used a dir that already existed
'f' was used by another test, do the test in a new dir instead
so that there is no chance for a conflict
Signed-off-by: Jason Zaman <jason <AT> perfinion.com>
---
misc/install-xattr/Makefile | 2 +-
misc/install-xattr/checkcopyattrs.sh | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/misc/install-xattr/Makefile b/misc/install-xattr/Makefile
index 7143f3f..0474569 100644
--- a/misc/install-xattr/Makefile
+++ b/misc/install-xattr/Makefile
@@ -14,7 +14,7 @@ install: install-xattr
check: checkcopyattrs.sh install-xattr
$(PWD)/checkcopyattrs.sh
- rm -rf a b c d e f g x y z backup-a* mode-a target-a
target-install-xattr
+ rm -rf a b c d e f g h x y z backup-a* mode-a target-a
target-install-xattr
clean:
rm -f *.o *~ install-xattr
diff --git a/misc/install-xattr/checkcopyattrs.sh
b/misc/install-xattr/checkcopyattrs.sh
index 0249013..9196795 100755
--- a/misc/install-xattr/checkcopyattrs.sh
+++ b/misc/install-xattr/checkcopyattrs.sh
@@ -2,7 +2,7 @@
set -e
touch a b c
-mkdir -p d e f
+mkdir -p d e h
setfattr -n user.foo -v "bar" a
setfattr -n user.bas -v "x" a
setfattr -n user.pax.flags -v "mr" a
@@ -29,12 +29,12 @@ setfattr -n user.pax.flags -v "r" c
# This tests if the src file was inside a directory
# the correct dst location should be f/a. NOT f/d/a.
-./install-xattr d/a f
+./install-xattr d/a h
-[ -x f/a ]
-[ ! -x f/d/a ]
-[ "$(getfattr --only-values -n user.foo f/a)" == "bar" ]
-[ "$(getfattr --only-values -n user.bas f/a)" == "x" ]
+[ -x h/a ]
+[ ! -x h/d/a ]
+[ "$(getfattr --only-values -n user.foo h/a)" == "bar" ]
+[ "$(getfattr --only-values -n user.bas h/a)" == "x" ]
./install-xattr -t e a b c
@@ -87,4 +87,4 @@ setfattr -n user.pax.flags -v "r" c
# set SELinux security context of files and directories
# Okay, let's clean up after ourselves
-rm -rf a b c d e f g x y z backup-a* mode-a target-a target-install-xattr
+rm -rf a b c d e f g h x y z backup-a* mode-a target-a target-install-xattr
