From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Michal Nazarewicz Newsgroups: gmane.emacs.bugs Subject: bug#24071: [PATCH 3/7] Fix reading of regex-resources in regex-tests Date: Wed, 27 Jul 2016 18:50:43 +0200 Message-ID: <1469638247-20131-3-git-send-email-mina86@mina86.com> References: <83d1m0tq25.fsf@gnu.org> <1469638247-20131-1-git-send-email-mina86@mina86.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1469639011 2850 80.91.229.3 (27 Jul 2016 17:03:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 Jul 2016 17:03:31 +0000 (UTC) To: 24071@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jul 27 19:03:22 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1bSSEr-0003ms-Di for geb-bug-gnu-emacs@m.gmane.org; Wed, 27 Jul 2016 19:03:21 +0200 Original-Received: from localhost ([::1]:47784 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSSEq-00034R-PU for geb-bug-gnu-emacs@m.gmane.org; Wed, 27 Jul 2016 13:03:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSS2z-0002Hz-Lv for bug-gnu-emacs@gnu.org; Wed, 27 Jul 2016 12:51:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSS2w-0003TB-QE for bug-gnu-emacs@gnu.org; Wed, 27 Jul 2016 12:51:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:55282) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSS2w-0003T3-NG for bug-gnu-emacs@gnu.org; Wed, 27 Jul 2016 12:51:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1bSS2w-0007ra-7y for bug-gnu-emacs@gnu.org; Wed, 27 Jul 2016 12:51:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Michal Nazarewicz Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 27 Jul 2016 16:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 24071 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 24071-submit@debbugs.gnu.org id=B24071.146963826030201 (code B ref 24071); Wed, 27 Jul 2016 16:51:02 +0000 Original-Received: (at 24071) by debbugs.gnu.org; 27 Jul 2016 16:51:00 +0000 Original-Received: from localhost ([127.0.0.1]:39378 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSS2t-0007r1-Ec for submit@debbugs.gnu.org; Wed, 27 Jul 2016 12:50:59 -0400 Original-Received: from mail-wm0-f52.google.com ([74.125.82.52]:37670) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSS2s-0007qd-Kr for 24071@debbugs.gnu.org; Wed, 27 Jul 2016 12:50:58 -0400 Original-Received: by mail-wm0-f52.google.com with SMTP id i5so71437389wmg.0 for <24071@debbugs.gnu.org>; Wed, 27 Jul 2016 09:50:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dczkYOoJJZtLS+B+E5bX3x3LsEyaGqovxha4SDZ21vQ=; b=JAWs8mgF9AVzLbj7zPt7wX4yid7T/zjJFGRia+1Ge5PqY4PcM/32a5ziCtcApwNMdk 8etmbHnTnMIUWWq6G+yJnKvNu7ZBsqHpRIifho+9dV0VXoFLjifZyrATUygt7NULCupI UXGkR8NP5ZKFueTjAdszPdF+hxqoYO6WXNj7nq1/Xb/Fwk2FZNNt4F19nwuR2xmtz4bO F9+cudYZkx3yVizhRpt3DVRgZSx3AH4B21IIQ1H+TyxKCkZjs/Mu3Yk6PH5PIifCwsdO oLtOD8kO8kCW6KOLg9zqyHROnBQJqZCV4X6XLj/FGQAJECQ8V78j2XLFCreiXLeEoroD WNYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dczkYOoJJZtLS+B+E5bX3x3LsEyaGqovxha4SDZ21vQ=; b=cs+e7bioOHA/EbgFuTnl17bk2DluQXFxG2ZM02tkkBond+bSB+kxq3XdeIUZLfe5b3 S2vOHmeitfLIBeJ9ZdMCgF2Vz3d4wqewNrbJvW215WphSSnwhxBB30hY9+dXb6M2j94n D3H93p12IbfOTGP63pmZcUnZxRXiXEphbM5TeLKCMnfHfOO1hei9OO8Xxw8m1xKiiZ9I 67rJFbQW9d2mRtn0/OQwO25MlvFyPu7gzWobf2JO6kyW4OMGMDv+Yf7DTYfvY3x8V0YU /R57CCJ2pC+5ceu22JRZ89uO0BfxJcxGcSb/VXBRii9Zc/lF0O8nJU0k0pJNYKDpIKrp uBxw== X-Gm-Message-State: ALyK8tJKvvFU8oDhRHs+A1vUNQwNSah3R+U1CKC4bCPPuYTSssEiwobBtA1AmXTcSNBd2mR+ X-Received: by 10.28.17.9 with SMTP id 9mr55339255wmr.73.1469638252347; Wed, 27 Jul 2016 09:50:52 -0700 (PDT) Original-Received: from mpn.zrh.corp.google.com ([172.16.113.135]) by smtp.gmail.com with ESMTPSA id a2sm7221626wjg.46.2016.07.27.09.50.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Jul 2016 09:50:51 -0700 (PDT) Original-Received: by mpn.zrh.corp.google.com (Postfix, from userid 126942) id 44AE81E021A; Wed, 27 Jul 2016 18:50:50 +0200 (CEST) X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: <1469638247-20131-1-git-send-email-mina86@mina86.com> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:121594 Archived-At: * 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