Update compilation again.

diff --git a/Makefile b/Makefile
index 1e5e6d5b43921ae82b56e5dba24ce718464c6faf..3b3e7d6258ad83ed1c09abc2f700806b59ef4965 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,9 @@ all: clean install compile test
 bench: benchel benchjs
 
 benchel:
-       emacs -Q -L . \
+       emacs -Q \
+       -L . \
+       -L lib/js2-mode \
        -l context-coloring \
        -l benchmark/context-coloring-benchmark \
        -f context-coloring-benchmark-run
@@ -12,9 +14,9 @@ benchjs:
        node_modules/.bin/matcha
 
 compile:
-       emacs -Q \
+       emacs -Q -batch \
        -L lib/js2-mode \
-       -batch -f batch-byte-compile *.el
+       -f batch-byte-compile *.el
 
 clean:
        rm -f *.log benchmark/*.log *.elc
@@ -25,7 +27,9 @@ install:
 test: testel testjs
 
 testel:
-       emacs -Q -batch -L . \
+       emacs -Q -batch \
+       -L . \
+       -L lib/js2-mode \
        -l ert \
        -l context-coloring \
        -l test/context-coloring-test.el \

diff --git a/benchmark/context-coloring-benchmark.el b/benchmark/context-coloring-benchmark.el
index 1da2b8cdd86024faeaddce2840cbd3b9c8d601d6..be032295f4cd77a2ea4e31758c718adc9e67270a 100644 (file)
--- a/benchmark/context-coloring-benchmark.el
+++ b/benchmark/context-coloring-benchmark.el
@@ -41,8 +41,6 @@
   (context-coloring-benchmark-js-mode-teardown))
 
 (defun context-coloring-benchmark-js2-mode-setup ()
-  (add-to-list 'load-path (context-coloring-benchmark-resolve-path
-                           "../lib/js2-mode"))
   (require 'js2-mode)
   (setq js2-mode-show-parse-errors nil)
   (setq js2-mode-show-strict-warnings nil)
@@ -55,10 +53,7 @@
   (setq auto-mode-alist (delete '("\\.js\\'" . js2-mode)
                                 auto-mode-alist))
   (setq js2-mode-show-strict-warnings t)
-  (setq js2-mode-show-parse-errors t)
-  (setq load-path (delete (context-coloring-benchmark-resolve-path
-                           "../test/fixtures/js2-mode")
-                          load-path)))
+  (setq js2-mode-show-parse-errors t))
 
 (defun context-coloring-benchmark-js2-mode-run ()
   (context-coloring-benchmark-js2-mode-setup)

diff --git a/benchmark/fixtures/.dir-locals.el b/benchmark/fixtures/.dir-locals.el
new file mode 100644 (file)
index 0000000..f3d5e97
--- /dev/null
+++ b/benchmark/fixtures/.dir-locals.el
@@ -0,0 +1 @@
+((nil . ((buffer-read-only . t))))

diff --git a/test/context-coloring-test.el b/test/context-coloring-test.el
index 633aec4d7f02ceaa99f302d20ca28613f56e4945..e1ae2e3fb16e10b589264414ecae2f75d5dc2c96 100644 (file)
--- a/test/context-coloring-test.el
+++ b/test/context-coloring-test.el
@@ -24,7 +24,6 @@ FIXTURE."
 FIXTURE."
   `(context-coloring-test-with-fixture
     ,fixture
-    (add-to-list 'load-path (context-coloring-test-resolve-path "../lib/js2-mode"))
     (require 'js2-mode)
     (setq js2-mode-show-parse-errors nil)
     (setq js2-mode-show-strict-warnings nil)