From ff98487aa5a218271c6af14d5f0cd57db9d625a8 Mon Sep 17 00:00:00 2001
From: Bart Schaefer <barts@users.sourceforge.net>
Date: Sat, 26 May 2001 01:51:28 +0000
Subject: Improve "make check" test for -b condition when /dev cannot be
 searched.

---
 ChangeLog         |  5 +++++
 Test/C02cond.ztst | 10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 72b3eeaba..de2e4854d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-25  Bart Schaefer  <schaefer@zsh.org>
+
+	* 14484: Test/C02cond.ztst: Print a warning and skip the -b test
+	if no block devices can be found (test only ! -b in that case).
+
 2001-05-25  Clint Adams  <schizo@debian.org>
 
 	* 14479: Completion/Debian/Command/_apt: add --reinstall.
diff --git a/Test/C02cond.ztst b/Test/C02cond.ztst
index a0e6ed442..2564ad125 100644
--- a/Test/C02cond.ztst
+++ b/Test/C02cond.ztst
@@ -27,9 +27,13 @@
 0:-a cond
 
   # Find a block special file system.  This is a little tricky.
-  block=$(find /dev /devices -type b -print 2>/dev/null|head -1) &&
-  [[ -b $block && ! -b zerolength ]]
-0:-b cond
+  if block=$(find /dev(|ices)/ -type b -print); then
+    [[ -b $block[(f)1] && ! -b zerolength ]]
+  else
+    print -u8 'Warning: Not testing [[ -b blockdevice ]] (no devices found)'
+    [[ ! -b zerolength ]]
+  fi
+0D:-b cond
 
   char=(/dev/tty*([1]))
   [[ -c $char && ! -c $block ]]
-- 
cgit 1.4.1