| 1 |
commit: 275ca5400dfe6266a948da802aa19358b3475f95 |
| 2 |
Author: Jason Zaman <jason <AT> perfinion <DOT> com> |
| 3 |
AuthorDate: Fri Jun 27 12:07:04 2014 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 27 12:26:20 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=275ca540 |
| 7 |
|
| 8 |
misc/install-xattr: test used a dir that already existed |
| 9 |
|
| 10 |
'f' was used by another test, do the test in a new dir instead |
| 11 |
so that there is no chance for a conflict |
| 12 |
|
| 13 |
Signed-off-by: Jason Zaman <jason <AT> perfinion.com> |
| 14 |
|
| 15 |
--- |
| 16 |
misc/install-xattr/Makefile | 2 +- |
| 17 |
misc/install-xattr/checkcopyattrs.sh | 14 +++++++------- |
| 18 |
2 files changed, 8 insertions(+), 8 deletions(-) |
| 19 |
|
| 20 |
diff --git a/misc/install-xattr/Makefile b/misc/install-xattr/Makefile |
| 21 |
index 7143f3f..0474569 100644 |
| 22 |
--- a/misc/install-xattr/Makefile |
| 23 |
+++ b/misc/install-xattr/Makefile |
| 24 |
@@ -14,7 +14,7 @@ install: install-xattr |
| 25 |
|
| 26 |
check: checkcopyattrs.sh install-xattr |
| 27 |
$(PWD)/checkcopyattrs.sh |
| 28 |
- rm -rf a b c d e f g x y z backup-a* mode-a target-a target-install-xattr |
| 29 |
+ rm -rf a b c d e f g h x y z backup-a* mode-a target-a target-install-xattr |
| 30 |
|
| 31 |
clean: |
| 32 |
rm -f *.o *~ install-xattr |
| 33 |
|
| 34 |
diff --git a/misc/install-xattr/checkcopyattrs.sh b/misc/install-xattr/checkcopyattrs.sh |
| 35 |
index 0249013..9196795 100755 |
| 36 |
--- a/misc/install-xattr/checkcopyattrs.sh |
| 37 |
+++ b/misc/install-xattr/checkcopyattrs.sh |
| 38 |
@@ -2,7 +2,7 @@ |
| 39 |
set -e |
| 40 |
|
| 41 |
touch a b c |
| 42 |
-mkdir -p d e f |
| 43 |
+mkdir -p d e h |
| 44 |
setfattr -n user.foo -v "bar" a |
| 45 |
setfattr -n user.bas -v "x" a |
| 46 |
setfattr -n user.pax.flags -v "mr" a |
| 47 |
@@ -29,12 +29,12 @@ setfattr -n user.pax.flags -v "r" c |
| 48 |
|
| 49 |
# This tests if the src file was inside a directory |
| 50 |
# the correct dst location should be f/a. NOT f/d/a. |
| 51 |
-./install-xattr d/a f |
| 52 |
+./install-xattr d/a h |
| 53 |
|
| 54 |
-[ -x f/a ] |
| 55 |
-[ ! -x f/d/a ] |
| 56 |
-[ "$(getfattr --only-values -n user.foo f/a)" == "bar" ] |
| 57 |
-[ "$(getfattr --only-values -n user.bas f/a)" == "x" ] |
| 58 |
+[ -x h/a ] |
| 59 |
+[ ! -x h/d/a ] |
| 60 |
+[ "$(getfattr --only-values -n user.foo h/a)" == "bar" ] |
| 61 |
+[ "$(getfattr --only-values -n user.bas h/a)" == "x" ] |
| 62 |
|
| 63 |
./install-xattr -t e a b c |
| 64 |
|
| 65 |
@@ -87,4 +87,4 @@ setfattr -n user.pax.flags -v "r" c |
| 66 |
# set SELinux security context of files and directories |
| 67 |
|
| 68 |
# Okay, let's clean up after ourselves |
| 69 |
-rm -rf a b c d e f g x y z backup-a* mode-a target-a target-install-xattr |
| 70 |
+rm -rf a b c d e f g h x y z backup-a* mode-a target-a target-install-xattr |
Archives