From nobody Mon Sep 04 23:58:20 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 4Rflvv68fJz4rtM9 for ; Mon, 4 Sep 2023 23:58:35 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Rflvv1jYnz4Mgj for ; Mon, 4 Sep 2023 23:58:35 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2bcde83ce9fso31679861fa.1 for ; Mon, 04 Sep 2023 16:58:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1693871913; x=1694476713; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=6X+NcYYXvIau7oCqJ4OruOWCt7nZVHUFC/yqTuy9s2g=; b=RGRz5D+InaO+ekqCE0HKnVYxvYo1Qmk4KqypAn5rGXza3uAbrIoxJhSJ7jXle4URXK Pd6iHwtV6N6nTKDWt8ND1BYeD3X/BcbOAOxbG8LbBy4uCee5ChYdgVlr6llUOEC18l2K Pt9zZYgyW3rYio3ER0K/g5v35rDnPx4nJqvJCuVAFFRbckUzykPpLrqY+97iKiq/BWXx 0TE8o2LaHjbEQpwWbfR2QtPbNzu9W4NMclxtNIWsTVI8eJCqWeKIJOsmxdwxkly6hpDl O0m8TYlTEpjHRRUDJDEs42kAexQLkFvu78YHyI65x3orIBUKOO5pXriTvaZSlwo3YC9O XnDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693871913; x=1694476713; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=6X+NcYYXvIau7oCqJ4OruOWCt7nZVHUFC/yqTuy9s2g=; b=l61hAYu5QdgRUkVDa+CBwFLE2yWOvWCxhQyogjz9R5o2Djehi8FlslVNn+B4gy/BY2 kParSfQJ2yvWWd0vrMFi/DEo0DORLjG0fGES0PwKwq7PC3GJZb/Hq/+isWHPaqsGYmQ5 Br96w26BbN4hcsAiDR0aCuyg1oWUy7Yrlr4yoDKr42HKTyE8M3RBWL7G1HX1pDRDc5Dl sWyBNzK3KXsDZxoOsrAZe5FKDUzokfTqhsCsqtIzNc4cBuEpGFXUK2uNNh01hLbErCnY TgTo045PlgnJUQ/DAdg7L84IUB5+y5AIIiB2FrzbncaXYcBdkHcMs0Z6u67nUOzBwNTE 4v1A== X-Gm-Message-State: AOJu0Yzz3ueflydP/GeMlGwaQRVd9/B5chSzqh3+ZVij2yyn2xBLNCGK CraGBMKKP7suyGlH9iSgehLceViEk5IKkHZK2Rnb0w== X-Google-Smtp-Source: AGHT+IE6DtmnAA72IWe2FudxRAxVMaUKFmEf1hHB3B5OFppkcWVZmL7NMhG3oXQoonp/AJqixG0zQl06Ij+HK9EYf6U= X-Received: by 2002:a2e:9c58:0:b0:2bc:d8cb:59fe with SMTP id t24-20020a2e9c58000000b002bcd8cb59femr7156676ljj.8.1693871912110; Mon, 04 Sep 2023 16:58:32 -0700 (PDT) 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 References: <202309021940.382Je6Hn028769@gitrepo.freebsd.org> <861qfdtsqh.fsf@ltc.des.no> In-Reply-To: <861qfdtsqh.fsf@ltc.des.no> From: Warner Losh Date: Mon, 4 Sep 2023 17:58:20 -0600 Message-ID: Subject: Re: git: ea82362219ee - main - tests: Skip all tests that require mdconfig when /dev/mdctl missing To: =?UTF-8?Q?Dag=2DErling_Sm=C3=B8rgrav?= Cc: Warner Losh , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000009de140060491498f" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4Rflvv1jYnz4Mgj --0000000000009de140060491498f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Sep 4, 2023 at 5:37=E2=80=AFPM Dag-Erling Sm=C3=B8rgrav wrote: > Warner Losh writes: > > diff --git a/tests/sys/cddl/zfs/tests/cache/cache_test.sh > b/tests/sys/cddl/zfs/tests/cache/cache_test.sh > > index 4d77d9fa56a7..79b09dd93183 100755 > > --- a/tests/sys/cddl/zfs/tests/cache/cache_test.sh > > +++ b/tests/sys/cddl/zfs/tests/cache/cache_test.sh > > @@ -280,6 +280,7 @@ cache_010_neg_body() > > . $(atf_get_srcdir)/cache.kshlib > > . $(atf_get_srcdir)/cache.cfg > > > > + [ -c /dev/mdctl ] || atf_skip "no /dev/mdctl to create md devices= " > > verify_disk_count "$DISKS" 1 > > ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" > > ksh93 $(atf_get_srcdir)/cache_010_neg.ksh || atf_fail "Testcase > failed" > > the canonical way to do this would be to add > > atf_set "require.files" "/dev/mdctl" > > to the testcase head. > Thanks for the tip. I'll redo this for the other ATF files. I have several others in the queue... I've not been good about sleuthing out these meta-data variables. Where's the list of them kept? Also, is there a canonical way to say "I expect this result, except if I'm in a jail, then I expect that result"? There's a number of things we have tests for (like mknod) that work outside a jail, but not inside. This results in about 50 failures when kyua runs in a jail (which is my test setup for bsd-user). Warner --0000000000009de140060491498f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, Sep 4, 2023 at 5:37=E2=80=AFP= M Dag-Erling Sm=C3=B8rgrav <des@freeb= sd.org> wrote:
Warner Losh <imp@FreeBSD.org> writes:
> diff --git a/tests/sys/cddl/zfs/tests/cache/cache_test.sh b/tests/sys/= cddl/zfs/tests/cache/cache_test.sh
> index 4d77d9fa56a7..79b09dd93183 100755
> --- a/tests/sys/cddl/zfs/tests/cache/cache_test.sh
> +++ b/tests/sys/cddl/zfs/tests/cache/cache_test.sh
> @@ -280,6 +280,7 @@ cache_010_neg_body()
>=C2=A0 =C2=A0 =C2=A0 =C2=A0. $(atf_get_srcdir)/cache.kshlib
>=C2=A0 =C2=A0 =C2=A0 =C2=A0. $(atf_get_srcdir)/cache.cfg
>=C2=A0
> +=C2=A0 =C2=A0 =C2=A0[ -c /dev/mdctl ] || atf_skip "no /dev/mdctl= to create md devices"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0verify_disk_count "$DISKS" 1
>=C2=A0 =C2=A0 =C2=A0 =C2=A0ksh93 $(atf_get_srcdir)/setup.ksh || atf_fai= l "Setup failed"
>=C2=A0 =C2=A0 =C2=A0 =C2=A0ksh93 $(atf_get_srcdir)/cache_010_neg.ksh ||= atf_fail "Testcase failed"

the canonical way to do this would be to add

=C2=A0 =C2=A0 atf_set "require.files" "/dev/mdctl"

to the testcase head.

Thanks for the ti= p. I'll redo this for the other ATF files. I have several others in the= queue...

I've not been good about sleuthi= ng out these meta-data variables. Where's the list of
them ke= pt?

Also, is there a canonical way to say "I = expect this result, except if I'm in a jail, then I expect that result&= quot;?
There's a number of things we have tests for (like mkn= od) that work outside a jail, but not inside. This
results in abo= ut 50 failures when kyua runs in a jail (which is my test setup for bsd-use= r).

Warner
--0000000000009de140060491498f--