From patchwork Tue Jan 19 09:31:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Palethorpe X-Patchwork-Id: 1428538 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=Abm2JyEd; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DKk3s3SJtz9sT6 for ; Tue, 19 Jan 2021 20:33:28 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 55B643C30D5 for ; Tue, 19 Jan 2021 10:33:12 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [217.194.8.5]) by picard.linux.it (Postfix) with ESMTP id AA86F3C0BCB for ; Tue, 19 Jan 2021 10:33:10 +0100 (CET) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-5.smtp.seeweb.it (Postfix) with ESMTPS id 3D54B6002A1 for ; Tue, 19 Jan 2021 10:33:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1611048789; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jSiwzG9v12CmlwVWx06gp4Le3pkLYm57ocpNi5Q6huo=; b=Abm2JyEdlAkvhC/CBF/UW+ky2eH/O8xMx+lli5fWK64+bCRP+brRjKlsdVzraN0cqS1huR IDm03Ri5Ea6U2YqH76VaQq0GoivRQ4p8C6glJ0Cn+dfRSpsRY2kK3mfnjlW7d0w4+Azm1d MxO7W7NLAoAuBiX7U8twc+Ib1z+x1N0= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id AE71CACF4; Tue, 19 Jan 2021 09:33:09 +0000 (UTC) To: ltp@lists.linux.it Date: Tue, 19 Jan 2021 09:31:38 +0000 Message-Id: <20210119093143.17222-2-rpalethorpe@suse.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119093143.17222-1-rpalethorpe@suse.com> References: <20210119093143.17222-1-rpalethorpe@suse.com> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-5.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,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-5.smtp.seeweb.it Subject: [LTP] [PATCH v2 1/6] API: Add FILE_SCANF to new lib X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Palethorpe via ltp From: Richard Palethorpe Reply-To: Richard Palethorpe Cc: Oliver Hartkopp , Richard Palethorpe , linux-can@vger.kernel.org Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Signed-off-by: Richard Palethorpe --- include/tst_safe_file_ops.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/tst_safe_file_ops.h b/include/tst_safe_file_ops.h index 894c16123..ea8f89263 100644 --- a/include/tst_safe_file_ops.h +++ b/include/tst_safe_file_ops.h @@ -7,6 +7,9 @@ #include "safe_file_ops_fn.h" +#define FILE_SCANF(path, fmt, ...) \ + file_scanf(__FILE__, __LINE__, (path), (fmt), ## __VA_ARGS__) + #define SAFE_FILE_SCANF(path, fmt, ...) \ safe_file_scanf(__FILE__, __LINE__, NULL, \ (path), (fmt), ## __VA_ARGS__) From patchwork Tue Jan 19 09:31:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Palethorpe X-Patchwork-Id: 1428537 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=uz6gEMwL; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DKk3s1syvz9sRR for ; Tue, 19 Jan 2021 20:33:27 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id AEF633C3098 for ; Tue, 19 Jan 2021 10:33:22 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [217.194.8.6]) by picard.linux.it (Postfix) with ESMTP id E55823C0BCB for ; Tue, 19 Jan 2021 10:33:10 +0100 (CET) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id 9BCD414000E9 for ; Tue, 19 Jan 2021 10:33:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1611048790; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F0O1yfxvj2cf6vUfDqzCU1sr5/oQEGYafzItc2hZ3k4=; b=uz6gEMwLD1/Up+TZUzZiuH022niA4/BwnkZ5B9tisM8NUpyxEKk21DlqTQ8zuf7bc7fOY2 rH1O69jL+mtYU2e1rZVWem3S/9MRNSrpcO5r2AGjdE9tfJ6tHUM5VXaGgUbv+ygZ1JVuCM QjHfP3rbcooJRmL+5JVMKcw6KLZ8luk= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 38ED4ACF5; Tue, 19 Jan 2021 09:33:10 +0000 (UTC) To: ltp@lists.linux.it Date: Tue, 19 Jan 2021 09:31:39 +0000 Message-Id: <20210119093143.17222-3-rpalethorpe@suse.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119093143.17222-1-rpalethorpe@suse.com> References: <20210119093143.17222-1-rpalethorpe@suse.com> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-6.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,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-6.smtp.seeweb.it Subject: [LTP] [PATCH v2 2/6] can: Add can_common.h for vcan device setup X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Palethorpe via ltp From: Richard Palethorpe Reply-To: Richard Palethorpe Cc: Oliver Hartkopp , Richard Palethorpe , linux-can@vger.kernel.org Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Note that we call modprobe to set echo=1. However this does seem to be necessary for the current tests on 5.10. It has been kept to avoid changing the test behavior unnecessarily, but can most likely be safely removed if it causes problems. Signed-off-by: Richard Palethorpe --- .../network/can/filter-tests/can_common.h | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 testcases/network/can/filter-tests/can_common.h diff --git a/testcases/network/can/filter-tests/can_common.h b/testcases/network/can/filter-tests/can_common.h new file mode 100644 index 000000000..d01694b80 --- /dev/null +++ b/testcases/network/can/filter-tests/can_common.h @@ -0,0 +1,70 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2021 SUSE LLC + */ + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include "tst_cmd.h" +#include "tst_safe_stdio.h" +#include "tst_safe_file_ops.h" + +#include +#include +#include + +static char *can_dev_name; +static int can_created_dev; + +static void can_cmd(const char *const argv[]) +{ + tst_cmd(argv, NULL, NULL, TST_CMD_TCONF_ON_MISSING); +} + +#define CAN_CMD(...) can_cmd((const char *const[]){ __VA_ARGS__, NULL }) + +static void can_setup_vcan(void) +{ + unsigned int flags; + char *path; + + if (can_dev_name) + goto check_echo; + + can_dev_name = "vcan0"; + + tst_res(TINFO, "Creating vcan0 device; use -D option to avoid this"); + + CAN_CMD("modprobe", "-r", "vcan"); + CAN_CMD("modprobe", "vcan", "echo=1"); + + can_created_dev = 1; + + CAN_CMD("ip", "link", "add", "dev", "vcan0", "type", "vcan"); + CAN_CMD("ip", "link", "set", "dev", "vcan0", "up"); + +check_echo: + /* Precondition for the frame flow test? */ + SAFE_ASPRINTF(&path, "/sys/class/net/%s/flags", can_dev_name); + if (FILE_SCANF(path, "%x", &flags) || !(flags & IFF_ECHO)) + tst_res(TWARN, "Could not determine if ECHO is set on vcan0"); +} + +static void can_cleanup_vcan(void) +{ + if (!can_created_dev) + return; + + CAN_CMD("ip", "link", "set", "dev", "vcan0", "down"); + CAN_CMD("ip", "link", "del", "dev", "vcan0"); + CAN_CMD("modprobe", "-r", "vcan"); +} From patchwork Tue Jan 19 09:31:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Palethorpe X-Patchwork-Id: 1428541 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=Ag3e9air; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DKk4L609dz9sRR for ; Tue, 19 Jan 2021 20:33:54 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 600A13C6647 for ; Tue, 19 Jan 2021 10:33:52 +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 [217.194.8.7]) by picard.linux.it (Postfix) with ESMTP id 82E403C53DB for ; Tue, 19 Jan 2021 10:33:12 +0100 (CET) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id 2EA90200AD7 for ; Tue, 19 Jan 2021 10:33:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1611048790; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=phAc6QzcUkpTuIKJqWr11O7D/l00ywW42zUecuX6+rM=; b=Ag3e9airlZX0YBrGmiZyyPEoUoJ0hs+33L4vjE/yD7mtP4N+W2BZfAKPXKYx9Dypqq+qaY qYsdPJNC77crXr7DvHPr/1sD7+rNwW+1FruTG63deQrB/6Z/w+HLlCjX4aB9q/GcHuJvKK v0zdRD0Jn3xJPYjrmONoRcq3EvWSTxA= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id C49A4B337; Tue, 19 Jan 2021 09:33:10 +0000 (UTC) To: ltp@lists.linux.it Date: Tue, 19 Jan 2021 09:31:40 +0000 Message-Id: <20210119093143.17222-4-rpalethorpe@suse.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119093143.17222-1-rpalethorpe@suse.com> References: <20210119093143.17222-1-rpalethorpe@suse.com> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 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,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH v2 3/6] can_filter: Convert to new library X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Palethorpe via ltp From: Richard Palethorpe Reply-To: Richard Palethorpe Cc: Oliver Hartkopp , Richard Palethorpe , linux-can@vger.kernel.org Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Behavior is mostly the same, but on some errors we print fail and continue instead of exiting immediately. It appears this would result in more information being printed if there is a failure. Signed-off-by: Richard Palethorpe --- .../network/can/filter-tests/can_filter.c | 317 +++++++----------- 1 file changed, 124 insertions(+), 193 deletions(-) diff --git a/testcases/network/can/filter-tests/can_filter.c b/testcases/network/can/filter-tests/can_filter.c index db017451a..d14e42fac 100644 --- a/testcases/network/can/filter-tests/can_filter.c +++ b/testcases/network/can/filter-tests/can_filter.c @@ -1,63 +1,15 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * tst-filter.c - * * Copyright (c) 2011 Volkswagen Group Electronic Research - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Volkswagen nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * Alternatively, provided that this notice is retained in full, this - * software may be distributed under the terms of the GNU General - * Public License ("GPL") version 2, in which case the provisions of the - * GPL apply INSTEAD OF those given above. - * - * The provided data structures and external interfaces from this code - * are not restricted to be used by modules with a GPL compatible license. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * Send feedback to - * + * Copyright (c) 2021 SUSE LLC */ -#include -#include -#include -#include - -#include -#include -#include -#include -#include #include "config.h" -#include "tst_res_flags.h" +#include "tst_test.h" #ifdef HAVE_LINUX_CAN_H -#include -#include +#include "can_common.h" #define ID 0x123 #define TC 18 /* # of testcases */ @@ -66,7 +18,9 @@ const int rx_res[TC] = { 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 1, 1, 1, 1, 1, 1 }; const int rxbits_res[TC] = { 4369, 4369, 4369, 4369, 17, 4352, 17, 4352, 257, 257, 4112, 4112, 1, 256, 16, 4096, 1, 256 }; -canid_t calc_id(int testcase) +static int s; + +static canid_t calc_id(int testcase) { canid_t id = ID; @@ -78,7 +32,7 @@ canid_t calc_id(int testcase) return id; } -canid_t calc_mask(int testcase) +static canid_t calc_mask(int testcase) { canid_t mask = CAN_SFF_MASK; @@ -93,174 +47,151 @@ canid_t calc_mask(int testcase) return mask; } -int main(int argc, char **argv) +static void setup(void) { - fd_set rdfs; - struct timeval tv; - int s; struct sockaddr_can addr; - struct can_filter rfilter; - struct can_frame frame; - int testcase; - int have_rx; - int rx; - int rxbits, rxbitval; - int ret; - int recv_own_msgs = 1; struct ifreq ifr; + int recv_own_msgs = 1; - /* check command line options */ - if (argc != 2) { - fprintf(stderr, "Usage: %s \n", argv[0]); - return TFAIL; - } + can_setup_vcan(); - s = socket(PF_CAN, SOCK_RAW, CAN_RAW); - if (s < 0) { - perror("socket"); - return TFAIL; - } + s = SAFE_SOCKET(PF_CAN, SOCK_RAW, CAN_RAW); + + strcpy(ifr.ifr_name, can_dev_name); + SAFE_IOCTL(s, SIOCGIFINDEX, &ifr); - strcpy(ifr.ifr_name, argv[1]); - if (ioctl(s, SIOCGIFINDEX, &ifr) < 0) { - perror("SIOCGIFINDEX"); - return TFAIL; - } addr.can_family = AF_CAN; addr.can_ifindex = ifr.ifr_ifindex; - setsockopt(s, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS, - &recv_own_msgs, sizeof(recv_own_msgs)); + SAFE_SETSOCKOPT(s, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS, + &recv_own_msgs, sizeof(recv_own_msgs)); - if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - perror("bind"); - return TFAIL; - } + SAFE_BIND(s, (struct sockaddr *)&addr, sizeof(addr)); +} - printf("---\n"); +static void cleanup(void) +{ + if (s) + SAFE_CLOSE(s); - for (testcase = 0; testcase < TC; testcase++) { + can_cleanup_vcan(); +} - rfilter.can_id = calc_id(testcase); - rfilter.can_mask = calc_mask(testcase); - setsockopt(s, SOL_CAN_RAW, CAN_RAW_FILTER, - &rfilter, sizeof(rfilter)); +static void run(unsigned int n) +{ + fd_set rdfs; + struct timeval tv; + struct can_frame frame; + static struct can_filter rfilter; + int testcase = n; + int have_rx = 1; + int rx = 0; + int rxbits = 0, rxbitval; - printf("testcase %2d filters : can_id = 0x%08X can_mask = " - "0x%08X\n", testcase, rfilter.can_id, rfilter.can_mask); + rfilter.can_id = calc_id(testcase); + rfilter.can_mask = calc_mask(testcase); + SAFE_SETSOCKOPT(s, SOL_CAN_RAW, CAN_RAW_FILTER, + &rfilter, sizeof(rfilter)); - printf("testcase %2d sending patterns ... ", testcase); + tst_res(TINFO, "testcase %2d filters : can_id = 0x%08X can_mask = " + "0x%08X", testcase, rfilter.can_id, rfilter.can_mask); - frame.can_dlc = 1; - frame.data[0] = testcase; + tst_res(TINFO, "testcase %2d sending patterns ... ", testcase); - frame.can_id = ID; - if (write(s, &frame, sizeof(frame)) < 0) { - perror("write"); - exit(1); - } - frame.can_id = (ID | CAN_RTR_FLAG); - if (write(s, &frame, sizeof(frame)) < 0) { - perror("write"); - exit(1); - } - frame.can_id = (ID | CAN_EFF_FLAG); - if (write(s, &frame, sizeof(frame)) < 0) { - perror("write"); - exit(1); - } - frame.can_id = (ID | CAN_EFF_FLAG | CAN_RTR_FLAG); - if (write(s, &frame, sizeof(frame)) < 0) { - perror("write"); - exit(1); - } + frame.can_dlc = 1; + frame.data[0] = testcase; - printf("ok\n"); + frame.can_id = ID; + SAFE_WRITE(1, s, &frame, sizeof(frame)); - have_rx = 1; - rx = 0; - rxbits = 0; + frame.can_id = (ID | CAN_RTR_FLAG); + SAFE_WRITE(1, s, &frame, sizeof(frame)); - while (have_rx) { + frame.can_id = (ID | CAN_EFF_FLAG); + SAFE_WRITE(1, s, &frame, sizeof(frame)); - have_rx = 0; - FD_ZERO(&rdfs); - FD_SET(s, &rdfs); - tv.tv_sec = 0; - tv.tv_usec = 50000; /* 50ms timeout */ + frame.can_id = (ID | CAN_EFF_FLAG | CAN_RTR_FLAG); + SAFE_WRITE(1, s, &frame, sizeof(frame)); - ret = select(s + 1, &rdfs, NULL, NULL, &tv); - if (ret < 0) { - perror("select"); - exit(1); - } + tst_res(TPASS, "testcase %2d Sent patterns", testcase); + + while (have_rx) { + + have_rx = 0; + FD_ZERO(&rdfs); + FD_SET(s, &rdfs); + tv.tv_sec = 0; + tv.tv_usec = 50000; /* 50ms timeout */ + + if (select(s + 1, &rdfs, NULL, NULL, &tv) < 0) + tst_brk(TBROK | TERRNO, "select"); - if (FD_ISSET(s, &rdfs)) { - have_rx = 1; - ret = read(s, &frame, sizeof(struct can_frame)); - if (ret < 0) { - perror("read"); - exit(1); - } - if ((frame.can_id & CAN_SFF_MASK) != ID) { - fprintf(stderr, - "received wrong can_id!\n"); - exit(1); - } - if (frame.data[0] != testcase) { - fprintf(stderr, - "received wrong testcase!\n"); - exit(1); - } - - /* test & calc rxbits */ - rxbitval = 1 << ((frame.can_id & - (CAN_EFF_FLAG | CAN_RTR_FLAG | - CAN_ERR_FLAG)) >> 28); - - /* only receive a rxbitval once */ - if ((rxbits & rxbitval) == rxbitval) { - fprintf(stderr, - "received rxbitval %d twice!\n", - rxbitval); - exit(1); - } - rxbits |= rxbitval; - rx++; - - printf("testcase %2d rx : can_id = 0x%08X rx = " - "%d rxbits = %d\n", testcase, - frame.can_id, rx, rxbits); + if (FD_ISSET(s, &rdfs)) { + have_rx = 1; + SAFE_READ(1, s, &frame, sizeof(struct can_frame)); + + if ((frame.can_id & CAN_SFF_MASK) != ID) + tst_res(TFAIL, "received wrong can_id!"); + + if (frame.data[0] != testcase) + tst_res(TFAIL, "received wrong testcase!"); + + /* test & calc rxbits */ + rxbitval = 1 << ((frame.can_id & + (CAN_EFF_FLAG | CAN_RTR_FLAG | + CAN_ERR_FLAG)) >> 28); + + /* only receive a rxbitval once */ + if ((rxbits & rxbitval) == rxbitval) { + tst_res(TFAIL, "received rxbitval %d twice!", + rxbitval); } + rxbits |= rxbitval; + rx++; + + tst_res(TINFO, "testcase %2d rx : can_id = 0x%08X rx = " + "%d rxbits = %d", testcase, + frame.can_id, rx, rxbits); } - /* rx timed out -> check the received results */ - if (rx_res[testcase] != rx) { - fprintf(stderr, - "wrong rx value in testcase %d : %d (expected " - "%d)\n", testcase, rx, rx_res[testcase]); - exit(1); - } - if (rxbits_res[testcase] != rxbits) { - fprintf(stderr, - "wrong rxbits value in testcase %d : %d " - "(expected %d)\n", testcase, rxbits, - rxbits_res[testcase]); - exit(1); - } - printf("testcase %2d ok\n---\n", testcase); } - - close(s); - - return TPASS; + /* rx timed out -> check the received results */ + if (rx_res[testcase] != rx) { + tst_brk(TBROK, + "wrong rx value in testcase %d : %d (expected " + "%d)", testcase, rx, rx_res[testcase]); + } + if (rxbits_res[testcase] != rxbits) { + tst_brk(TBROK, + "wrong rxbits value in testcase %d : %d " + "(expected %d)", testcase, rxbits, + rxbits_res[testcase]); + } + tst_res(TPASS, "testcase %2d ok", testcase); } +static struct tst_test test = { + .tcnt = TC, + .options = (struct tst_option[]) { + {"D:", &can_dev_name, "-D CAN device name"}, + {} + }, + .setup = setup, + .cleanup = cleanup, + .test = run, + .caps = (struct tst_cap []) { + TST_CAP(TST_CAP_REQ, CAP_NET_RAW), + TST_CAP(TST_CAP_DROP, CAP_SYS_ADMIN), + {} + }, + .needs_drivers = (const char *const[]) { + "vcan", + "can-raw", + NULL + } +}; + #else -int main(void) -{ - printf("The linux/can.h was missing upon compilation.\n"); - return TCONF; -} +TST_TEST_TCONF("The linux/can.h was missing upon compilation"); #endif /* HAVE_LINUX_CAN_H */ From patchwork Tue Jan 19 09:31:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Palethorpe X-Patchwork-Id: 1428540 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=EQAnXgN/; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DKk490DTxz9sRR for ; Tue, 19 Jan 2021 20:33:44 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 4DAC13C30CC for ; Tue, 19 Jan 2021 10:33:42 +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 6398B3C3249 for ; Tue, 19 Jan 2021 10:33:12 +0100 (CET) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id 95534200AC8 for ; Tue, 19 Jan 2021 10:33:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1611048791; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pW9Dike2hAGxVs676V9ZqPMLNrVdbbKomWkGz8A04/E=; b=EQAnXgN/wKErTlE7gmpwJi8ZQz87nPHdI+gp6H8Y+/eFS+DMmos0am/+cjxPlHSPs1edJT BnlZkg4Jefu3FYDvxvS6pUE8alKK5h+E1Yfqes2EpxQ1d8ALN83g1hCRkT6572S/giJR8A qDRLcFIHDwk5CcCMrP3NDN1dbVNP/5c= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 401DFB3E8; Tue, 19 Jan 2021 09:33:11 +0000 (UTC) To: ltp@lists.linux.it Date: Tue, 19 Jan 2021 09:31:41 +0000 Message-Id: <20210119093143.17222-5-rpalethorpe@suse.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119093143.17222-1-rpalethorpe@suse.com> References: <20210119093143.17222-1-rpalethorpe@suse.com> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 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,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-7.smtp.seeweb.it Subject: [LTP] [PATCH v2 4/6] can_recv_own_msgs: Convert to new library X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Palethorpe via ltp From: Richard Palethorpe Reply-To: Richard Palethorpe Cc: Oliver Hartkopp , Richard Palethorpe , linux-can@vger.kernel.org Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Behavior is approximately the same except for the following: * Test will continue after non-fatal errors. * We now check the return value of `setsocketopt` and that I/O completed the specified number of bytes. * The command line arg, device name, must be prepended with `-D` Signed-off-by: Richard Palethorpe --- .../can/filter-tests/can_rcv_own_msgs.c | 273 ++++++------------ 1 file changed, 88 insertions(+), 185 deletions(-) diff --git a/testcases/network/can/filter-tests/can_rcv_own_msgs.c b/testcases/network/can/filter-tests/can_rcv_own_msgs.c index 8ad51d298..3726dd6f7 100644 --- a/testcases/network/can/filter-tests/can_rcv_own_msgs.c +++ b/testcases/network/can/filter-tests/can_rcv_own_msgs.c @@ -1,88 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * tst-rcv-own-msgs.c - * - * Copyright (c) 2010 Volkswagen Group Electronic Research - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Volkswagen nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * Alternatively, provided that this notice is retained in full, this - * software may be distributed under the terms of the GNU General - * Public License ("GPL") version 2, in which case the provisions of the - * GPL apply INSTEAD OF those given above. - * - * The provided data structures and external interfaces from this code - * are not restricted to be used by modules with a GPL compatible license. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * Send feedback to - * + * Copyright (c) 2011 Volkswagen Group Electronic Research + * Copyright (c) 2021 SUSE LLC */ -#include -#include -#include -#include - -#include -#include -#include -#include -#include #include "config.h" -#include "tst_res_flags.h" -#include "tst_minmax.h" +#include "tst_test.h" #ifdef HAVE_LINUX_CAN_H -#include -#include +#include "can_common.h" +#include "tst_minmax.h" -struct rxs { - int s; - int t; -}; +static int s, t; -struct rxs test_sockets(int s, int t, canid_t can_id) +void test_sockets(canid_t can_id, int expect_rxs, int expect_rxt) { fd_set rdfs; struct timeval tv; int m = MAX(s, t) + 1; int have_rx = 1; struct can_frame frame; - struct rxs rx; - int ret; + int rxs = 0, rxt = 0; frame.can_id = can_id; frame.can_dlc = 0; - if (write(s, &frame, sizeof(frame)) < 0) { - perror("write"); - exit(1); - } - - rx.s = rx.t = 0; + SAFE_WRITE(1, s, &frame, sizeof(frame)); while (have_rx) { @@ -93,164 +36,124 @@ struct rxs test_sockets(int s, int t, canid_t can_id) tv.tv_usec = 50000; /* 50ms timeout */ have_rx = 0; - ret = select(m, &rdfs, NULL, NULL, &tv); - if (ret < 0) { - perror("select"); - exit(1); - } + if (select(m, &rdfs, NULL, NULL, &tv) < 0) + tst_brk(TBROK | TERRNO, "select"); if (FD_ISSET(s, &rdfs)) { have_rx = 1; - ret = read(s, &frame, sizeof(struct can_frame)); - if (ret < 0) { - perror("read"); - exit(1); - } - if (frame.can_id != can_id) { - fprintf(stderr, "received wrong can_id!\n"); - exit(1); - } - rx.s++; + SAFE_READ(1, s, &frame, sizeof(struct can_frame)); + + if (frame.can_id != can_id) + tst_res(TFAIL, "received wrong can_id!"); + + rxs++; } if (FD_ISSET(t, &rdfs)) { have_rx = 1; - ret = read(t, &frame, sizeof(struct can_frame)); - if (ret < 0) { - perror("read"); - exit(1); - } - if (frame.can_id != can_id) { - fprintf(stderr, "received wrong can_id!\n"); - exit(1); - } - rx.t++; + SAFE_READ(1, t, &frame, sizeof(struct can_frame)); + + if (frame.can_id != can_id) + tst_res(TFAIL, "received wrong can_id!"); + + rxt++; } } /* timeout */ - return rx; + tst_res(rxs == expect_rxs && rxt == expect_rxt ? TPASS : TFAIL, + "s received %d of %d, t received %d of %d", + rxs, expect_rxs, rxt, expect_rxt); } -void setopts(int s, int loopback, int recv_own_msgs) +static void setopts(int loopback, int recv_own_msgs) { - setsockopt(s, SOL_CAN_RAW, CAN_RAW_LOOPBACK, &loopback, - sizeof(loopback)); - setsockopt(s, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS, &recv_own_msgs, - sizeof(recv_own_msgs)); + SAFE_SETSOCKOPT(s, SOL_CAN_RAW, CAN_RAW_LOOPBACK, &loopback, + sizeof(loopback)); + SAFE_SETSOCKOPT(s, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS, &recv_own_msgs, + sizeof(recv_own_msgs)); - printf("check loopback %d recv_own_msgs %d ... ", loopback, - recv_own_msgs); + tst_res(TINFO, "set loopback = %d, recv_own_msgs = %d", + loopback, recv_own_msgs); } -int main(int argc, char **argv) +static void setup(void) { - int s, t; struct sockaddr_can addr; struct ifreq ifr; - struct rxs rx; - /* check command line options */ - if (argc != 2) { - fprintf(stderr, "Usage: %s \n", argv[0]); - return TFAIL; - } + can_setup_vcan(); - s = socket(PF_CAN, SOCK_RAW, CAN_RAW); - if (s < 0) { - perror("socket"); - return TFAIL; - } - t = socket(PF_CAN, SOCK_RAW, CAN_RAW); - if (t < 0) { - perror("socket"); - return TFAIL; - } + s = SAFE_SOCKET(PF_CAN, SOCK_RAW, CAN_RAW); + t = SAFE_SOCKET(PF_CAN, SOCK_RAW, CAN_RAW); + + strcpy(ifr.ifr_name, can_dev_name); + SAFE_IOCTL(s, SIOCGIFINDEX, &ifr); - strcpy(ifr.ifr_name, argv[1]); - if (ioctl(s, SIOCGIFINDEX, &ifr) < 0) { - perror("SIOCGIFINDEX"); - return TFAIL; - } addr.can_ifindex = ifr.ifr_ifindex; addr.can_family = AF_CAN; - if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - perror("bind"); - return TFAIL; - } - if (bind(t, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - perror("bind"); - return TFAIL; - } + SAFE_BIND(s, (struct sockaddr *)&addr, sizeof(addr)); + SAFE_BIND(t, (struct sockaddr *)&addr, sizeof(addr)); +} - printf("Starting PF_CAN frame flow test.\n"); - printf("checking socket default settings ... "); - rx = test_sockets(s, t, 0x340); - if (rx.s == 0 && rx.t == 1) - printf("ok.\n"); - else { - printf("failure!\n"); - return TFAIL; - } +static void cleanup(void) +{ + if (s) + SAFE_CLOSE(s); + if (t) + SAFE_CLOSE(t); - /* check loopback 0 recv_own_msgs 0 */ - setopts(s, 0, 0); - rx = test_sockets(s, t, 0x341); - if (rx.s == 0 && rx.t == 0) - printf("ok.\n"); - else { - printf("failure!\n"); - return TFAIL; - } + can_cleanup_vcan(); +} - /* check loopback 0 recv_own_msgs 1 */ - setopts(s, 0, 1); - rx = test_sockets(s, t, 0x342); - if (rx.s == 0 && rx.t == 0) - printf("ok.\n"); - else { - printf("failure!\n"); - return TFAIL; - } +static void run(void) +{ + tst_res(TINFO, "Starting PF_CAN frame flow test."); + tst_res(TINFO, "checking socket default settings"); + test_sockets(0x340, 0, 1); - /* check loopback 1 recv_own_msgs 0 */ - setopts(s, 1, 0); - rx = test_sockets(s, t, 0x343); - if (rx.s == 0 && rx.t == 1) - printf("ok.\n"); - else { - printf("failure!\n"); - return TFAIL; - } + setopts(0, 0); + test_sockets(0x341, 0, 0); - /* check loopback 1 recv_own_msgs 1 */ - setopts(s, 1, 1); - rx = test_sockets(s, t, 0x344); - if (rx.s == 1 && rx.t == 1) - printf("ok.\n"); - else { - printf("failure!\n"); - return TFAIL; - } + setopts(0, 1); + test_sockets(0x342, 0, 0); - printf("PF_CAN frame flow test was successful.\n"); + setopts(1, 0); + test_sockets(0x343, 0, 1); - close(s); - close(t); + setopts(1, 1); + test_sockets(0x344, 1, 1); - return TPASS; + /* Return to defaults for when -i is used */ + setopts(1, 0); } +static struct tst_test test = { + .options = (struct tst_option[]) { + {"D:", &can_dev_name, "-D CAN device name"}, + {} + }, + .setup = setup, + .cleanup = cleanup, + .test_all = run, + .caps = (struct tst_cap []) { + TST_CAP(TST_CAP_REQ, CAP_NET_RAW), + TST_CAP(TST_CAP_DROP, CAP_SYS_ADMIN), + {} + }, + .needs_drivers = (const char *const[]) { + "vcan", + "can-raw", + NULL + } +}; + #else -int main(void) -{ - printf("The linux/can.h was missing upon compilation.\n"); - return TCONF; -} +TST_TEST_TCONF("The linux/can.h was missing upon compilation"); #endif /* HAVE_LINUX_CAN_H */ From patchwork Tue Jan 19 09:31:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Palethorpe X-Patchwork-Id: 1428544 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=r+YIz7RC; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DKk4k3GjCz9sW1 for ; Tue, 19 Jan 2021 20:34:14 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id B545F3C67CD for ; Tue, 19 Jan 2021 10:34:11 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [IPv6:2001:4b78:1:20::6]) by picard.linux.it (Postfix) with ESMTP id 7E0453C5F98 for ; Tue, 19 Jan 2021 10:33:13 +0100 (CET) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id 1708F140099F for ; Tue, 19 Jan 2021 10:33:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1611048791; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xRpur4X4QLIwGgVlq2ehmCMknCfsPV+EU++nQPDZmbk=; b=r+YIz7RC1B4PHwb+fWUqL+6q9gX6XqwjZzNrTFroD0e5rR64WOakCPFH1X7n44yTWGXZxh 4TLuKG8IEI26varW77Nvn6Xh/GSG7VCfmJLw8sRYJwHr/ZookaBuk/xfuu9Rb+DdDCYNHO 7d7HIp5WHg5GoUDPBjgDsHEP/lkUauo= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id B61B6B699; Tue, 19 Jan 2021 09:33:11 +0000 (UTC) To: ltp@lists.linux.it Date: Tue, 19 Jan 2021 09:31:42 +0000 Message-Id: <20210119093143.17222-6-rpalethorpe@suse.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119093143.17222-1-rpalethorpe@suse.com> References: <20210119093143.17222-1-rpalethorpe@suse.com> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 at in-6.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,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-6.smtp.seeweb.it Subject: [LTP] [PATCH v2 5/6] can: Remove obsolete test wrapper script X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Palethorpe via ltp From: Richard Palethorpe Reply-To: Richard Palethorpe Cc: Oliver Hartkopp , Richard Palethorpe , linux-can@vger.kernel.org Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Functionality moved into can_common.h and the test executables. Signed-off-by: Richard Palethorpe --- testcases/network/can/Makefile | 2 - .../can/filter-tests/00_Descriptions.txt | 1 + testcases/network/can/filter-tests/INSTALL | 3 +- testcases/network/can/filter-tests/Makefile | 2 - .../network/can/filter-tests/can_run_tests.sh | 106 ------------------ 5 files changed, 3 insertions(+), 111 deletions(-) delete mode 100755 testcases/network/can/filter-tests/can_run_tests.sh diff --git a/testcases/network/can/Makefile b/testcases/network/can/Makefile index 31744534a..a69f6be87 100644 --- a/testcases/network/can/Makefile +++ b/testcases/network/can/Makefile @@ -22,6 +22,4 @@ top_srcdir ?= ../../.. include $(top_srcdir)/include/mk/env_pre.mk -INSTALL_TARGETS := *.sh - include $(top_srcdir)/include/mk/generic_trunk_target.mk diff --git a/testcases/network/can/filter-tests/00_Descriptions.txt b/testcases/network/can/filter-tests/00_Descriptions.txt index 89610982c..55d213456 100644 --- a/testcases/network/can/filter-tests/00_Descriptions.txt +++ b/testcases/network/can/filter-tests/00_Descriptions.txt @@ -5,5 +5,6 @@ information on the CAN network protocol family PF_CAN is contained in . For any issue(s) with CAN tests please write to: + , Oliver Hartkopp , diff --git a/testcases/network/can/filter-tests/INSTALL b/testcases/network/can/filter-tests/INSTALL index e549aed0f..7d62d65fe 100644 --- a/testcases/network/can/filter-tests/INSTALL +++ b/testcases/network/can/filter-tests/INSTALL @@ -12,7 +12,8 @@ enable CAN protocol, please see ltp/README file. $ make 2) To Run the tests from this directory, do: -$ ./run_ltp-can_tests.sh +$ ./can_filter +$ ./can_rcv_own_msgs 3) To let LTP run the tests from $LTPROOT, execute: $ ./runltp -f can diff --git a/testcases/network/can/filter-tests/Makefile b/testcases/network/can/filter-tests/Makefile index 6a9474164..29aaa3240 100644 --- a/testcases/network/can/filter-tests/Makefile +++ b/testcases/network/can/filter-tests/Makefile @@ -23,6 +23,4 @@ include $(top_srcdir)/include/mk/testcases.mk CPPFLAGS += -DETH_P_CAN=0x000C -DPF_CAN=29 -DAF_CAN=PF_CAN -INSTALL_TARGETS := *.sh - include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/network/can/filter-tests/can_run_tests.sh b/testcases/network/can/filter-tests/can_run_tests.sh deleted file mode 100755 index 762d90eca..000000000 --- a/testcases/network/can/filter-tests/can_run_tests.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -################################################################################ -## Copyright (c) Oliver Hartkopp , 2011 ## -## Copyright (c) International Business Machines Corp., 2009 ## -## ## -## 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 Street, Fifth Floor, Boston, MA 02110-1301 USA ## -## ## -################################################################################ - -TCID="$1" -TST_TOTAL=1 -export TST_COUNT - -. test.sh - -setup() -{ - tst_require_root - - # load needed CAN networklayer modules - modprobe can - ret=$? - if [ $ret -ne 0 ]; then - tst_brkm TCONF "modprobe can failed: ret - $ret" - fi - - modprobe can_raw - ret=$? - if [ $ret -ne 0 ]; then - tst_brkm TCONF "modprobe can_raw failed: ret - $ret" - fi - - # ensure the vcan driver to perform the ECHO on driver level - modprobe -r vcan - ret=$? - if [ $ret -ne 0 ]; then - tst_brkm TCONF "modprobe -r vcan failed: ret - $ret" - fi - - modprobe vcan echo=1 - ret=$? - if [ $ret -ne 0 ]; then - tst_brkm TCONF "modprobe vcan echo=1 failed: ret - $ret" - fi - - VCAN=vcan0 - - # create virtual CAN device - ip link add dev $VCAN type vcan - ret=$? - if [ $ret -ne 0 ]; then - tst_brkm TBROK \ - "ip link add dev $VCAN type vcan failed: ret - $ret" - fi - - ip link set dev $VCAN up - ret=$? - if [ $ret -ne 0 ]; then - tst_brkm TBROK "ip link set dev $VCAN up failed: ret - $ret" - fi - - # check precondition for CAN frame flow test - HAS_ECHO=`ip link show $VCAN | grep -c ECHO` - if [ $HAS_ECHO -ne 1 ]; then - tst_brkm TBROK "ECHO is not 1" - fi -} - -cleanup() -{ - ip link set dev $VCAN down - ip link del dev $VCAN - modprobe -r vcan - modprobe -r can_raw - modprobe -r can -} - -if [ $# -ne 1 ]; then - tst_brkm TBROK "Usage: $0 [can_filter | can_rcv_own_msgs]" -fi - -setup -TST_CLEANUP=cleanup - -"$1" "$VCAN" -ret=$? -case "$ret" in -0) tst_resm TPASS "Test $1 PASS";; -1) tst_resm TFAIL "Test $1 FAIL";; -32) tst_resm TCONF "$1 is not appropriate for configuration flag";; -*) tst_resm TBROK "Invalid resm type $ret";; -esac - -tst_exit From patchwork Tue Jan 19 09:31:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Palethorpe X-Patchwork-Id: 1428542 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) 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; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.com header.i=@suse.com header.a=rsa-sha256 header.s=susede1 header.b=Rhz5adae; dkim-atps=neutral Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DKk4W5JGYz9sRR for ; Tue, 19 Jan 2021 20:34:03 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 278C63C67D3 for ; Tue, 19 Jan 2021 10:34:01 +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 E8F653C308C for ; Tue, 19 Jan 2021 10:33:12 +0100 (CET) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 9C3501000A58 for ; Tue, 19 Jan 2021 10:33:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1611048792; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=T17yGg+SFCTvViuHxcXtJf5jHe64yM2cb/CZLi8hhL4=; b=Rhz5adaedWgSfufJIg7X0Kx2t5UaHxY2HEnIX069TJR6jEQoQ8peONHffGArLvatV/fymv 2yw0pv+le2h465NcmwSHMzcNfxggZfQbKj6h5ssDvKyOBM9zZCXKHrb7dY8CmZiuwTiW0b TqAiwzknbKlFw1nn1iQiwjYI8QjsqxI= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 38A3AB707; Tue, 19 Jan 2021 09:33:12 +0000 (UTC) To: ltp@lists.linux.it Date: Tue, 19 Jan 2021 09:31:43 +0000 Message-Id: <20210119093143.17222-7-rpalethorpe@suse.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210119093143.17222-1-rpalethorpe@suse.com> References: <20210119093143.17222-1-rpalethorpe@suse.com> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.102.4 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,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on in-4.smtp.seeweb.it Subject: [LTP] [PATCH v2 6/6] can: Update contact details X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Palethorpe via ltp From: Richard Palethorpe Reply-To: Richard Palethorpe Cc: Oliver Hartkopp , Richard Palethorpe , linux-can@vger.kernel.org Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" socketcan-users appears to be no more. Signed-off-by: Richard Palethorpe --- testcases/network/can/filter-tests/00_Descriptions.txt | 5 +++-- testcases/network/can/filter-tests/Makefile | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/testcases/network/can/filter-tests/00_Descriptions.txt b/testcases/network/can/filter-tests/00_Descriptions.txt index 55d213456..9623d29a0 100644 --- a/testcases/network/can/filter-tests/00_Descriptions.txt +++ b/testcases/network/can/filter-tests/00_Descriptions.txt @@ -6,5 +6,6 @@ information on the CAN network protocol family PF_CAN is contained in For any issue(s) with CAN tests please write to: -, -Oliver Hartkopp , +Oliver Hartkopp +Linux-CAN ML + diff --git a/testcases/network/can/filter-tests/Makefile b/testcases/network/can/filter-tests/Makefile index 29aaa3240..bd57c7fff 100644 --- a/testcases/network/can/filter-tests/Makefile +++ b/testcases/network/can/filter-tests/Makefile @@ -14,8 +14,6 @@ # 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 Street, Fifth Floor, Boston, MA 02110-1301 USA. -# -# Send feedback to top_srcdir ?= ../../../..