From patchwork Wed Feb 6 17:17:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael David Tinoco X-Patchwork-Id: 157652 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp6658890jaa; Wed, 6 Feb 2019 09:17:24 -0800 (PST) X-Google-Smtp-Source: AHgI3IaVzeJkDDHCYVcaHM2MRQ/CRslhsv5VgVYhE52/MC1ZL9/rAtGE5wrJ5AHj+kdxbasxZ2ZC X-Received: by 2002:a5d:6152:: with SMTP id y18mr9179960wrt.141.1549473444659; Wed, 06 Feb 2019 09:17:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549473444; cv=none; d=google.com; s=arc-20160816; b=RSLiNrnXeurJ/u54roOwY4rvehGh8xsdLVmvx4HBDbqKSTrmW0E+YZFoX5aqqyVmLT OKXtO8I98+y+S75zBZ301Yx/jOaz0yq4wnL5OJeLH8UjI5lAE08W1CCD9795TybeZ7pJ KOkoaohKt9dUYMwS7lRCRBFKf64f+qmzAn/3xGj2DBXljZ3EFkLYg+qUq5kOQvDZ9nCW jGK6JQJA+ZEb2Vi9nR6qeWSac33uc+QFMeJDXr+HldgpzRlBE0M0iVLaTwDhp1n1ypWj HAazhM3EtevA3SSIwK7DN6H/ushtsXAlzlaVJ7V7PEtSH8CsSPCU2YvwjxoYWS3gtE3j zvdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=B/lfSn3F8GvO7P5hWpk5pQnq8X1ekKIRjV4VJZN97yA=; b=Ekc+u8OIE/2SgfyyXZ3NiO2vt0I7ANzKIhDPfngQ+9Nu86C5cQbjGQKsVcoS5JaoGL YOEIKkhWx5gvvFZTso38GTJ5DI1oOT6y0rjrPa9oaW3D5dux1JstqqhQENQnQ2dbl/Wa sg3hAINYHiEp5lYSvl0Tub6cEzBdrl0/j+j+uJRcWO7ATqwIno7gbmrTTRidlRJUm2SP LfuiU5kHo7HGoxf0r5vbJet9u0TOvjfm/UMipPPKGXH3X6d3JKSI788Zu48XXsb/R23k T1qHYb/tNj2rOsdZNs0D6r6UsyfLqgrRLciYILZHueOVMIcji5VRD+LJdOVvb7VJj9rB 9FlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="EYQ/DelJ"; spf=pass (google.com: domain of ltp-bounces+patch=linaro.org@lists.linux.it designates 2001:1418:10:5::2 as permitted sender) smtp.mailfrom="ltp-bounces+patch=linaro.org@lists.linux.it"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from picard.linux.it (picard.linux.it. [2001:1418:10:5::2]) by mx.google.com with ESMTPS id f191si12817428wme.151.2019.02.06.09.17.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Feb 2019 09:17:24 -0800 (PST) Received-SPF: pass (google.com: domain of ltp-bounces+patch=linaro.org@lists.linux.it designates 2001:1418:10:5::2 as permitted sender) client-ip=2001:1418:10:5::2; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="EYQ/DelJ"; spf=pass (google.com: domain of ltp-bounces+patch=linaro.org@lists.linux.it designates 2001:1418:10:5::2 as permitted sender) smtp.mailfrom="ltp-bounces+patch=linaro.org@lists.linux.it"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 24F173EA27F for ; Wed, 6 Feb 2019 18:17:24 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) by picard.linux.it (Postfix) with ESMTP id B5E2E3EA2D0 for ; Wed, 6 Feb 2019 18:17:12 +0100 (CET) Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id 1AA3220035D for ; Wed, 6 Feb 2019 18:17:11 +0100 (CET) Received: by mail-qt1-x844.google.com with SMTP id t33so8716616qtt.4 for ; Wed, 06 Feb 2019 09:17:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iGd2QyQkSQE+01qJz1nJ1816VWkuyZ3Lc+i4MFYKxRg=; b=EYQ/DelJ9lV8kQEGovbkRDQr87gk7SvH9/8ADo136o4dbbNllLkLOYXZq/EUvlslyP iYuewpNbzG/Hc4rpW4Vqxivui2V2HL6vFwsl48zoTBAcDyEOW47sGRVzBRolGvLrMbzS uYR2GMA5y+K3BB22DDB15ubXm23qG0Vkl02E9Uq8X66pyGPNLAPrPjrKlthyP/smkY8E j7IJ3femrI/+NcqIGb9pSnYIPeXmu3Xv1CX/x1o4UY+d6RSMr4KgPZTLormcymCyqtHM DxjCQkrwQEM3KbtGudDHFgSQRCskOf8MPyCUmW1DXHUOfAgOieNrrb7NW0UpjL1qer+l KcCg== 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:mime-version:content-transfer-encoding; bh=iGd2QyQkSQE+01qJz1nJ1816VWkuyZ3Lc+i4MFYKxRg=; b=naShqEmHpZAx0x9FD4v/qExCyJGC1lqS5R40UBv8URZQow0Eh+cBInwhtctCcfzO3Q F8mv0bJYAmiT/uUsRIYCN4+3lfHfovKH3t4QVEowzdyufzI1bK4uvZpRaZoDnzZ4K3bx E1PxvfOkEykQVZeEpYN5k65i7fllPPXsGF2cqLnd+RyK63DCpEvepucvAV5YH2QryWqz LQdzYujanedG5gea7upRKo00Wve2N40mepc7Jrkx8J99SiI9tiGdJkxfzhJKvsT8t/5q M/nC16g5rJSAH8qZFnzzoti38+qWly29gqWFdxVI+y7hvbWrolucFQz5NCl0H41JnVAx 1xYw== X-Gm-Message-State: AHQUAuZ+C2bGIN1fsamEdgOrjLxAidhWXUof8YYBuFG6P45XzeEZcoMj 6oPZurDRzCzhL1WqrLa53ZU36RalYzo= X-Received: by 2002:a0c:b48d:: with SMTP id c13mr8466424qve.91.1549473429533; Wed, 06 Feb 2019 09:17:09 -0800 (PST) Received: from workstation.celeiro.br. ([168.194.163.49]) by smtp.gmail.com with ESMTPSA id o21sm20147070qto.18.2019.02.06.09.17.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Feb 2019 09:17:08 -0800 (PST) From: Rafael David Tinoco To: ltp@lists.linux.it Date: Wed, 6 Feb 2019 15:17:03 -0200 Message-Id: <20190206171703.5761-2-rafael.tinoco@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190206171703.5761-1-rafael.tinoco@linaro.org> References: <20190206171703.5761-1-rafael.tinoco@linaro.org> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-7.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 autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH 2/2] timers/clock_gettime: remove clock_gettime tests 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+patch=linaro.org@lists.linux.it Sender: "ltp" clock_gettime{01,02} syscall tests were created, using the new API, based on existing and older kernel/timers/clock_gettime{02,03} tests. This commit deletes older timers/clock_gettime/* tests. Signed-off-by: Rafael David Tinoco --- runtest/timers | 2 - .../kernel/timers/clock_gettime/.gitignore | 2 - .../kernel/timers/clock_gettime/Makefile | 27 --- .../timers/clock_gettime/clock_gettime02.c | 120 ------------ .../timers/clock_gettime/clock_gettime03.c | 173 ------------------ 5 files changed, 324 deletions(-) delete mode 100644 testcases/kernel/timers/clock_gettime/.gitignore delete mode 100644 testcases/kernel/timers/clock_gettime/Makefile delete mode 100644 testcases/kernel/timers/clock_gettime/clock_gettime02.c delete mode 100644 testcases/kernel/timers/clock_gettime/clock_gettime03.c diff --git a/runtest/timers b/runtest/timers index 618d2cb0c..5f5ecb6ee 100644 --- a/runtest/timers +++ b/runtest/timers @@ -1,6 +1,4 @@ #DESCRIPTION:Posix Timer Tests -clock_gettime02 clock_gettime02 -clock_gettime03 clock_gettime03 timer_create02 timer_create02 timer_create03 timer_create03 timer_create04 timer_create04 diff --git a/testcases/kernel/timers/clock_gettime/.gitignore b/testcases/kernel/timers/clock_gettime/.gitignore deleted file mode 100644 index 004e74214..000000000 --- a/testcases/kernel/timers/clock_gettime/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/clock_gettime02 -/clock_gettime03 diff --git a/testcases/kernel/timers/clock_gettime/Makefile b/testcases/kernel/timers/clock_gettime/Makefile deleted file mode 100644 index 8de247075..000000000 --- a/testcases/kernel/timers/clock_gettime/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (c) International Business Machines Corp., 2001 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See -# the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# - -top_srcdir ?= ../../../.. - -include $(top_srcdir)/include/mk/testcases.mk - -CPPFLAGS += -D_GNU_SOURCE -I$(abs_srcdir)/../include - -LDLIBS += -lpthread -lrt - -include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/timers/clock_gettime/clock_gettime02.c b/testcases/kernel/timers/clock_gettime/clock_gettime02.c deleted file mode 100644 index e68a2070c..000000000 --- a/testcases/kernel/timers/clock_gettime/clock_gettime02.c +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright (c) Wipro Technologies Ltd, 2003. All Rights Reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it would be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - */ -/************************************************************************** - * - * TEST IDENTIFIER : clock_gettime02 - * - * EXECUTED BY : anyone - * - * TEST TITLE : Basic test for clock_gettime(2) - * - * TEST CASE TOTAL : 2 - * - * AUTHOR : Aniruddha Marathe - * - * SIGNALS - * Uses SIGUSR1 to pause before test if option set. - * (See the parse_opts(3) man page). - * - * DESCRIPTION - * This is a Phase I test for the clock_gettime(2) system call. - * It is intended to provide a limited exposure of the system call. - * - * Setup: - * Setup signal handling. - * Pause for SIGUSR1 if option specified. - * - * Test: - * Loop if the proper options are given. - * Execute system call for each defined clock value - * Check return code, if system call failed (return=-1) - * Log the errno and Issue a FAIL message. - * Otherwise, Issue a PASS message. - * - * Cleanup: - * Print errno log and/or timing stats if options given - * - * USAGE: - * clock_gettime02 [-c n] [-e] [-i n] [-I x] [-P x] [-t] [-p] - * where: - * -c n : Run n copies simultaneously. - * -e : Turn on errno logging. - * -i n : Execute test n times. - * -I x : Execute test for x seconds. - * -p : Pause for SIGUSR1 before starting - * -P x : Pause for x seconds between iterations. - * -t : Turn on syscall timing. - * - *RESTRICTIONS: - * None - *****************************************************************************/ - -#include -#include -#include -#include - -#include "test.h" -#include "common_timers.h" - -void setup(void); -static clockid_t clocks[2] = { CLOCK_REALTIME, CLOCK_MONOTONIC }; - -char *TCID = "clock_gettime02"; -int TST_TOTAL = ARRAY_SIZE(clocks); - -int main(int ac, char **av) -{ - int lc, i; - struct timespec spec; - - tst_parse_opts(ac, av, NULL, NULL); - - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) { - - tst_count = 0; - - for (i = 0; i < TST_TOTAL; i++) { - TEST(ltp_syscall(__NR_clock_gettime, clocks[i], &spec)); - tst_resm((TEST_RETURN < 0 ? TFAIL | TTERRNO : TPASS), - "%s", - (TEST_RETURN == 0 ? "passed" : "failed")); - } - } - - CLEANUP(); - tst_exit(); -} - -/* setup() - performs all ONE TIME setup for this test */ -void setup(void) -{ - - tst_sig(NOFORK, DEF_HANDLER, CLEANUP); - - TEST_PAUSE; -} - -/* - * CLEANUP() - Performs one time CLEANUP for this test at - * completion or premature exit - */ -void cleanup(void) -{ -} diff --git a/testcases/kernel/timers/clock_gettime/clock_gettime03.c b/testcases/kernel/timers/clock_gettime/clock_gettime03.c deleted file mode 100644 index 2194d104a..000000000 --- a/testcases/kernel/timers/clock_gettime/clock_gettime03.c +++ /dev/null @@ -1,173 +0,0 @@ -/* - * Copyright (c) Wipro Technologies Ltd, 2003. All Rights Reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it would be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - */ -/************************************************************************** - * - * TEST IDENTIFIER : clock_gettime03 - * - * EXECUTED BY : anyone - * - * TEST TITLE : Test checking for basic error conditions for - * clock_gettime(2) - * - * TEST CASE TOTAL : 7 - * - * AUTHOR : Aniruddha Marathe - * - * SIGNALS - * Uses SIGUSR1 to pause before test if option set. - * (See the parse_opts(3) man page). - * - * DESCRIPTION - * This test case check whether clock_gettime(2) returns appropriate error - * value for invalid parameter - * - * Setup: - * Setup signal handling. - * Pause for SIGUSR1 if option specified. - * - * Test: - * Loop if the proper options are given. - * If it is the first test case - * make temp a bad pointer - * Otherwise pass defined struct timespec variable to temp - * Execute system call with invalid parameter - * Check return code, if system call fails with errno == expected errno - * Issue syscall passed with expected errno - * Otherwise, Issue syscall failed to produce expected errno - * - * Cleanup: - * Print errno log and/or timing stats if options given - * - * USAGE: - * clock_gettime03 [-c n] [-e] [-i n] [-I x] [-P x] [-t] [-p] - * where: - * -c n : run n copies simultaneously - * -e : Turn on errno logging. - * -i n : Execute test n times. - * -I x : Execute test for x seconds. - * -p : Pause for SIGUSR1 before starting - * -P x : Pause for x seconds between iterations. - * -t : Turn on syscall timing. - * - * RESTRICTIONS: - * None - *****************************************************************************/ - -#include -#include -#include -#include - -#include "test.h" -#include "common_timers.h" - -void setup(void); - -int testcase[6] = { - EFAULT, /* Bad timespec */ - EFAULT, /* Bad timespec */ - EINVAL, /* MAX_CLOCKS */ - EINVAL /* MAX_CLOCKS + 1 */ -}; - -char *TCID = "clock_gettime03"; /* Test program identifier. */ -int TST_TOTAL = ARRAY_SIZE(testcase); - -int main(int ac, char **av) -{ - int i, lc; - struct timespec spec, *temp; - - clockid_t clocks[] = { - CLOCK_REALTIME, - CLOCK_MONOTONIC, - MAX_CLOCKS, - MAX_CLOCKS + 1, - CLOCK_PROCESS_CPUTIME_ID, - CLOCK_THREAD_CPUTIME_ID - }; - - tst_parse_opts(ac, av, NULL, NULL); - - /* - * PROCESS_CPUTIME_ID & THREAD_CPUTIME_ID are not supported on - * kernel versions lower than 2.6.12 - */ - if ((tst_kvercmp(2, 6, 12)) < 0) { - testcase[4] = EINVAL; - testcase[5] = EINVAL; - } else { - testcase[4] = EFAULT; - testcase[5] = EFAULT; - } - - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) { - - tst_count = 0; - - for (i = 0; i < TST_TOTAL; i++) { - temp = &spec; - - if (i == 0) { - temp = (struct timespec *)-1; - } else if (i == 1) { - temp = NULL; - } else if ((i >= 4) && (tst_kvercmp(2, 6, 12) >= 0)) { - temp = NULL; - } - - TEST(ltp_syscall(__NR_clock_gettime, clocks[i], temp)); - - /* check return code */ - if (TEST_RETURN == -1 && TEST_ERRNO == testcase[i]) { - tst_resm(TPASS | TTERRNO, - "got expected failure"); - } else { - tst_resm(TFAIL | TTERRNO, - "failed to produce expected error " - "[expected errno = %d (%s), " - "TEST_RETURN = %ld]", - testcase[i], strerror(testcase[i]), - TEST_RETURN); - } /* end of else */ - - } /*End of TEST CASE LOOPING */ - - } /*End for TEST_LOOPING */ - - cleanup(); - tst_exit(); -} - -/* setup() - performs all ONE TIME setup for this test */ -void setup(void) -{ - - tst_sig(NOFORK, DEF_HANDLER, cleanup); - - TEST_PAUSE; -} - -/* - * cleanup() - Performs one time cleanup for this test at - * completion or premature exit - */ -void cleanup(void) -{ -}