Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/dev/cgd When run from py-anita/amd64 this test fails w...



details:   https://anonhg.NetBSD.org/src/rev/d7972e573168
branches:  trunk
changeset: 368938:d7972e573168
user:      hannken <hannken%NetBSD.org@localhost>
date:      Sat Aug 13 17:46:26 2022 +0000

description:
When run from py-anita/amd64 this test fails with:

  cgdconfig: getfsspecname failed: no match for `wd0e'

as the virtual machine has root on dk0, dk0 at wd0 and trying to
open wd0e fails.

This tests runs without a rump kernel and therefore should not
even try to open configured devices on the host.  Replace the
disks "wd0e" and "ld1e" with non-existant disks "dska" and "dskb".

diffstat:

 tests/dev/cgd/t_cgdconfig.sh |  54 ++++++++++++++++++++++----------------------
 1 files changed, 27 insertions(+), 27 deletions(-)

diffs (138 lines):

diff -r 29114806c64c -r d7972e573168 tests/dev/cgd/t_cgdconfig.sh
--- a/tests/dev/cgd/t_cgdconfig.sh      Sat Aug 13 17:31:32 2022 +0000
+++ b/tests/dev/cgd/t_cgdconfig.sh      Sat Aug 13 17:46:26 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: t_cgdconfig.sh,v 1.3 2022/08/12 10:49:17 riastradh Exp $
+#      $NetBSD: t_cgdconfig.sh,v 1.4 2022/08/13 17:46:26 hannken Exp $
 #
 # Copyright (c) 2022 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -53,7 +53,7 @@
 }
 storedkeys_body()
 {
-       cat <<EOF >wd0e
+       cat <<EOF >dska
 algorithm adiantum;
 iv-method encblkno1;
 keylength 256;
@@ -61,7 +61,7 @@
 keygen storedkey key AAABAJtnmp3XZspMBAFpCYnB8Hekn0 \
                      gj5cDVngslfGLSqwcy;
 EOF
-       cat <<EOF >ld1e
+       cat <<EOF >dskb
 algorithm adiantum;
 iv-method encblkno1;
 keylength 256;
@@ -70,12 +70,12 @@
                      fowKwQbENxpu3o1k9m;
 EOF
        cat <<EOF >cgd.conf
-cgd0   /dev/wd0e       wd0e
-cgd1   /dev/ld1e       ld1e
+cgd0   /dev/dska       dska
+cgd1   /dev/dskb       dskb
 EOF
        cat <<EOF >expected
-/dev/wd0e: m2eanddmykwEAWkJicHwd6SfSCPlwNWeCyV8YtKrBzI=
-/dev/ld1e: rWluAhrJd+1fRFDcBowrhgR39+jArBBsQ3Gm7ejWT2Y=
+/dev/dska: m2eanddmykwEAWkJicHwd6SfSCPlwNWeCyV8YtKrBzI=
+/dev/dskb: rWluAhrJd+1fRFDcBowrhgR39+jArBBsQ3Gm7ejWT2Y=
 EOF
        atf_check -o file:expected cgdconfig -T -f cgd.conf
 }
@@ -175,7 +175,7 @@
 }
 sharedstoredkeys_body()
 {
-       cat <<EOF >wd0e
+       cat <<EOF >dska
 algorithm adiantum;
 iv-method encblkno1;
 keylength 256;
@@ -186,7 +186,7 @@
             subkey AAAAUPDx8vP09fb3+Pk=;
 };
 EOF
-       cat <<EOF >ld1e
+       cat <<EOF >dskb
 algorithm adiantum;
 iv-method encblkno1;
 keylength 256;
@@ -198,20 +198,20 @@
 };
 EOF
        cat <<EOF >cgd.conf0
-cgd0   /dev/wd0e       wd0e
-cgd1   /dev/ld1e       ld1e
+cgd0   /dev/dska       dska
+cgd1   /dev/dskb       dskb
 EOF
        cat <<EOF >expected0
-/dev/wd0e: PLJfJfqs1XqQQ09k0DYvKi0tCpDPGlpMXbAtVuzExb8=
-/dev/ld1e: ADxn574yb7sVdxHphNRRdObZxntMJA/ssMuUX6SXgEY=
+/dev/dska: PLJfJfqs1XqQQ09k0DYvKi0tCpDPGlpMXbAtVuzExb8=
+/dev/dskb: ADxn574yb7sVdxHphNRRdObZxntMJA/ssMuUX6SXgEY=
 EOF
        cat <<EOF >cgd.conf1
-cgd0   /dev/ld1e       ld1e
-cgd1   /dev/wd0e       wd0e
+cgd0   /dev/dskb       dskb
+cgd1   /dev/dska       dska
 EOF
        cat <<EOF >expected1
-/dev/ld1e: ADxn574yb7sVdxHphNRRdObZxntMJA/ssMuUX6SXgEY=
-/dev/wd0e: PLJfJfqs1XqQQ09k0DYvKi0tCpDPGlpMXbAtVuzExb8=
+/dev/dskb: ADxn574yb7sVdxHphNRRdObZxntMJA/ssMuUX6SXgEY=
+/dev/dska: PLJfJfqs1XqQQ09k0DYvKi0tCpDPGlpMXbAtVuzExb8=
 EOF
        atf_check -o file:expected0 cgdconfig -T -f cgd.conf0
        atf_check -o file:expected1 cgdconfig -T -f cgd.conf1
@@ -224,7 +224,7 @@
 }
 sharedshellkeys_body()
 {
-       cat <<EOF >wd0e
+       cat <<EOF >dska
 algorithm adiantum;
 iv-method encblkno1;
 keylength 256;
@@ -235,7 +235,7 @@
             subkey AAAAUPDx8vP09fb3+Pk=;
 };
 EOF
-       cat <<EOF >ld1e
+       cat <<EOF >dskb
 algorithm adiantum;
 iv-method encblkno1;
 keylength 256;
@@ -247,20 +247,20 @@
 };
 EOF
        cat <<EOF >cgd.conf0
-cgd0   /dev/wd0e       wd0e
-cgd1   /dev/ld1e       ld1e
+cgd0   /dev/dska       dska
+cgd1   /dev/dskb       dskb
 EOF
        cat <<EOF >expected0
-/dev/wd0e: PLJfJfqs1XqQQ09k0DYvKi0tCpDPGlpMXbAtVuzExb8=
-/dev/ld1e: ADxn574yb7sVdxHphNRRdObZxntMJA/ssMuUX6SXgEY=
+/dev/dska: PLJfJfqs1XqQQ09k0DYvKi0tCpDPGlpMXbAtVuzExb8=
+/dev/dskb: ADxn574yb7sVdxHphNRRdObZxntMJA/ssMuUX6SXgEY=
 EOF
        cat <<EOF >cgd.conf1
-cgd0   /dev/ld1e       ld1e
-cgd1   /dev/wd0e       wd0e
+cgd0   /dev/dskb       dskb
+cgd1   /dev/dska       dska
 EOF
        cat <<EOF >expected1
-/dev/ld1e: ADxn574yb7sVdxHphNRRdObZxntMJA/ssMuUX6SXgEY=
-/dev/wd0e: PLJfJfqs1XqQQ09k0DYvKi0tCpDPGlpMXbAtVuzExb8=
+/dev/dskb: ADxn574yb7sVdxHphNRRdObZxntMJA/ssMuUX6SXgEY=
+/dev/dska: PLJfJfqs1XqQQ09k0DYvKi0tCpDPGlpMXbAtVuzExb8=
 EOF
        atf_check -o file:expected0 cgdconfig -T -f cgd.conf0
        atf_check -o inline:'1\n' cat n



Home | Main Index | Thread Index | Old Index