diff options
| author | Michal Nazarewicz <mina86@mina86.com> | 2016-07-27 17:25:34 +0200 |
|---|---|---|
| committer | Michal Nazarewicz <mina86@mina86.com> | 2016-08-02 15:39:10 +0200 |
| commit | 82a487d522106c1c5afb00f2fa6c9055e37ba5ad (patch) | |
| tree | ef5cfd239c5ea5ac78133ee4912ee3e6538a2219 /test/src/regex-tests.el | |
| parent | 91d53091950d7aae6f16cf47d4cce754b5eacfe5 (diff) | |
| download | emacs-82a487d522106c1c5afb00f2fa6c9055e37ba5ad.tar.gz emacs-82a487d522106c1c5afb00f2fa6c9055e37ba5ad.tar.bz2 emacs-82a487d522106c1c5afb00f2fa6c9055e37ba5ad.zip | |
Fix reading of regex-resources in regex-tests
* test/src/regex-tests.el (regex-tests-generic-line): Referring to
‘buffer-file-name’ does not work when running the test from command
line, i.e. via make, which results in (wrong-type-argument stringp nil)
failures. Replace it with hard-coded path.
(regex-tests-BOOST, regex-tests-PCRE, regex-tests-PTESTS-whitelist,
regex-tests-TESTS-whitelist): ‘regex-tests-generic-line’ now includes
the ‘regex-resources’ path component so the tests don’t need to specify
it explicitly.
Diffstat (limited to 'test/src/regex-tests.el')
| -rw-r--r-- | test/src/regex-tests.el | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/test/src/regex-tests.el b/test/src/regex-tests.el index 13a9f86e00f..1407441965a 100644 --- a/test/src/regex-tests.el +++ b/test/src/regex-tests.el @@ -99,8 +99,7 @@ are known failures, and are skipped." `(with-temp-buffer (modify-syntax-entry ?_ "w;; ") ; tests expect _ to be a word - (insert-file-contents ,(concat (file-name-directory (buffer-file-name)) test-file)) - + (insert-file-contents ,(concat "src/regex-resources/" test-file)) (let ((case-fold-search nil) (line-number 1) (whitelist-idx 0)) @@ -419,7 +418,7 @@ differences in behavior.") (let (failures basic icase newline notbol noteol) (regex-tests-generic-line - ?; "regex-resources/BOOST.tests" regex-tests-BOOST-whitelist + ?; "BOOST.tests" regex-tests-BOOST-whitelist (if (save-excursion (re-search-forward "^-" nil t)) (setq basic (save-excursion (re-search-forward "REG_BASIC" nil t)) icase (save-excursion (re-search-forward "REG_ICASE" nil t)) @@ -496,7 +495,7 @@ differences in behavior.") (let (failures pattern icase string what-failed matches-observed) (regex-tests-generic-line - ?# "regex-resources/PCRE.tests" regex-tests-PCRE-whitelist + ?# "PCRE.tests" regex-tests-PCRE-whitelist (cond @@ -570,7 +569,7 @@ differences in behavior.") (defun regex-tests-PTESTS () (let (failures) (regex-tests-generic-line - ?# "regex-resources/PTESTS" regex-tests-PTESTS-whitelist + ?# "PTESTS" regex-tests-PTESTS-whitelist (let* ((fields (split-string (buffer-string) "¦")) ;; string has 1-based index of first char in the @@ -632,7 +631,7 @@ differences in behavior.") (defun regex-tests-TESTS () (let (failures) (regex-tests-generic-line - ?# "regex-resources/TESTS" regex-tests-TESTS-whitelist + ?# "TESTS" regex-tests-TESTS-whitelist (if (save-excursion (re-search-forward "^\\([^:]+\\):\\(.*\\):\\([^:]*\\)$" nil t)) (let* ((what-failed (let ((raw (string-to-number (match-string 1)))) |