From nobody Wed Mar 01 10:00:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PRV9X12sdz3vfml; Wed, 1 Mar 2023 10:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRV9X0WDPz4Jlb; Wed, 1 Mar 2023 10:00:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677664848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tAThNX9DIJUPi+gyN6hCovbHe4Oa9W/ajZoy7sqiI8s=; b=eul/9a/rbdhmPwV9gFae/0NInKuznJ7YaAAYc7H0Gx0t6DsFFnrWRlgdycre5W+VZJ/i53 GLRuQXocNBwlCLbN8oUv4q1+SCVRtavfRYyyvGj0/i8JLmcNSFTkTxGRphpA1ZK0i+6Evl nNg3n5S3bkI7pbnCYTFQHiD5nqmK7xIj225PfnkhQO7apryDBwsH278P7YsXBgsZ4P9Hc7 1A+tCRWpNuQB1wRw/eS6EJ4YoQ+PaXPfSXi8uTewSr8BSNRXB2c7HtRyrEUw7zzMwrWGty x/j8qHWn1GR2Cq0q3hUyOMlJShsZB9bqqkUp3hbUwsfeY+ZZn26pz5a5wIrVPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677664848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tAThNX9DIJUPi+gyN6hCovbHe4Oa9W/ajZoy7sqiI8s=; b=IyWCX6K2mz6midb7FCaPSdENNjKcIRXqfm21sqO62MWr4zx9nhQtcnmnWt50O6PtnwMDv+ sZCqa6lXlnyx820kTaFd3Vh13uejg/ZxUWipYu/ZK41txT0EtyGneAsC+3IvGzSAlXW8v4 XKfHc30pnIt6PdQSrOtOYX1vdnmz2ruGqgQ7Q4K4WngRQ+k+/lkr4CE4VeqfNMrEwD+nOE 4KD7aAAvLbgKZn+1Id385ZCWjRekbhCuK2IcF/MJy3TkkXWyz6o2lwOlQ2GwFiediuSWnN EKaJ/PlQuc8LwSX/NCjlMZKY3ZTef8F/QKdh5Lcf6WvEjkc5aGYJMHDJed/6wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677664848; a=rsa-sha256; cv=none; b=eCk8Aajv7irgef9lBxPiruj69Zc8khmaPWVv7ETrLN2xBDvw/lfGE6c5sZ4SpNauvjuIiJ Is4CZJvBhodvXor20p0JVLuD21ntku1mV5CZYcFlGwNvGdowsgLpzKfiSjV4OMY7VqqxnU tD9WU0dG1DiFzACs7naAzj5c+dwd9f633kw9hOqLiCMmJelDbdSg206yO/7fonY6cDXMDq tFlVSlQs8cY206L9TSd1FCMpG6bxb+IDwIbYmBMaztK03EYz9MbcavKNrWmh1bDPMK1DhY El7fvylDJ2lKL0INZEBeSBuZGouUKZcHMxApuhm7SZF9lwGWoirBakatM6VEJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRV9W6kSTzV92; Wed, 1 Mar 2023 10:00:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 321A0l09055847; Wed, 1 Mar 2023 10:00:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321A0l7e055846; Wed, 1 Mar 2023 10:00:47 GMT (envelope-from git) Date: Wed, 1 Mar 2023 10:00:47 GMT Message-Id: <202303011000.321A0l7e055846@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 69361b878546 - main - if_ovpn tests: skip the if_ovpn_c test if if_ovpn.ko isn't loaded List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69361b8785468fe15bb2b169a0b72af5bc108cfa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=69361b8785468fe15bb2b169a0b72af5bc108cfa commit 69361b8785468fe15bb2b169a0b72af5bc108cfa Author: Kristof Provost AuthorDate: 2023-02-28 10:14:24 +0000 Commit: Kristof Provost CommitDate: 2023-03-01 09:07:34 +0000 if_ovpn tests: skip the if_ovpn_c test if if_ovpn.ko isn't loaded Skip the test (rather than loading it) if if_ovpn.ko isn't loaded. Match the behaviour of other tests. Sponsored by: Rubicon Communications, LLC ("Netgate") --- tests/sys/net/if_ovpn/if_ovpn_c.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/sys/net/if_ovpn/if_ovpn_c.c b/tests/sys/net/if_ovpn/if_ovpn_c.c index d98f5a0dd8e6..fa8a9a07fa35 100644 --- a/tests/sys/net/if_ovpn/if_ovpn_c.c +++ b/tests/sys/net/if_ovpn/if_ovpn_c.c @@ -88,7 +88,8 @@ ATF_TC_BODY(tcp, tc) nvlist_t *nvl; /* Ensure the module is loaded. */ - (void)kldload("if_ovpn"); + if (kldfind("if_ovpn") == -1 && errno == ENOENT) + atf_tc_skip("if_ovpn not loaded"); ovpn_fd = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK, 0);