From 3d7e614022c19d0c42ff32d60c8e51b226fb427d Mon Sep 17 00:00:00 2001
From: Kaz Kylheku <kaz@kylheku.com>
Date: Fri, 13 Aug 2021 06:42:05 -0700
Subject: tests: support BSD flavors loosely, not just OpenBSD.

* tests/common.tl (os-symbol): Look for the substring BSD in
the system name, and map to symbol :bsd. Do not produce
the :openbsd symbol.

* tests/014/socket-basic.tl: Refer to :bsd, not :openbsd.

* tests/017/glob-carray.tl: Likewise.

* tests/018/chmod.tl: Likewise.
---
 tests/014/socket-basic.tl | 2 +-
 tests/017/glob-carray.tl  | 2 +-
 tests/017/glob-zarray.tl  | 2 +-
 tests/018/chmod.tl        | 2 +-
 tests/common.tl           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/014/socket-basic.tl b/tests/014/socket-basic.tl
index ae591c9b..1fe4beb2 100644
--- a/tests/014/socket-basic.tl
+++ b/tests/014/socket-basic.tl
@@ -3,7 +3,7 @@
 
 (defvar *socktype*)
 
-(defvarl %iters% (if (meql (os-symbol) :macos :openbsd) 2000 5000))
+(defvarl %iters% (if (meql (os-symbol) :macos :bsd) 2000 5000))
 
 (defun client (addr)
   (with-stream (cli-sock (open-socket af-inet *socktype*))
diff --git a/tests/017/glob-carray.tl b/tests/017/glob-carray.tl
index 3ce52980..4b95c526 100644
--- a/tests/017/glob-carray.tl
+++ b/tests/017/glob-carray.tl
@@ -12,7 +12,7 @@
 			 (nil int)
 			 (pathv (carray str))
 			 (nil (array 4 cptr)))))
-  ((:cygnal :cygwin :android :openbsd)
+  ((:cygnal :cygwin :android :bsd)
     (deffi-type glob-t (struct glob-t
                          (pathc size-t)
 			 (nil size-t)
diff --git a/tests/017/glob-zarray.tl b/tests/017/glob-zarray.tl
index 4b804167..22f87e33 100644
--- a/tests/017/glob-zarray.tl
+++ b/tests/017/glob-zarray.tl
@@ -12,7 +12,7 @@
                          (nil int)
 			 (pathv (ptr-out (zarray str)))
                          (nil (array 4 cptr)))))
-  ((:cygnal :cygwin :android :openbsd)
+  ((:cygnal :cygwin :android :bsd)
     (deffi-type glob-t (struct glob-t
                          (pathc size-t)
 			 (nil size-t)
diff --git a/tests/018/chmod.tl b/tests/018/chmod.tl
index 91f61724..4349686c 100644
--- a/tests/018/chmod.tl
+++ b/tests/018/chmod.tl
@@ -9,7 +9,7 @@
 
 (defvarl os (os-symbol))
 
-(defvarl test-sticky (unless (eq os :openbsd)
+(defvarl test-sticky (unless (eq os :bsd)
                        (chmod tgt s-isvtx)
                        (let ((st (stat tgt)))
                          (plusp (logand s-isvtx st.mode)))))
diff --git a/tests/common.tl b/tests/common.tl
index b94960cf..5ad35935 100644
--- a/tests/common.tl
+++ b/tests/common.tl
@@ -74,7 +74,7 @@
             (iff (f^ #/CYGWIN/) (ret :cygwin))
             (iff (f^ #/CYGNAL/) (ret :cygnal))
             (iff (f^ #/Darwin/) (ret :macos))
-            (iff (f^ #/OpenBSD/) (ret :openbsd))
+            (iff #/BSD/ (ret :bsd))
             (ret :unknown))
        u.sysname])))
 
-- 
cgit v1.2.3