From 4c9a3fca063a0b5806daa68558e8e7b5b4a6488c Mon Sep 17 00:00:00 2001 From: Jackson Ray Hamilton Date: Mon, 2 May 2016 21:12:52 -0700 Subject: [PATCH] Reorganize files. --- .elpaignore | 6 ++++-- .gitignore | 4 ++-- Makefile | 10 +++++----- ...chmark.el => context-coloring-benchmark.el | 20 +++++++++---------- ...overage.el => context-coloring-coverage.el | 0 ...loring-test.el => context-coloring-test.el | 6 +++--- {benchmark/fixtures => fixtures}/.nosearch | 0 .../benchmark}/.dir-locals.el | 0 .../benchmark}/async-0.9.0.js | 0 .../fixtures => fixtures/benchmark}/faces.el | 0 .../benchmark}/jquery-2.1.1.js | 0 .../fixtures => fixtures/benchmark}/lisp.el | 0 .../benchmark}/lodash-2.4.1.js | 0 .../benchmark}/mkdirp-0.5.0.js | 0 .../fixtures => fixtures/benchmark}/simple.el | 0 .../fixtures => fixtures/benchmark}/subr.el | 0 .../test}/block-scopes.js | 0 {test/fixtures => fixtures/test}/catch.js | 0 {test/fixtures => fixtures/test}/changed.el | 0 {test/fixtures => fixtures/test}/comment.el | 0 .../test}/comments-and-strings.js | 0 {test/fixtures => fixtures/test}/cond.el | 0 .../test}/condition-case.el | 0 {test/fixtures => fixtures/test}/defadvice.el | 0 {test/fixtures => fixtures/test}/defun.el | 0 {test/fixtures => fixtures/test}/dolist.el | 0 {test/fixtures => fixtures/test}/empty | 0 .../test}/empty-varlist.el | 0 .../test}/function-scopes.js | 0 {test/fixtures => fixtures/test}/global.js | 0 {test/fixtures => fixtures/test}/ignored.el | 0 .../test}/initial-level.js | 0 {test/fixtures => fixtures/test}/iteration.el | 0 {test/fixtures => fixtures/test}/key-names.js | 0 .../fixtures => fixtures/test}/key-values.js | 0 {test/fixtures => fixtures/test}/lambda.el | 0 {test/fixtures => fixtures/test}/let-star.el | 0 {test/fixtures => fixtures/test}/let.el | 0 .../test}/macroexp-let2.el | 0 .../test}/property-lookup.js | 0 {test/fixtures => fixtures/test}/quote.el | 0 {test/fixtures => fixtures/test}/sexp.el | 0 {test/fixtures => fixtures/test}/splice.el | 0 {test/fixtures => fixtures/test}/string.el | 0 .../test}/unbalanced-parenthesis.el | 0 .../test}/unterminated-comment.js | 0 .../test}/varlist-spacing.el | 0 test/fixtures/.nosearch | 0 48 files changed, 24 insertions(+), 22 deletions(-) rename benchmark/context-coloring-benchmark.el => context-coloring-benchmark.el (94%) rename test/context-coloring-coverage.el => context-coloring-coverage.el (100%) rename test/context-coloring-test.el => context-coloring-test.el (99%) rename {benchmark/fixtures => fixtures}/.nosearch (100%) rename {benchmark/fixtures => fixtures/benchmark}/.dir-locals.el (100%) rename {benchmark/fixtures => fixtures/benchmark}/async-0.9.0.js (100%) rename {benchmark/fixtures => fixtures/benchmark}/faces.el (100%) rename {benchmark/fixtures => fixtures/benchmark}/jquery-2.1.1.js (100%) rename {benchmark/fixtures => fixtures/benchmark}/lisp.el (100%) rename {benchmark/fixtures => fixtures/benchmark}/lodash-2.4.1.js (100%) rename {benchmark/fixtures => fixtures/benchmark}/mkdirp-0.5.0.js (100%) rename {benchmark/fixtures => fixtures/benchmark}/simple.el (100%) rename {benchmark/fixtures => fixtures/benchmark}/subr.el (100%) rename {test/fixtures => fixtures/test}/block-scopes.js (100%) rename {test/fixtures => fixtures/test}/catch.js (100%) rename {test/fixtures => fixtures/test}/changed.el (100%) rename {test/fixtures => fixtures/test}/comment.el (100%) rename {test/fixtures => fixtures/test}/comments-and-strings.js (100%) rename {test/fixtures => fixtures/test}/cond.el (100%) rename {test/fixtures => fixtures/test}/condition-case.el (100%) rename {test/fixtures => fixtures/test}/defadvice.el (100%) rename {test/fixtures => fixtures/test}/defun.el (100%) rename {test/fixtures => fixtures/test}/dolist.el (100%) rename {test/fixtures => fixtures/test}/empty (100%) rename {test/fixtures => fixtures/test}/empty-varlist.el (100%) rename {test/fixtures => fixtures/test}/function-scopes.js (100%) rename {test/fixtures => fixtures/test}/global.js (100%) rename {test/fixtures => fixtures/test}/ignored.el (100%) rename {test/fixtures => fixtures/test}/initial-level.js (100%) rename {test/fixtures => fixtures/test}/iteration.el (100%) rename {test/fixtures => fixtures/test}/key-names.js (100%) rename {test/fixtures => fixtures/test}/key-values.js (100%) rename {test/fixtures => fixtures/test}/lambda.el (100%) rename {test/fixtures => fixtures/test}/let-star.el (100%) rename {test/fixtures => fixtures/test}/let.el (100%) rename {test/fixtures => fixtures/test}/macroexp-let2.el (100%) rename {test/fixtures => fixtures/test}/property-lookup.js (100%) rename {test/fixtures => fixtures/test}/quote.el (100%) rename {test/fixtures => fixtures/test}/sexp.el (100%) rename {test/fixtures => fixtures/test}/splice.el (100%) rename {test/fixtures => fixtures/test}/string.el (100%) rename {test/fixtures => fixtures/test}/unbalanced-parenthesis.el (100%) rename {test/fixtures => fixtures/test}/unterminated-comment.js (100%) rename {test/fixtures => fixtures/test}/varlist-spacing.el (100%) delete mode 100644 test/fixtures/.nosearch diff --git a/.elpaignore b/.elpaignore index 9ec6a5e7c..bad5d87de 100644 --- 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 06046bb79..b9fedcaef 100644 --- 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 f729409b9..08c23eb4c 100644 --- 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 4174d0cef..dafc9591b 100644 --- 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 08684da91..c54cb8010 100644 --- 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 index e69de29bb..000000000 -- 2.39.2