From: Eric Blake <eblake@redhat.com>
Date: Fri, 17 Sep 2010 21:27:21 +0000 (-0600)
Subject: init.sh: accomodate directory with no .exes
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bb1327e10941a5c1cbc30b0cf05a76dc0b929a5;p=pspp

init.sh: accomodate directory with no .exes

Cygwin was failing test-vc-list-files-{cvs,git}.sh, because of
spurious output on stderr.

../../tests/test-vc-list-files-cvs.sh (exe_shim): skipping directory: /home/eblake/m4-branch/build-aux

All because build-aux was a directory containing just scripts, and
no .exe extensions.  This fixes it.

* tests/init.sh: Accomodate directory containing only scripts.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index 91972506bf..0f8cbe1011 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-09-17  Eric Blake  <eblake@redhat.com>
 
+	init.sh: accomodate directory with no .exes
+	* tests/init.sh: Accomodate directory containing only scripts.
+
 	tests: avoid compiler warning
 	* tests/test-stdlib.c (main): Use the variable.
 
diff --git a/tests/init.sh b/tests/init.sh
index c5d19610d0..d655fbbb60 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -240,6 +240,9 @@ find_exe_basenames_()
   feb_result_=
   feb_sp_=
   for feb_file_ in $feb_dir_/*.exe; do
+    if test "x$feb_file_" = "x$feb_dir_/*.exe" && test ! -f "$feb_file_"; then
+      return 0
+    fi
     case $feb_file_ in
       *[!-a-zA-Z/0-9_.+]*) feb_fail_=1; break;;
       *) # Remove leading file name components as well as the .exe suffix.