branch: elpa/forth-mode
commit 1ffc174c138a25b19f8f6562e05c184d61e49e43
Author: Helmut Eller <[email protected]>
Commit: Helmut Eller <[email protected]>
Pass Makefile variable FORTH as environment variable to build.el
* .travis.yml: Try to ignore errors while installing gforth.el
* Makefile (FORTH): New variable.
* build.el: Setup forth-executable.
* test/tests.el (forth-with-forth): Don't hardcode forth-executable.
---
.travis.yml | 3 ++-
Makefile | 3 ++-
build.el | 1 +
test/tests.el | 9 ++++-----
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 65a87de777..fa7696ee63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,8 @@ env:
install:
- sudo add-apt-repository -y ppa:ubuntu-elisp
- sudo apt-get update -y
- - sudo apt-get install emacs23 emacs24 emacs-snapshot gforth
+ - sudo apt-get install emacs23 emacs24 emacs-snapshot
+ - sudo apt-get install gforth || true
script: make EMACS=$EMACS
notifications:
email: [email protected]
diff --git a/Makefile b/Makefile
index 0e9188dc56..c55a954a0e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,13 @@
EMACS = emacs
EMACS_LOAD = $(EMACS) -Q --batch --load
+FORTH = gforth
SRC = $(wildcard *.el) $(wildcard backend/*.el)
all: forth-mode.elc
forth-mode.elc: $(SRC)
- $(EMACS_LOAD) build.el
+ FORTH=$(FORTH) $(EMACS_LOAD) build.el
doc: forth-mode.info
diff --git a/build.el b/build.el
index ac97befdd8..e627ba8eae 100644
--- a/build.el
+++ b/build.el
@@ -23,6 +23,7 @@
(should-not (string-match "failed" (byte-recompile-directory "." 0))))
(load-file "test/tests.el")
+(setq forth-executable (getenv "FORTH"))
;;; Ensure compile-package is run first.
(ert-run-tests-batch-and-exit '(or compile-package t))
diff --git a/test/tests.el b/test/tests.el
index 3329946032..28f23f2555 100644
--- a/test/tests.el
+++ b/test/tests.el
@@ -99,15 +99,14 @@ The whitespace before and including \"|\" on each line is
removed."
(should (string= after (substring-no-properties (buffer-string))))
(should (= (point) point-after))))))
-(defmacro forth-with-gforth (&rest body)
+(defmacro forth-with-forth (&rest body)
(declare (indent 0))
- `(let* ((forth-executable "gforth")
- (proc (get-buffer-process forth-interaction-buffer)))
+ `(let* ((proc (get-buffer-process forth-interaction-buffer)))
;; FIXME: there should be a better way to do this. Probably a
;; callback function.
(while (not (processp proc))
(run-forth)
- (message "Waiting for gforth to start ...")
+ (message "Waiting for Forth to start ...")
(accept-process-output nil 0.3)
(setq proc (get-buffer-process forth-interaction-buffer)))
(unwind-protect
@@ -344,7 +343,7 @@ The whitespace before and including \"|\" on each line is
removed."
(call-interactively #'comment-dwim))))
(ert-deftest forth-completion-at-point ()
- (forth-with-gforth
+ (forth-with-forth
(forth-should-before/after
"2C→"
"2Constant→"
