From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 58D9913877A for ; Fri, 27 Jun 2014 12:26:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F327E0A95; Fri, 27 Jun 2014 12:26:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AFA5EE0A95 for ; Fri, 27 Jun 2014 12:26:16 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DFDAE3401D8 for ; Fri, 27 Jun 2014 12:26:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 9CDA019166 for ; Fri, 27 Jun 2014 12:26:14 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1403871980.275ca5400dfe6266a948da802aa19358b3475f95.blueness@gentoo> Subject: [gentoo-commits] proj/elfix:master commit in: misc/install-xattr/ X-VCS-Repository: proj/elfix X-VCS-Files: misc/install-xattr/Makefile misc/install-xattr/checkcopyattrs.sh X-VCS-Directories: misc/install-xattr/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 275ca5400dfe6266a948da802aa19358b3475f95 X-VCS-Branch: master Date: Fri, 27 Jun 2014 12:26:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8e389336-7709-4a9c-83eb-77ed95ec98e9 X-Archives-Hash: 64f5c3f4d9e4a6b79dbdf1f2bb8ed678 commit: 275ca5400dfe6266a948da802aa19358b3475f95 Author: Jason Zaman perfinion com> AuthorDate: Fri Jun 27 12:07:04 2014 +0000 Commit: Anthony G. Basile gentoo 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 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