diff options
| author | Bastien | 2017-07-03 09:06:29 +0200 |
|---|---|---|
| committer | Bastien | 2017-07-03 09:06:29 +0200 |
| commit | 5ca1888fe670aee7febd4d42665d7372ab2ffebc (patch) | |
| tree | 1f7f8d8a7580e556fc83cf3a6aaeec567b33a090 /test/Makefile.in | |
| parent | 20e006ffee41062f1b551a92c24d9edc53cd0f56 (diff) | |
| parent | 1b4f0a92ff3505ef9a465b9b391756e3a73a6443 (diff) | |
| download | emacs-5ca1888fe670aee7febd4d42665d7372ab2ffebc.tar.gz emacs-5ca1888fe670aee7febd4d42665d7372ab2ffebc.zip | |
Merge branch 'master' into scratch/org-mode-merge
Diffstat (limited to 'test/Makefile.in')
| -rw-r--r-- | test/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index 414eca90564..11373db8ca9 100644 --- a/test/Makefile.in +++ b/test/Makefile.in | |||
| @@ -147,7 +147,8 @@ endif | |||
| 147 | %.log: %.elc | 147 | %.log: %.elc |
| 148 | $(AM_V_at)${MKDIR_P} $(dir $@) | 148 | $(AM_V_at)${MKDIR_P} $(dir $@) |
| 149 | $(AM_V_GEN)HOME=/nonexistent $(emacs) -l ert -l $(testloadfile) \ | 149 | $(AM_V_GEN)HOME=/nonexistent $(emacs) -l ert -l $(testloadfile) \ |
| 150 | --eval "(ert-run-tests-batch-and-exit ${SELECTOR_ACTUAL})" ${WRITE_LOG} | 150 | --eval "(ert-run-tests-batch-and-exit ${SELECTOR_ACTUAL})" \ |
| 151 | $(if $(and ${NIX_STORE}, $(findstring tramp, $(testloadfile))), , ${WRITE_LOG}) | ||
| 151 | 152 | ||
| 152 | ifeq (@HAVE_MODULES@, yes) | 153 | ifeq (@HAVE_MODULES@, yes) |
| 153 | maybe_exclude_module_tests := | 154 | maybe_exclude_module_tests := |