From patchwork Mon Nov 19 21:15:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hackmann X-Patchwork-Id: 1000096 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=213.254.12.146; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="uTotJH2j"; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42zM7q2bZBz9s6w for ; Tue, 20 Nov 2018 08:15:50 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 8BB613E64FE for ; Mon, 19 Nov 2018 22:15:47 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [217.194.8.4]) by picard.linux.it (Postfix) with ESMTP id CE96D3E6446 for ; Mon, 19 Nov 2018 22:15:45 +0100 (CET) Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 2311A1000D53 for ; Mon, 19 Nov 2018 22:15:45 +0100 (CET) Received: by mail-qk1-x749.google.com with SMTP id 80so72183136qkd.0 for ; Mon, 19 Nov 2018 13:15:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=APimRJJOG5+KLY8Zc72E2kR2tM8OMp0zrf1cPz7BiAk=; b=uTotJH2jnrU+JtNS95lxCng6eQMuZ0HzlT0Xq09n9xT5g/auYPlyp0TmyCP3l6U25a D3kqdUX/C2tPURXoNtOhqcrFXU09bfqIlH0ywtl09baV8DxAEPvNjwJFIYNavC5GRxTb SSdJxhH/u1QpcQGSTeMI0feLh9Sc6M/Y8U5Vq/5cOncPy5gRZ+VMjGlDc42Y1tfoo+sV yUG1B66BJgxzuebddcIT1locRoEfkyeRfyLd7bN+dFeztw2oZNDyuDo2YCNLTfdOLIuy 9JHt6ARm3PiTDJbszMJPYzqHJ1opm4A7cziRNnusAG673SjgC8HeFqKu4+y8EHQ9mgqU 8H2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=APimRJJOG5+KLY8Zc72E2kR2tM8OMp0zrf1cPz7BiAk=; b=qWcP0e4yBJlyOnYG2Wmst7n5iKd6k0d1zx3UF/Dno/FzzoUOex6O3SupGniDCqTO4z DafKAkXHPxxZRgxjicgbuDUFYAKBdqPmlC2pX2zLWJdo76bmT7chYGx/KFkqohA0kOwb 3n/wLJm6If3rAR37o0qbvPI92tv2xv1N3sqBl1PIhfagUqji8MOAYWdDvTx9uATCvc35 bcPzqrJcx8h+6JhjIdOKSuOU7gfQFqe04/d0ka54ShziOopbZfcJVGQ450v5ft88xTib fayah55NJEEhagENqfnPMh0dC8ehnvYsMH4iK0WSQ9Bu9+s8pm2ihXL4DAP+BrZF6cfK 8cqw== X-Gm-Message-State: AA+aEWZOc73B+XkeB5PAe+zcg/kfAQcs602ZS5YOugX+/5zQc2Tnlhxr 1ApVNctsyz3ecuAo0MG2UUtr3O9AGiF6xXY+OeEqNVEskrEUYKHCof+pjfp2/0BBEw/doHzVx0S 7WLV0ggaeL1PalAaPDJuhxqHRIwbnTPHrXGHJ9U4sLBgJfuh1SxMdbqpCeUdne6+H X-Google-Smtp-Source: AFSGD/XCVk6p8gjtCoqTT0xRPBVJO1iWJO4cHw2ASqRMTRykbj8kbNu3GVWLZ0rDXJDwz1YSG1J9W42vBgltS7g= X-Received: by 2002:ac8:389a:: with SMTP id f26mr12259472qtc.59.1542662143840; Mon, 19 Nov 2018 13:15:43 -0800 (PST) Date: Mon, 19 Nov 2018 13:15:27 -0800 Message-Id: <20181119211528.85893-1-ghackmann@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.19.1.1215.g8438c0b245-goog From: Greg Hackmann To: ltp@lists.linux.it X-Virus-Scanned: clamav-milter 0.99.2 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-7.4 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, SPF_PASS, USER_IN_DEF_DKIM_WL autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-4.smtp.seeweb.it Cc: kernel-team@android.com Subject: [LTP] [PATCH] syscalls/fgetxattr02.c: make sure test can create and open device nodes X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" fgetxattr02 needs to create and open device nodes, so make sure it has access to a filesystem mounted without nodev. This is based on a previous commmit e02373767 ("syscalls/fsetxattr02.c: Fix the failure of opening device files") which fixed a similar issue in fsetxattr02. Signed-off-by: Greg Hackmann --- .../kernel/syscalls/fgetxattr/fgetxattr02.c | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/testcases/kernel/syscalls/fgetxattr/fgetxattr02.c b/testcases/kernel/syscalls/fgetxattr/fgetxattr02.c index 888e29a23..02e81810a 100644 --- a/testcases/kernel/syscalls/fgetxattr/fgetxattr02.c +++ b/testcases/kernel/syscalls/fgetxattr/fgetxattr02.c @@ -54,14 +54,15 @@ #define XATTR_TEST_VALUE "this is a test value" #define XATTR_TEST_VALUE_SIZE 20 +#define MNTPOINT "mntpoint" #define OFFSET 11 #define FILENAME "fgetxattr02testfile" #define DIRNAME "fgetxattr02testdir" #define SYMLINK "fgetxattr02symlink" #define SYMLINKF "fgetxattr02symlinkfile" -#define FIFO "fgetxattr02fifo" -#define CHR "fgetxattr02chr" -#define BLK "fgetxattr02blk" +#define FIFO MNTPOINT"/fgetxattr02fifo" +#define CHR MNTPOINT"/fgetxattr02chr" +#define BLK MNTPOINT"/fgetxattr02blk" #define SOCK "fgetxattr02sock" struct test_case { @@ -159,6 +160,8 @@ static struct test_case tc[] = { static void verify_fgetxattr(unsigned int i) { + const char *fname = strstr(tc[i].fname, "fgetxattr02") + OFFSET; + TEST(fgetxattr(tc[i].fd, tc[i].key, tc[i].ret_value, tc[i].size)); if (TST_RET == -1 && TST_ERR == EOPNOTSUPP) @@ -168,11 +171,11 @@ static void verify_fgetxattr(unsigned int i) if (tc[i].exp_ret == TST_RET) { tst_res(TPASS, "fgetxattr(2) on %s passed", - tc[i].fname + OFFSET); + fname); } else { tst_res(TFAIL, "fgetxattr(2) on %s passed unexpectedly %ld", - tc[i].fname + OFFSET, TST_RET); + fname, TST_RET); } if (strncmp(tc[i].ret_value, XATTR_TEST_VALUE, @@ -182,7 +185,7 @@ static void verify_fgetxattr(unsigned int i) } tst_res(TPASS, "fgetxattr(2) on %s got the right value", - tc[i].fname + OFFSET); + fname); } /* @@ -195,12 +198,11 @@ static void verify_fgetxattr(unsigned int i) if (tc[i].exp_err == TST_ERR) { tst_res(TPASS | TTERRNO, "fgetxattr(2) on %s passed", - tc[i].fname + OFFSET); + fname); return; } - tst_res(TFAIL | TTERRNO, "fgetxattr(2) failed on %s", - tc[i].fname + OFFSET); + tst_res(TFAIL | TTERRNO, "fgetxattr(2) failed on %s", fname); } static void setup(void) @@ -268,7 +270,8 @@ static struct tst_test test = { .test = verify_fgetxattr, .cleanup = cleanup, .tcnt = ARRAY_SIZE(tc), - .needs_tmpdir = 1, + .needs_devfs = 1, + .mntpoint = MNTPOINT, .needs_root = 1, };