From patchwork Fri Jul 21 04:38:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 9856113 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0F36160392 for ; Fri, 21 Jul 2017 04:40:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E15DF287C4 for ; Fri, 21 Jul 2017 04:40:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DF7AB28774; Fri, 21 Jul 2017 04:40:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 738FF287BF for ; Fri, 21 Jul 2017 04:40:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751748AbdGUEkU (ORCPT ); Fri, 21 Jul 2017 00:40:20 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:37235 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751460AbdGUEkS (ORCPT ); Fri, 21 Jul 2017 00:40:18 -0400 Received: by mail-pf0-f193.google.com with SMTP id d18so3923845pfe.4; Thu, 20 Jul 2017 21:40:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=isRigyazBBmWuNc93/jmxAvurwqPqrH58EqWukGFL2o=; b=q3Uqh00i96npN2tqOAdQB+6vl6q8WprIXpecL6nLWbC2NSYX72ETSvPLaf7GiPTC5N HC7OuD7dcNgGzHIFSl/AV1mVNtCwzqaz0nj2Cp+B1qjoUsW2yHKk12sxSOJh5t2vDloE ae/Sr2/KQDUO9zGkDdfugsEhvNafmFarbnLHBmg6oE+OrIP2/XVAoTTZ7/lhXMJqC0m0 9rDviWqV8lUNTdKCNSF7+pRcLZq3E+z8j6sspPq2WDmElS8S0FpEMdFW4/NYP5ky2xz1 YlBlE4Tsinw98xhgEv5jBbrfuErd1vRC3wNRuougSO4V70gWeIpU7ktr0QJKpyn3Jo4v IhJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=isRigyazBBmWuNc93/jmxAvurwqPqrH58EqWukGFL2o=; b=rZq7mewWLsvgYdngKhNuejmsX0dxuba6dgh7dU2kSs55eqcJriSfpK8iiTgb84BKoB gJbtETyNVyPl9Jo5CoKQLLL/ztQy+rPjTrAQosnNvqhLNRnLDwbhk0qrV07nmlnaLgRw 17QrjsGY+rxovkHUAKrErG7NyVOJoz32x5/8OaQ9Svt4ngwsDgGNvxoBpENPUvIEWq01 N9NfINRO7yZPfFE9ebCItUgIG3qTKaR1oOtgZOq3wNPCjVC1kynhNTh9uBKoe688S3Z7 bbH0USyXjxfTv6Nix8MBlkQCmw6EAtzgAZdkPANZCRZhxjmk2iMjRsqDZGD0EoAUSTS2 I9uw== X-Gm-Message-State: AIVw113qVfDHpSxPhcHwMInmjEAi2plq+OBx5z3iP0utFsouEzmZM9uj DHV9/zOQjkPw/J8USV0= X-Received: by 10.99.175.1 with SMTP id w1mr6074901pge.392.1500612017123; Thu, 20 Jul 2017 21:40:17 -0700 (PDT) Received: from zzz.hsd1.wa.comcast.net (c-73-239-167-150.hsd1.wa.comcast.net. [73.239.167.150]) by smtp.gmail.com with ESMTPSA id c124sm7471334pfg.13.2017.07.20.21.40.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jul 2017 21:40:16 -0700 (PDT) From: Eric Biggers To: fstests@vger.kernel.org Cc: linux-xfs@vger.kernel.org, Eric Biggers Subject: [PATCH v2 09/15] tests: make shared/051 a generic test Date: Thu, 20 Jul 2017 21:38:47 -0700 Message-Id: <20170721043853.364-10-ebiggers3@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170721043853.364-1-ebiggers3@gmail.com> References: <20170721043853.364-1-ebiggers3@gmail.com> Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers The ACL test shared/051 was very similar to generic/099 which was not being run and was just removed; most likely the script was copy+pasted at some point. Since shared/051 has been getting maintained+run and is not really XFS and UDF-specific, move it to generic, reusing the old number of 099. One change was required for it to work on other filesystems: the output of 'find' must be sorted. Signed-off-by: Eric Biggers --- tests/{shared/051 => generic/099} | 8 ++++---- tests/{shared/051.out => generic/099.out} | 18 +++++++++--------- tests/generic/group | 1 + tests/shared/group | 1 - 4 files changed, 14 insertions(+), 14 deletions(-) rename tests/{shared/051 => generic/099} (98%) rename tests/{shared/051.out => generic/099.out} (99%) diff --git a/tests/shared/051 b/tests/generic/099 similarity index 98% rename from tests/shared/051 rename to tests/generic/099 index 298838e7..f65c53f1 100755 --- a/tests/shared/051 +++ b/tests/generic/099 @@ -1,5 +1,5 @@ #! /bin/bash -# FS QA Test No. 051 +# FS QA Test No. 099 # # Test out ACLs. # @@ -67,7 +67,7 @@ _cleanup() # # real QA test starts here -_supported_fs xfs udf +_supported_fs generic _supported_os Linux _require_test _require_runas @@ -292,10 +292,10 @@ popd >/dev/null chown -R 12345.54321 root echo "Change #1..." _runas -u 12345 -g 54321 -- chacl -r u::rwx,g::-w-,o::--x root -find root -print | xargs chacl -l +find root -print | sort | xargs chacl -l echo "Change #2..." _runas -u 12345 -g 54321 -- chacl -r u::---,g::---,o::--- root -find root -print | xargs chacl -l +find root -print | sort | xargs chacl -l #------------------------------------------------------- diff --git a/tests/shared/051.out b/tests/generic/099.out similarity index 99% rename from tests/shared/051.out rename to tests/generic/099.out index 2b5220f7..94172420 100644 --- a/tests/shared/051.out +++ b/tests/generic/099.out @@ -1,4 +1,4 @@ -QA output created by 051 +QA output created by 099 === Test minimal ACE === Setup file @@ -111,6 +111,8 @@ acldir/file2 [u::r--,g::r--,o::---] Change #1... root [u::rwx,g::-w-,o::--x] root/a [u::rwx,g::-w-,o::--x] +root/a/0 [u::rwx,g::-w-,o::--x] +root/a/0/mumble [u::rwx,g::-w-,o::--x] root/a/1 [u::rwx,g::-w-,o::--x] root/a/1/mumble [u::rwx,g::-w-,o::--x] root/a/2 [u::rwx,g::-w-,o::--x] @@ -129,9 +131,9 @@ root/a/8 [u::rwx,g::-w-,o::--x] root/a/8/mumble [u::rwx,g::-w-,o::--x] root/a/9 [u::rwx,g::-w-,o::--x] root/a/9/mumble [u::rwx,g::-w-,o::--x] -root/a/0 [u::rwx,g::-w-,o::--x] -root/a/0/mumble [u::rwx,g::-w-,o::--x] root/b [u::rwx,g::-w-,o::--x] +root/b/c0 [u::rwx,g::-w-,o::--x] +root/b/c0/0 [u::rwx,g::-w-,o::--x] root/b/c1 [u::rwx,g::-w-,o::--x] root/b/c1/1 [u::rwx,g::-w-,o::--x] root/b/c2 [u::rwx,g::-w-,o::--x] @@ -150,11 +152,11 @@ root/b/c8 [u::rwx,g::-w-,o::--x] root/b/c8/8 [u::rwx,g::-w-,o::--x] root/b/c9 [u::rwx,g::-w-,o::--x] root/b/c9/9 [u::rwx,g::-w-,o::--x] -root/b/c0 [u::rwx,g::-w-,o::--x] -root/b/c0/0 [u::rwx,g::-w-,o::--x] Change #2... root [u::---,g::---,o::---] root/a [u::---,g::---,o::---] +root/a/0 [u::---,g::---,o::---] +root/a/0/mumble [u::---,g::---,o::---] root/a/1 [u::---,g::---,o::---] root/a/1/mumble [u::---,g::---,o::---] root/a/2 [u::---,g::---,o::---] @@ -173,9 +175,9 @@ root/a/8 [u::---,g::---,o::---] root/a/8/mumble [u::---,g::---,o::---] root/a/9 [u::---,g::---,o::---] root/a/9/mumble [u::---,g::---,o::---] -root/a/0 [u::---,g::---,o::---] -root/a/0/mumble [u::---,g::---,o::---] root/b [u::---,g::---,o::---] +root/b/c0 [u::---,g::---,o::---] +root/b/c0/0 [u::---,g::---,o::---] root/b/c1 [u::---,g::---,o::---] root/b/c1/1 [u::---,g::---,o::---] root/b/c2 [u::---,g::---,o::---] @@ -194,8 +196,6 @@ root/b/c8 [u::---,g::---,o::---] root/b/c8/8 [u::---,g::---,o::---] root/b/c9 [u::---,g::---,o::---] root/b/c9/9 [u::---,g::---,o::---] -root/b/c0 [u::---,g::---,o::---] -root/b/c0/0 [u::---,g::---,o::---] === Test out error messages for ACL text parsing === Note: Old interface gave more informative error msgs diff --git a/tests/generic/group b/tests/generic/group index 93a7378b..ee9a7539 100644 --- a/tests/generic/group +++ b/tests/generic/group @@ -101,6 +101,7 @@ 096 auto prealloc quick zero 097 attr auto quick 098 auto quick metadata +099 acl auto quick 100 udf auto 101 auto quick metadata 102 auto rw diff --git a/tests/shared/group b/tests/shared/group index fab93315..b3663a03 100644 --- a/tests/shared/group +++ b/tests/shared/group @@ -11,7 +11,6 @@ 006 auto enospc 007 dangerous_fuzzers 032 mkfs auto quick -051 acl udf auto quick 272 auto enospc rw 289 auto quick 298 auto trim