From patchwork Thu Mar 8 19:16:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hridya Valsaraju X-Patchwork-Id: 883286 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=2001:1418:10:5::2; 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="rewkk6KD"; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zy0cs5PSWz9s1b for ; Fri, 9 Mar 2018 06:16:56 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id AF5313E769E for ; Thu, 8 Mar 2018 20:16:52 +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 [IPv6:2001:4b78:1:20::4]) by picard.linux.it (Postfix) with ESMTP id 9D12C3E6B43 for ; Thu, 8 Mar 2018 20:16:50 +0100 (CET) Received: from mail-pl0-x242.google.com (mail-pl0-x242.google.com [IPv6:2607:f8b0:400e:c01::242]) (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 CA7491000D03 for ; Thu, 8 Mar 2018 20:16:49 +0100 (CET) Received: by mail-pl0-x242.google.com with SMTP id c11-v6so3863252plo.0 for ; Thu, 08 Mar 2018 11:16:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=KbpabTcRsmwf2ZM7d6RmMQ+S0+UKEsPA1k1FqD8yDho=; b=rewkk6KD12p67eRi0m+zfEj9jZyR6elFXP+G6UCRLJ4TS3NwNMmHurH9NN5gmJgWqz EF4dELSwOXBlC+CRb4V4fUiVb2RS72yBDIddPxvELqqLQvB3b4F4oBvSQM+e9NNWb5ZH FCg3oWsHiBvJwE65m86CzET1JP0LjqE+37QV8EDB/We88maIQiq640ZCnwqdfcjqgNNs iuYxXDICoXgkIsQPAb/GrYQxEBvAICJxldEg1UMxXxT+2hfLYv8pU/VJXEuNQnwQsggj Km4p9+1a3g35F44/DmXsexyev/Bxj5XSiKxpxDAfy3wnBOFqnf6YGRC+PA3LaErO+gjo cedA== 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; bh=KbpabTcRsmwf2ZM7d6RmMQ+S0+UKEsPA1k1FqD8yDho=; b=bu8/CpsNbOmMAmEFOs8XxzjN7sNiPfK2dmu0Eq/8RM2e5N9cALqHZe19wDfZtKFB79 Q24rg6x27rUcx3WJL9BNRpLV0YdgA2Qq89LXbtY/rwSeSsb62mQWviRCw5VDdgUHmxQ6 T4eWiGaR1GEFJuNdBvtTqCiyllsXFVivALl/ArBp4juElO42kzCBsSg7ruifEV/x3oRF 83g8X9VZ6kvicKxI8QVmMp2fBU82pWLvUeNFPXkkpZf2AhZ/c/fTfxCBX9p7r1lShp+M 4j5EzRlwdKtbAUUYxNtFVGqcUBaFQU/Yhz3JcF+LrhSwDB+rQj24BuGnhEcnHN+MWFM0 2sNw== X-Gm-Message-State: APf1xPCDseUZ9udTrAJHvrRAWUnbQcYP7hN6XLFPdSixVvENmE8fal7A yoajzz8xUfjEYwksZ1X6u2s8RbM6XaY= X-Google-Smtp-Source: AG47ELvs6ttJpqK9Ho7hR4/ehiRtylYi/xkEQi0iOHsyHZHzKwRdhrZMWZOTH7QSbHpHgdaMAJQeLA== X-Received: by 2002:a17:902:5489:: with SMTP id e9-v6mr22540678pli.81.1520536607915; Thu, 08 Mar 2018 11:16:47 -0800 (PST) Received: from hridya0.mtv.corp.google.com ([100.98.121.104]) by smtp.gmail.com with ESMTPSA id f7sm32129043pgq.66.2018.03.08.11.16.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Mar 2018 11:16:47 -0800 (PST) From: Hridya Valsaraju To: ltp@lists.linux.it, Cyril Hrubis Date: Thu, 8 Mar 2018 11:16:39 -0800 Message-Id: <20180308191639.195488-1-hridya@google.com> X-Mailer: git-send-email 2.16.2.395.g2e18187dfd-goog X-Virus-Scanned: clamav-milter 0.99.2 at in-4.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.1 required=7.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, SPF_PASS, T_RP_MATCHES_RCVD autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-4.smtp.seeweb.it Cc: Hridya Valsaraju Subject: [LTP] [PATCH v2] mtest06: Use temp dir from $TMPDIR if present 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: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" The test was failing in Android devices due to /tmp not existing. This change uses tst_tmpir() to create a temporary directory in $TMPDIR if it is defined. Signed-off-by: Hridya Valsaraju --- Changelog since v1: -Replace mkstemp() with open() since the directory created by tst_tmpdir() is unique. testcases/kernel/mem/mtest06/mmap1.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/testcases/kernel/mem/mtest06/mmap1.c b/testcases/kernel/mem/mtest06/mmap1.c index 8894b0dbf..80889676d 100644 --- a/testcases/kernel/mem/mtest06/mmap1.c +++ b/testcases/kernel/mem/mtest06/mmap1.c @@ -62,6 +62,8 @@ usage(prog); \ } while (0) +#define TEST_FILENAME "ashfile" + static int verbose_print = 0; static char *volatile map_address; static jmp_buf jmpbuf; @@ -109,13 +111,14 @@ static void sig_handler_mapped(int signal, siginfo_t * info, void *ut) int mkfile(int size) { - char template[] = "/tmp/ashfileXXXXXX"; int fd, i; - if ((fd = mkstemp(template)) == -1) - tst_brkm(TBROK | TERRNO, NULL, "mkstemp() failed"); + fd = open(TEST_FILENAME, O_RDWR | O_CREAT, 0600); + if (fd < 0) + tst_brkm(TBROK | TERRNO, NULL, "open for %s failed", + TEST_FILENAME); - unlink(template); + unlink(TEST_FILENAME); for (i = 0; i < size; i++) if (write(fd, "a", 1) == -1) @@ -375,6 +378,8 @@ int main(int argc, char **argv) } } + tst_tmpdir(); + for (;;) { if ((fd = mkfile(file_size)) == -1) tst_brkm(TBROK, NULL, @@ -416,5 +421,7 @@ int main(int argc, char **argv) close(fd); } + tst_rmdir(); + exit(0); }