From: Michal Nazarewicz <mina86@mina86.com>
To: 24071@debbugs.gnu.org
Subject: bug#24071: [PATCH 3/7] Fix reading of regex-resources in regex-tests
Date: Wed, 27 Jul 2016 18:50:43 +0200 [thread overview]
Message-ID: <1469638247-20131-3-git-send-email-mina86@mina86.com> (raw)
In-Reply-To: <1469638247-20131-1-git-send-email-mina86@mina86.com>
* 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.
---
test/src/regex-tests.el | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/test/src/regex-tests.el b/test/src/regex-tests.el
index 13a9f86..1407441 100644
--- a/test/src/regex-tests.el
+++ b/test/src/regex-tests.el
@@ -99,8 +99,7 @@ regex-tests-generic-line
`(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 @@ regex-tests-BOOST
(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 @@ regex-tests-PCRE
(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 @@ regex-tests-PTESTS-whitelist
(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 @@ regex-tests-TESTS-whitelist
(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))))
--
2.8.0.rc3.226.g39d4020
next prev parent reply other threads:[~2016-07-27 16:50 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-25 22:54 bug#24071: [PATCH] Refactor regex character class parsing in [:name:] Michal Nazarewicz
2016-07-26 14:46 ` Eli Zaretskii
2016-07-27 15:29 ` Michal Nazarewicz
2016-07-27 16:28 ` Eli Zaretskii
2016-07-27 18:30 ` Michal Nazarewicz
2016-07-27 16:50 ` bug#24071: [PATCH 1/7] New regex tests imported from glibc 2.21 Michal Nazarewicz
2016-07-27 16:50 ` bug#24071: [PATCH 2/7] Added driver for the regex tests Michal Nazarewicz
2016-07-27 16:50 ` Michal Nazarewicz [this message]
2016-07-27 16:50 ` bug#24071: [PATCH 4/7] Don’t (require 'cl) Michal Nazarewicz
2016-07-27 16:50 ` bug#24071: [PATCH 5/7] Split regex glibc test cases into separet tests Michal Nazarewicz
2016-07-27 16:50 ` bug#24071: [PATCH 6/7] Remove dead opcodes in regex bytecode Michal Nazarewicz
2016-07-27 16:50 ` bug#24071: [PATCH 7/7] Refactor regex character class parsing in [:name:] Michal Nazarewicz
2016-07-29 5:31 ` bug#24071: [PATCH] " Dima Kogan
2016-07-29 5:53 ` Eli Zaretskii
2016-07-29 13:07 ` Michal Nazarewicz
2016-08-02 16:06 ` Michal Nazarewicz
2016-08-02 16:46 ` Eli Zaretskii
2016-08-02 17:54 ` Michal Nazarewicz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1469638247-20131-3-git-send-email-mina86@mina86.com \
--to=mina86@mina86.com \
--cc=24071@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.