Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move php-mode-test.el into tests directory #559

Merged
merged 1 commit into from
Aug 13, 2019
Merged

Move php-mode-test.el into tests directory #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
EMACS ?= emacs
ELS = php.el php-face.el php-project.el php-mode.el php-mode-debug.el php-mode-test.el
ELS = php.el php-face.el php-project.el php-mode.el php-mode-debug.el
AUTOLOADS = php-mode-autoloads.el
ELCS = $(ELS:.el=.elc)

Expand Down Expand Up @@ -37,6 +37,6 @@ dev:
# for an example of using a script like this with the 'git bisect run'
# command.
test: clean all
$(EMACS) -Q -batch -L . -l php-mode-test.el -f ert-run-tests-batch-and-exit
$(EMACS) -Q -batch -L . -l tests/php-mode-test.el -f ert-run-tests-batch-and-exit

.PHONY: all autoloads clean test
7 changes: 3 additions & 4 deletions php-mode-test.el → tests/php-mode-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,9 @@
;; <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14325>.
(c-after-font-lock-init)

(defvar php-mode-test-dir (expand-file-name "tests"
(if load-file-name
(file-name-directory load-file-name)
default-directory))
(defvar php-mode-test-dir (if load-file-name
(file-name-directory load-file-name)
default-directory)
"Directory containing the `php-mode' test files.")

(defvar php-mode-test-valid-magics '(indent)
Expand Down