Reorganize files.

diff --git a/.elpaignore b/.elpaignore
index 9ec6a5e7c0fa9f54fc3ac9ea26ed51c25d718a8d..bad5d87de1e9fa772df7cc691862a4a808549966 100644 (file)
--- a/.elpaignore
+++ b/.elpaignore
@@ -1,8 +1,10 @@
 .elpaignore
 .gitignore
 .travis.yml
-benchmark
 Cask
+context-coloring-benchmark.el
+context-coloring-coverage.el
+context-coloring-test.el
+fixtures
 Makefile
 screenshot.png
-test

diff --git a/.gitignore b/.gitignore
index 06046bb79794414cde57ac815e36a7f0fa5b97be..b9fedcaefaa1f563ebe984c367d30f66def65707 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@
 *-pkg.el
 *.elc
 .cask/
-/benchmark/logs/
-/test/coverage/
+/benchmark/
+/coverage/

diff --git a/Makefile b/Makefile
index f729409b9c8d4741e254d0cc2f86193618d49435..08c23eb4ced0671a843d33d0e6fae94167a35d9b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ bench: ${DEPENDENCIES}
        ${CASK} exec ${EMACS} -Q \
        -L . \
        -l context-coloring \
-       -l benchmark/context-coloring-benchmark.el \
+       -l context-coloring-benchmark \
        -f context-coloring-benchmark-run
 
 compile: ${DEPENDENCIES}
@@ -29,18 +29,18 @@ test: ${DEPENDENCIES}
        ${CASK} exec ${EMACS} -Q -batch \
        -L . \
        -l ert \
-       -l test/context-coloring-coverage.el \
+       -l context-coloring-coverage \
        -f context-coloring-coverage-ci-init \
-       -l test/context-coloring-test.el \
+       -l context-coloring-test \
        -f ert-run-tests-batch-and-exit
 
 cover: ${DEPENDENCIES}
        ${CASK} exec ${EMACS} -Q -batch \
        -L . \
        -l ert \
-       -l test/context-coloring-coverage.el \
+       -l context-coloring-coverage \
        -f context-coloring-coverage-local-init \
-       -l test/context-coloring-test.el \
+       -l context-coloring-test \
        -f ert-run-tests-batch-and-exit
 
 .PHONY: all bench compile uncompile clean test cover

diff --git a/benchmark/context-coloring-benchmark.el b/context-coloring-benchmark.el
similarity index 94%
rename from benchmark/context-coloring-benchmark.el
rename to context-coloring-benchmark.el
index 4174d0cef73b9cc2df9b3a1d94413d2bf46a26f7..dafc9591b817c3310ed4bd9cc95ef9f0f89f84dd 100644 (file)
--- a/benchmark/context-coloring-benchmark.el
+++ b/context-coloring-benchmark.el
@@ -46,7 +46,7 @@
                        (elp-results)
                        (buffer-substring-no-properties (point-min) (point-max)))
                    (kill-buffer))))
