2 files changed, 6 insertions, 3 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index e032af46af0..281ce981b5e 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-06  Glenn Morris  <rgm@gnu.org>
+
+        * automated/Makefile.in (setwins): Avoid accidental matches.
+
 2013-11-06  Michael Albinus  <michael.albinus@gmx.de>
 
         * automated/tramp-tests.el (tramp-test07-file-exists-p):
diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index 63cffd9f828..617768995f1 100644
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -39,9 +39,8 @@ emacs = unset EMACSLOADPATH; \
         LC_ALL=C EMACS_TEST_DIRECTORY=$(srcdir) "$(EMACS)" $(EMACSOPT)
 
 # Common command to find subdirectories
-setwins=subdirs=`find $(srcdir) -type d -print`; \
-        for file in $$subdirs; do \
-           case $$file in */data* | */flymake* ) ;; \
+setwins=for file in `find $(srcdir) -type d -print`; do \
+           case $$file in $(srcdir)*/data* | $(srcdir)*/flymake* ) ;; \
                 *) wins="$$wins$${wins:+ }$$file" ;; \
            esac; \
         done