regress: remove vmd path length tests.

These add no value and we'd now that we don't artificially limit
path lengths just be updating them to check PATH_MAX.

diff --git a/regress/usr.sbin/vmd/config/Makefile b/regress/usr.sbin/vmd/config/Makefile
index 1a76979..d913840 100644 (file)
--- a/regress/usr.sbin/vmd/config/Makefile
+++ b/regress/usr.sbin/vmd/config/Makefile
@@ -1,13 +1,11 @@
-#      $OpenBSD: Makefile,v 1.10 2020/12/16 22:59:55 bluhm Exp $
+#      $OpenBSD: Makefile,v 1.11 2023/04/26 10:14:21 dv Exp $
 
 VMD ?= /usr/sbin/vmd
 
 VMD_PASS=boot-keyword memory-round memory-just-enough cdrom-keyword \
         format-keyword
-VMD_FAIL=kernel-keyword too-few-ram vm-name-too-long too-many-ifs \
-        boot-name-too-long disk-path-too-long too-many-disks \
-        switch-no-interface switch-no-add cdrom-name-too-long \
-        bad-format missing-format
+VMD_FAIL=kernel-keyword too-few-ram too-many-ifs too-many-disks \
+        switch-no-interface switch-no-add bad-format missing-format
 
 .for n in ${VMD_PASS}
 REGRESS_TARGETS +=     run-pass-$n
@@ -30,17 +28,6 @@ run-fail-bad-format run-fail-missing-format run-pass-format-keyword: foo.img
 foo.img disk0.img disk1.img disk2.img disk3.img disk4.img:
        touch $@
 
-PATH_LONG =    some/relativepath/somewhere/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789
-BOOT_PATH_LONG =       ${PATH_LONG}/bsd.rd
-DISK_PATH_LONG =       ${PATH_LONG}/bsd.img
-
-run-fail-boot-name-too-long: ${BOOT_PATH_LONG}
-run-fail-disk-path-too-long: ${DISK_PATH_LONG}
-
-${BOOT_PATH_LONG} ${DISK_PATH_LONG}:
-       mkdir -p ${@:H}
-       touch $@
-
 clean:
        rm -f -- *.img
        rm -rf some

diff --git a/regress/usr.sbin/vmd/config/vmd-fail-boot-name-too-long.conf b/regress/usr.sbin/vmd/config/vmd-fail-boot-name-too-long.conf
deleted file mode 100644 (file)
index 209be7c..0000000
--- a/regress/usr.sbin/vmd/config/vmd-fail-boot-name-too-long.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-#      $OpenBSD: vmd-fail-boot-name-too-long.conf,v 1.2 2018/10/22 16:45:24 bluhm Exp $
-# Fail on boot path (> 128)
-ramdisk="some/relativepath/somewhere/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/bsd.rd"
-vm "x" {
-    boot $ramdisk
-}

diff --git a/regress/usr.sbin/vmd/config/vmd-fail-boot-name-too-long.ok b/regress/usr.sbin/vmd/config/vmd-fail-boot-name-too-long.ok
deleted file mode 100644 (file)
index 56cb73b..0000000
--- a/regress/usr.sbin/vmd/config/vmd-fail-boot-name-too-long.ok
+++ /dev/null
@@ -1 +0,0 @@
-5: kernel name too long

diff --git a/regress/usr.sbin/vmd/config/vmd-fail-cdrom-name-too-long.conf b/regress/usr.sbin/vmd/config/vmd-fail-cdrom-name-too-long.conf
deleted file mode 100644 (file)
index 70ad4e9..0000000
--- a/regress/usr.sbin/vmd/config/vmd-fail-cdrom-name-too-long.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-#      $OpenBSD: vmd-fail-cdrom-name-too-long.conf,v 1.1 2018/01/07 22:59:57 ccardenas Exp $
-# Fail on cdrom path (> 128)
-iso="/some/absolutepath/somewhere/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/cd62.iso"
-vm "x" {
-    cdrom $iso
-}

diff --git a/regress/usr.sbin/vmd/config/vmd-fail-cdrom-name-too-long.ok b/regress/usr.sbin/vmd/config/vmd-fail-cdrom-name-too-long.ok
deleted file mode 100644 (file)
index e94f1e3..0000000
--- a/regress/usr.sbin/vmd/config/vmd-fail-cdrom-name-too-long.ok
+++ /dev/null
@@ -1 +0,0 @@
-5: cdrom name too long

diff --git a/regress/usr.sbin/vmd/config/vmd-fail-disk-path-too-long.conf b/regress/usr.sbin/vmd/config/vmd-fail-disk-path-too-long.conf
deleted file mode 100644 (file)
index 32781cc..0000000
--- a/regress/usr.sbin/vmd/config/vmd-fail-disk-path-too-long.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-#      $OpenBSD: vmd-fail-disk-path-too-long.conf,v 1.2 2018/07/20 22:18:49 bluhm Exp $
-# Fail on disk path (> 128)
-rdisk="some/relativepath/somewhere/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/bsd.img"
-vm "x" {
-    disk $rdisk
-}

diff --git a/regress/usr.sbin/vmd/config/vmd-fail-disk-path-too-long.ok b/regress/usr.sbin/vmd/config/vmd-fail-disk-path-too-long.ok
deleted file mode 100644 (file)
index 5df11e9..0000000
--- a/regress/usr.sbin/vmd/config/vmd-fail-disk-path-too-long.ok
+++ /dev/null
@@ -1,2 +0,0 @@
-disk path too long
-5: failed to parse disks: some/relativepath/somewhere/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/abcdefghijklmnopqrstuvwxyz0123456789/bsd.img

diff --git a/regress/usr.sbin/vmd/config/vmd-fail-vm-name-too-long.conf b/regress/usr.sbin/vmd/config/vmd-fail-vm-name-too-long.conf
deleted file mode 100644 (file)
index 3ee90ff..0000000
--- a/regress/usr.sbin/vmd/config/vmd-fail-vm-name-too-long.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#      $OpenBSD: vmd-fail-vm-name-too-long.conf,v 1.2 2019/03/04 21:36:21 bluhm Exp $
-# Fail on VM name (>= 64 chars)
-vm "abcdefghijklmnopqrstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ__" {
-}

diff --git a/regress/usr.sbin/vmd/config/vmd-fail-vm-name-too-long.ok b/regress/usr.sbin/vmd/config/vmd-fail-vm-name-too-long.ok
deleted file mode 100644 (file)
index 1b99d3d..0000000
--- a/regress/usr.sbin/vmd/config/vmd-fail-vm-name-too-long.ok
+++ /dev/null
@@ -1 +0,0 @@
-3: vm name too long