branch: externals/compat
commit 4884caa838bea48b7cca28d7bda8faed930b03b1
Merge: 62dd734224 a417d78f8a
Author: Daniel Mendler <m...@daniel-mendler.de>
Commit: Daniel Mendler <m...@daniel-mendler.de>
Merge branch 'main' into emacs-30
---
.github/workflows/makefile.yml | 4 +---
Makefile | 7 ++++++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/makefile.yml b/.github/workflows/makefile.yml
index 89aac7e3db..daeb5ad906 100644
--- a/.github/workflows/makefile.yml
+++ b/.github/workflows/makefile.yml
@@ -47,9 +47,7 @@ jobs:
- name: Run interpreted tests
run: make test
- name: Byte compile all files
- run: |
- sed -i "s/ no-byte-compile: t;//" compat-macs.el compat-tests.el
- make compile
+ run: make force-compile
- name: Run compiled tests
run: make test
- name: Make info manual
diff --git a/Makefile b/Makefile
index fa4de4b56d..0e18f337c5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
.POSIX:
-.PHONY: all compile test clean check
+.PHONY: all compile force-compile test clean check
.SUFFIXES: .el .elc
EMACS = emacs
@@ -18,6 +18,11 @@ all: compile
compile: $(BYTEC)
+force-compile:
+ sed -i "s/ no-byte-compile: t;/ no-byte-compile: nil;/"
$(BYTEC:.elc=.el)
+ make compile
+ sed -i "s/ no-byte-compile: nil;/ no-byte-compile: t;/"
$(BYTEC:.elc=.el)
+
test:
$(EMACS) --version
$(EMACS) -Q --batch -L . -l compat-tests.el -f
ert-run-tests-batch-and-exit
