2 files changed, 32 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 54853f4a600..723baca9547 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-07-25  Glenn Morris  <rgm@gnu.org>
+
+        * make-dist: Add a --tests option, to include test/.
+
 2013-07-02  Christoph Egger  <christoph@debian.org>  (tiny change)
 
         * configure.ac (emacs_broken_SIGIO): Set on gnu-kfreebsd to avoid hang.
diff --git a/make-dist b/make-dist
index 788dca3462c..986f784164c 100755
--- a/make-dist
+++ b/make-dist
@@ -1,8 +1,7 @@
 #!/bin/sh
 ### make-dist: create an Emacs distribution tar file from current srcdir
 
-## Copyright (C) 1995, 1997-1998, 2000-2013 Free Software Foundation,
-## Inc.
+## Copyright (C) 1995, 1997-1998, 2000-2013 Free Software Foundation, Inc.
 
 ## This file is part of GNU Emacs.
 
@@ -51,6 +50,7 @@ clean_up=no
 make_tar=no
 default_gzip=gzip
 newer=""
+with_tests=no
 
 while [ $# -gt 0 ]; do
   case "$1" in
@@ -102,6 +102,12 @@ while [ $# -gt 0 ]; do
       check=no
      ;;
 
+    ## Include the test/ directory.
+    ## This option is mainly for the hydra build server.
+    "--tests")
+      with_tests=yes
+     ;;
+
     "--help")
       echo "Usage: ${progname} [options]"
       echo ""
@@ -115,6 +121,7 @@ while [ $# -gt 0 ]; do
       echo "  --no-update       don't recompile or do analogous things"
       echo "  --snapshot        same as --clean-up --no-update --tar --no-check"
       echo "  --tar             make a tar file"
+      echo "  --tests   include the test/ directory"
       echo ""
       exit 0
     ;;
@@ -294,7 +301,7 @@ for subdir in site-lisp \
               build-aux build-aux/snippet \
               src src/bitmaps lib lib-src oldXMenu lwlib \
               nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
-              `find etc lisp admin -type d` \
+              `find etc lisp admin test -type d` \
               doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \
               info m4 msdos \
               nextstep nextstep/templates \
@@ -305,6 +312,13 @@ for subdir in site-lisp \
               nextstep/GNUstep/Emacs.base \
               nextstep/GNUstep/Emacs.base/Resources
 do
+
+  if [ "$with_tests" != "yes" ]; then
+    case $subdir in
+        test*) continue ;;
+    esac
+  fi
+
   ## site-lisp for in-place installs (?).
   [ "$subdir" = "site-lisp" ] || [ -d "$subdir" ] || \
       echo "WARNING: $subdir not found, making anyway"
@@ -447,6 +461,17 @@ for f in `find admin -type f`; do
   ln $f $tempdir/$f
 done
 
+if [ "$with_tests" = "yes" ]; then
+  echo "Making links to \`test' and its subdirectories"
+  for f in `find test -type f`; do
+    case $f in
+      test/automated/flymake/warnpred/a.out) continue ;;
+      test/automated/Makefile) continue ;;
+    esac
+    ln $f $tempdir/$f
+  done
+fi
+
 echo "Making links to \`etc' and its subdirectories"
 for f in `find etc -type f`; do
   case $f in