Skip to content

Commit

Permalink
Distribute test cases in tarballs by default
Browse files Browse the repository at this point in the history
* INSTALL, INSTALL.REPO, admin/make-tarball.txt:
Mention ‘make check’.
* configure.ac: Update comment.
* etc/NEWS: Say that tarballs have a test directory.
* make-dist (with_tests): Default to "yes".
Add an option --no-tests to make it "no".
  • Loading branch information
eggert committed May 16, 2019
1 parent bc0adf1 commit 4ac234a
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 8 deletions.
4 changes: 4 additions & 0 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ sections if you need to.

src/emacs -Q

To test Emacs further (intended mostly to help developers):

make check

6. Assuming that the program 'src/emacs' starts and displays its
opening screen, you can install the program and its auxiliary
files into their installation directories:
Expand Down
4 changes: 2 additions & 2 deletions INSTALL.REPO
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ can invoke './configure -C'. After configuring, build Emacs as follows:

$ make

If you want to install Emacs, type 'make install' instead of 'make' in
the last command.
You can also type 'make check' to test and 'make install' to install
Emacs.

Occasionally the file 'lisp/loaddefs.el' (and similar automatically
generated files, such as 'esh-groups.el', and '*-loaddefs.el' in some
Expand Down
2 changes: 1 addition & 1 deletion admin/make-tarball.txt
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ General steps (for each step, check for possible errors):
results against the new tar contents.

7. tar -xf emacs-NEW.tar; cd emacs-NEW
./configure --prefix=/tmp/emacs && make && make install
./configure --prefix=/tmp/emacs && make check && make install
Use 'script' or M-x compile to save the compilation log in
compile-NEW.log and compare it against an old one. The easiest way
to do that is to visit the old log in Emacs, change the version
Expand Down
3 changes: 1 addition & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -5726,9 +5726,8 @@ m4_define([subdir_makefiles],
SUBDIR_MAKEFILES="subdir_makefiles"
AC_CONFIG_FILES(subdir_makefiles)

dnl test/ is not present in release tarfiles.
dnl The test/ directory is missing if './make-dist --no-tests' was used.
opt_makefile=test/Makefile

if test -f "$srcdir/$opt_makefile.in"; then
SUBDIR_MAKEFILES="$SUBDIR_MAKEFILES $opt_makefile"
dnl Again, it's best not to use a variable. Though you can add
Expand Down
4 changes: 4 additions & 0 deletions etc/NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ option was useful with modern debugging tools such as AddressSanitizer.
(See etc/DEBUG for the details of using the modern replacements of the
removed configure options.)

+++
** The distribution tarball now has test cases; 'make check' runs them.
This is intended mostly to help developers.

---
** Emacs now requires GTK 2.24 and GTK 3.10 for the GTK 2 and GTK 3
builds respectively.
Expand Down
11 changes: 8 additions & 3 deletions make-dist
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ make_tar=no
default_gzip=gzip
newer=""
with_info=yes
with_tests=no
with_tests=yes
changelog=yes
verbose=no

Expand Down Expand Up @@ -110,11 +110,16 @@ while [ $# -gt 0 ]; do
;;

## Include the test/ directory.
## This option is mainly for the hydra build server.
## This is for backward compability to when --no-tests was the default.
"--tests")
with_tests=yes
;;

## Exclude the test/ directory.
"--no-tests")
with_tests=no
;;

"--verbose")
verbose=yes
;;
Expand All @@ -131,9 +136,9 @@ while [ $# -gt 0 ]; do
echo " --no-update don't recompile or do analogous things"
echo " --no-changelog don't generate the top-level ChangeLog"
echo " --no-info don't include info files"
echo " --no-tests don't include the test/ directory"
echo " --snapshot same as --clean-up --no-update --tar --no-check"
echo " --tar make a tar file"
echo " --tests include the test/ directory"
echo " --verbose noisier output"
echo ""
exit 0
Expand Down

0 comments on commit 4ac234a

Please sign in to comment.