-    (make-directory (context-coloring-benchmark-resolve-path "./logs") t)
+    (make-directory (context-coloring-benchmark-resolve-path "./benchmark") t)
     (append-to-file
      (with-temp-buffer
        (goto-char (point-min))
@@ -74,7 +74,7 @@
 (defun context-coloring-benchmark (title fixtures)
   "Execute a benchmark titled TITLE against FIXTURES."
   (let ((result-file (context-coloring-benchmark-resolve-path
-                      (format "./logs/results-%s-%s.log"
+                      (format "./benchmark/results-%s-%s.log"
                               title (format-time-string "%s")))))
     (mapc
      (lambda (path)
@@ -120,10 +120,10 @@
      fixtures)))
 
 (defconst context-coloring-benchmark-javascript-fixtures
-  '("./fixtures/jquery-2.1.1.js"
-    "./fixtures/lodash-2.4.1.js"
-    "./fixtures/async-0.9.0.js"
-    "./fixtures/mkdirp-0.5.0.js")
+  '("./fixtures/benchmark/jquery-2.1.1.js"
+    "./fixtures/benchmark/lodash-2.4.1.js"
+    "./fixtures/benchmark/async-0.9.0.js"
+    "./fixtures/benchmark/mkdirp-0.5.0.js")
   "Arbitrary JavaScript files for performance scrutiny.")
 
 (defun context-coloring-benchmark-js2-mode-run ()
@@ -140,10 +140,10 @@
   (remove-hook 'js2-mode-hook #'context-coloring-mode))
 
 (defconst context-coloring-benchmark-emacs-lisp-fixtures
-  '("./fixtures/lisp.el"
-    "./fixtures/faces.el"
-    "./fixtures/subr.el"
-    "./fixtures/simple.el")
+  '("./fixtures/benchmark/lisp.el"
+    "./fixtures/benchmark/faces.el"
+    "./fixtures/benchmark/subr.el"
+    "./fixtures/benchmark/simple.el")
   "Arbitrary Emacs Lisp files for performance scrutiny.")
 
 (defun context-coloring-benchmark-emacs-lisp-mode-run ()

diff --git a/test/context-coloring-coverage.el b/context-coloring-coverage.el
similarity index 100%
rename from test/context-coloring-coverage.el
rename to context-coloring-coverage.el

diff --git a/test/context-coloring-test.el b/context-coloring-test.el
similarity index 99%
rename from test/context-coloring-test.el
rename to context-coloring-test.el
index 08684da91825996d4bd315b778d5ad191cbbf533..c54cb80105307d8b8d95698e46d277e86c2d0289 100644 (file)
--- a/test/context-coloring-test.el
+++ b/context-coloring-test.el
@@ -91,9 +91,9 @@ signaled."
                                                   (name)
                                                   (t "generic"))) name)))
              (fixture (cond
-                       (fixture (format "./fixtures/%s" fixture))
-                       (,no-fixture "./fixtures/empty")
-                       (t (format ,(format "./fixtures/%%s.%s" extension) name)))))
+                       (fixture (format "./fixtures/test/%s" fixture))
+                       (,no-fixture "./fixtures/test/empty")
+                       (t (format ,(format "./fixtures/test/%%s.%s" extension) name)))))
          ,@`((let ((enable-context-coloring-mode ,enable-context-coloring-mode))
                `(ert-deftest ,test-name ()
                   (context-coloring-test-with-fixture

diff --git a/benchmark/fixtures/.nosearch b/fixtures/.nosearch
similarity index 100%
rename from benchmark/fixtures/.nosearch
rename to fixtures/.nosearch

diff --git a/benchmark/fixtures/.dir-locals.el b/fixtures/benchmark/.dir-locals.el
similarity index 100%
rename from benchmark/fixtures/.dir-locals.el
rename to fixtures/benchmark/.dir-locals.el

diff --git a/benchmark/fixtures/async-0.9.0.js b/fixtures/benchmark/async-0.9.0.js
similarity index 100%
rename from benchmark/fixtures/async-0.9.0.js
rename to fixtures/benchmark/async-0.9.0.js

diff --git a/benchmark/fixtures/faces.el b/fixtures/benchmark/faces.el
similarity index 100%
rename from benchmark/fixtures/faces.el
rename to fixtures/benchmark/faces.el

diff --git a/benchmark/fixtures/jquery-2.1.1.js b/fixtures/benchmark/jquery-2.1.1.js
similarity index 100%
rename from benchmark/fixtures/jquery-2.1.1.js
rename to fixtures/benchmark/jquery-2.1.1.js

diff --git a/benchmark/fixtures/lisp.el b/fixtures/benchmark/lisp.el
similarity index 100%
rename from benchmark/fixtures/lisp.el
rename to fixtures/benchmark/lisp.el

diff --git a/benchmark/fixtures/lodash-2.4.1.js b/fixtures/benchmark/lodash-2.4.1.js
similarity index 100%
rename from benchmark/fixtures/lodash-2.4.1.js
rename to fixtures/benchmark/lodash-2.4.1.js

diff --git a/benchmark/fixtures/mkdirp-0.5.0.js b/fixtures/benchmark/mkdirp-0.5.0.js
similarity index 100%
rename from benchmark/fixtures/mkdirp-0.5.0.js
rename to fixtures/benchmark/mkdirp-0.5.0.js

diff --git a/benchmark/fixtures/simple.el b/fixtures/benchmark/simple.el
similarity index 100%
rename from benchmark/fixtures/simple.el
rename to fixtures/benchmark/simple.el

diff --git a/benchmark/fixtures/subr.el b/fixtures/benchmark/subr.el
similarity index 100%
rename from benchmark/fixtures/subr.el
rename to fixtures/benchmark/subr.el

diff --git a/test/fixtures/block-scopes.js b/fixtures/test/block-scopes.js
similarity index 100%
rename from test/fixtures/block-scopes.js
rename to fixtures/test/block-scopes.js

diff --git a/test/fixtures/catch.js b/fixtures/test/catch.js
similarity index 100%
rename from test/fixtures/catch.js
rename to fixtures/test/catch.js

diff --git a/test/fixtures/changed.el b/fixtures/test/changed.el
similarity index 100%
rename from test/fixtures/changed.el
rename to fixtures/test/changed.el

diff --git a/test/fixtures/comment.el b/fixtures/test/comment.el
similarity index 100%
rename from test/fixtures/comment.el
rename to fixtures/test/comment.el

diff --git a/test/fixtures/comments-and-strings.js b/fixtures/test/comments-and-strings.js
similarity index 100%
rename from test/fixtures/comments-and-strings.js
rename to fixtures/test/comments-and-strings.js

diff --git a/test/fixtures/cond.el b/fixtures/test/cond.el
similarity index 100%
rename from test/fixtures/cond.el
rename to fixtures/test/cond.el

diff --git a/test/fixtures/condition-case.el b/fixtures/test/condition-case.el
similarity index 100%
rename from test/fixtures/condition-case.el
rename to fixtures/test/condition-case.el

diff --git a/test/fixtures/defadvice.el b/fixtures/test/defadvice.el
similarity index 100%
rename from test/fixtures/defadvice.el
rename to fixtures/test/defadvice.el

diff --git a/test/fixtures/defun.el b/fixtures/test/defun.el
similarity index 100%
rename from test/fixtures/defun.el
rename to fixtures/test/defun.el

diff --git a/test/fixtures/dolist.el b/fixtures/test/dolist.el
similarity index 100%
rename from test/fixtures/dolist.el
rename to fixtures/test/dolist.el

diff --git a/test/fixtures/empty b/fixtures/test/empty
similarity index 100%
rename from test/fixtures/empty
rename to fixtures/test/empty

diff --git a/test/fixtures/empty-varlist.el b/fixtures/test/empty-varlist.el
similarity index 100%
rename from test/fixtures/empty-varlist.el
rename to fixtures/test/empty-varlist.el

diff --git a/test/fixtures/function-scopes.js b/fixtures/test/function-scopes.js
similarity index 100%
rename from test/fixtures/function-scopes.js
rename to fixtures/test/function-scopes.js

diff --git a/test/fixtures/global.js b/fixtures/test/global.js
similarity index 100%
rename from test/fixtures/global.js
rename to fixtures/test/global.js

diff --git a/test/fixtures/ignored.el b/fixtures/test/ignored.el
similarity index 100%
rename from test/fixtures/ignored.el
rename to fixtures/test/ignored.el

diff --git a/test/fixtures/initial-level.js b/fixtures/test/initial-level.js
similarity index 100%
rename from test/fixtures/initial-level.js
rename to fixtures/test/initial-level.js

diff --git a/test/fixtures/iteration.el b/fixtures/test/iteration.el
similarity index 100%
rename from test/fixtures/iteration.el
rename to fixtures/test/iteration.el

diff --git a/test/fixtures/key-names.js b/fixtures/test/key-names.js
similarity index 100%
rename from test/fixtures/key-names.js
rename to fixtures/test/key-names.js

diff --git a/test/fixtures/key-values.js b/fixtures/test/key-values.js
similarity index 100%
rename from test/fixtures/key-values.js
rename to fixtures/test/key-values.js

diff --git a/test/fixtures/lambda.el b/fixtures/test/lambda.el
similarity index 100%
rename from test/fixtures/lambda.el
rename to fixtures/test/lambda.el

diff --git a/test/fixtures/let-star.el b/fixtures/test/let-star.el
similarity index 100%
rename from test/fixtures/let-star.el
rename to fixtures/test/let-star.el

diff --git a/test/fixtures/let.el b/fixtures/test/let.el
similarity index 100%
rename from test/fixtures/let.el
rename to fixtures/test/let.el

diff --git a/test/fixtures/macroexp-let2.el b/fixtures/test/macroexp-let2.el
similarity index 100%
rename from test/fixtures/macroexp-let2.el
rename to fixtures/test/macroexp-let2.el

diff --git a/test/fixtures/property-lookup.js b/fixtures/test/property-lookup.js
similarity index 100%
rename from test/fixtures/property-lookup.js
rename to fixtures/test/property-lookup.js

diff --git a/test/fixtures/quote.el b/fixtures/test/quote.el
similarity index 100%
rename from test/fixtures/quote.el
rename to fixtures/test/quote.el

diff --git a/test/fixtures/sexp.el b/fixtures/test/sexp.el
similarity index 100%
rename from test/fixtures/sexp.el
rename to fixtures/test/sexp.el

diff --git a/test/fixtures/splice.el b/fixtures/test/splice.el
similarity index 100%
rename from test/fixtures/splice.el
rename to fixtures/test/splice.el

diff --git a/test/fixtures/string.el b/fixtures/test/string.el
similarity index 100%
rename from test/fixtures/string.el
rename to fixtures/test/string.el

diff --git a/test/fixtures/unbalanced-parenthesis.el b/fixtures/test/unbalanced-parenthesis.el
similarity index 100%
rename from test/fixtures/unbalanced-parenthesis.el
rename to fixtures/test/unbalanced-parenthesis.el

diff --git a/test/fixtures/unterminated-comment.js b/fixtures/test/unterminated-comment.js
similarity index 100%
rename from test/fixtures/unterminated-comment.js
rename to fixtures/test/unterminated-comment.js

diff --git a/test/fixtures/varlist-spacing.el b/fixtures/test/varlist-spacing.el
similarity index 100%
rename from test/fixtures/varlist-spacing.el
rename to fixtures/test/varlist-spacing.el

diff --git a/test/fixtures/.nosearch b/test/fixtures/.nosearch
deleted file mode 100644 (file)
index e69de29..0000000