From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Michal Nazarewicz Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] master 82a487d 03/10: Fix reading of regex-resources in regex-tests Date: Wed, 03 Aug 2016 04:40:02 +0200 Organization: http://mina86.com/ Message-ID: References: <20160802160532.8569.48288@vcs.savannah.gnu.org> <20160802160534.8844E2201A4@vcs.savannah.gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: blaine.gmane.org 1470192023 995 195.159.176.226 (3 Aug 2016 02:40:23 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 3 Aug 2016 02:40:23 +0000 (UTC) User-Agent: Notmuch/0.19+53~g2e63a09 (http://notmuchmail.org) Emacs/25.1.50.1 (x86_64-unknown-linux-gnu) To: Ken Brown , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Aug 03 04:40:20 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bUm6V-0008GS-8E for ged-emacs-devel@m.gmane.org; Wed, 03 Aug 2016 04:40:19 +0200 Original-Received: from localhost ([::1]:59827 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUm6R-0003Jq-Sm for ged-emacs-devel@m.gmane.org; Tue, 02 Aug 2016 22:40:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43196) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUm6J-0003G9-E3 for emacs-devel@gnu.org; Tue, 02 Aug 2016 22:40:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUm6H-0008SJ-Eh for emacs-devel@gnu.org; Tue, 02 Aug 2016 22:40:06 -0400 Original-Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:36891) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUm6H-0008Rt-4j for emacs-devel@gnu.org; Tue, 02 Aug 2016 22:40:05 -0400 Original-Received: by mail-wm0-x22e.google.com with SMTP id i5so315304534wmg.0 for ; Tue, 02 Aug 2016 19:40:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:subject:in-reply-to:organization:references :user-agent:face:date:message-id:mime-version :content-transfer-encoding; bh=nrtR1JKdmMQPjdYfDBW4JHBsXaUDo2IidTu5H/0JVyw=; b=DpxRGoDAF2KHw5glKPyie7a/gdjiIcAwMEhsx2lHNhPm5dBUS19qYq68xOsP8PWo6M s4GDE2VAoBGMScD6uQZkxD9jVYIH5zuChWFabcjqBUlu8sS/0JYPuWgnXZX+Avdg0jB8 j11nrPav4oNBjNKskK5ZSoDVbLYKND7IdGNoj3yiseMUoBBmEpWFxvpKHR6Ri2PAFNUO HrV6e+HVVw3jMNKe4nAonOFZiL7DG7zscufGb60jr6kwBibPPmTN03byjbh+TygA46KJ i+MlVGJy3nvgp7+Hxu5XKzSMS7jWi2hEqufhvnaE5lMn5sGfG031qGXK/6SMNJdhROdb MYqA== 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:subject:in-reply-to:organization :references:user-agent:face:date:message-id:mime-version :content-transfer-encoding; bh=nrtR1JKdmMQPjdYfDBW4JHBsXaUDo2IidTu5H/0JVyw=; b=JphF1aakScwx11ly2ZdCf3ARMquHnz78dzYW8N37xNeYi5nTN/FHYPArNfpWDFkunz YGPkdb+Fo3lm+xcdGScJ4He51d2vOeuYUPwfdj13GQRT9QobZBtZmsIWZoKKZzsarXM5 DaNMsOmgGfSStn18Im8t4xzIrrbOfGO14z36CjCegNMWlw80MfxJTD1CeTexO3fFYVru zPpBEEKHSA7aCL6WtgXk3toGYgnY7iwkiRlsXY7x8KcK/zU3c3JfnHHy9bhwnrvzaRh0 Ha7zqF1vTTXsQIAXJBIp2KXjcRnU4yHw/TJFP6CNUqFQY3x2onR39LMs4S+MD8P7Y9Mh z4tA== X-Gm-Message-State: AEkoouvVLINFrflvQuMK0fa3LmpRHFCcbc4EaMiXtqSHuXXcUneMDd2/RNUiesDm6AQSZD8W X-Received: by 10.194.85.97 with SMTP id g1mr57316723wjz.72.1470192003977; Tue, 02 Aug 2016 19:40:03 -0700 (PDT) Original-Received: from mpn-glaptop (178-83-69-73.dynamic.hispeed.ch. [178.83.69.73]) by smtp.gmail.com with ESMTPSA id n131sm24665144wmd.3.2016.08.02.19.40.03 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 02 Aug 2016 19:40:03 -0700 (PDT) In-Reply-To: Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJFBMVEWbfGlUPDDHgE57V0jUupKjgIObY0PLrom9mH4dFRK4gmjPs41MxjOgAAACP0lEQVQ4T23Sv2vbQBQHcBk1xE6WyALX107VUEgmn6+ouUwpEQQ6uRjttkWP4CkBg2M0BQLBdPFZYPsyFYo7qEtKDQ7on+t7+nF2Ux8ahD587717OmNYrOvycHsZ+o2r051wHTHysAvGb8ygvgu4QWT0sCmkgZCIEnlV2X8BtyraazFGDuxhmKSQJMlwHQ7v5MHSNxmz78rfElwAa3ieVD9e+hBhjaPDDG6NgFo2f4wBMNIo5YmRtF0RyDgFjJjlMIWbnuM4x9MMfABGTlN4qgIQB4A1DEyA1BHWtfeWNUMwiVJKoqh97KrkOO+qzgluVYLvFCUKAX73nONeBr7BGMdM6Sg0kuep03VywLaIzRiVr+GAzKlpQIsAFnWAG2e6DT5WmWDiudZMIc6hYrMOmeMQK9WX0B+/RfjzL9DI7Y9/Iayn29Ci0r2i4f9gMimMSZLCDMalgQGU5hnUtqAN0OGvEmO1Wnl0C0wWSCEHnuHBqmygxdxA8oWXwbipoc1EoNR9DqOpBpOJrnr0criQab9ZT4LL+wI+K7GBQH30CrhUruilgP9DRTrhVWZCiAyILP+wiuLeCKGTD6r/nc8LOJcAwR6IBTUs+7CASw3QFZ0MdA2PI3zNziH4ZKVhXCRMBjeZ1DWMekKwDCASwExy+NQ86TaykaDAFHO4aP48y4 fIcDM5yOG8GcTLbOyp8A8azjJI93JFd1EA6yN8sSxMQJWoABqniRZVykYgRXErzrdqExAoUrRb0xfRp8p2A/4XmfilTtkDZ4cAAAAASUVORK5CYII= X-Face: -TR8(rDTHy/(xl?SfWd1|3:TTgDIatE^t'vop%*gVg[kn$t{EpK(P"VQ=~T2#ysNmJKN$"yTRLB4YQs$4{[.]Fc1)*O]3+XO^oXM>Q#b^ix, O)Zbn)q[y06$`e3?C)`CwR9y5riE=fv^X@x$y?D:XO6L&x4f-}}I4=VRNwiA^t1-ZrVK^07.Pi/57c_du'& X-PGP: 50751FF4 X-PGP-FP: AC1F 5F5C D418 88F8 CC84 5858 2060 4012 5075 1FF4 X-Hashcash: 1:20:160803:emacs-devel@gnu.org::vMlBvW7P0Wpw7vED:0000000000000000000000000000000000000000000Ex2 X-Hashcash: 1:20:160803:kbrown@cornell.edu::snYMa4qIrUWfGINL:0000000000000000000000000000000000000000000701b X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22e X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:206385 Archived-At: On Wed, Aug 03 2016, Michal Nazarewicz wrote: > On Tue, Aug 02 2016, Ken Brown wrote: >> On 8/2/2016 12:05 PM, Michal Nazarewicz wrote: >>> branch: master >>> commit 82a487d522106c1c5afb00f2fa6c9055e37ba5ad >>> Author: Michal Nazarewicz >>> Commit: Michal Nazarewicz >>> >>> Fix reading of regex-resources in regex-tests >>> >>> * test/src/regex-tests.el (regex-tests-generic-line): Referring to >>> =E2=80=98buffer-file-name=E2=80=99 does not work when running the t= est from command >>> line, i.e. via make, which results in (wrong-type-argument stringp = nil) >>> failures. Replace it with hard-coded path. >> >> Four of the tests now fail for an out-of-tree build: >> >> FAILED regex-tests-BOOST >> FAILED regex-tests-PCRE >> FAILED regex-tests-PTESTS >> FAILED regex-tests-TESTS >> >> Ken > > Does this fix this: By which I of course meant: diff --git a/test/src/regex-tests.el b/test/src/regex-tests.el index 898548d..85addca 100644 --- a/test/src/regex-tests.el +++ b/test/src/regex-tests.el @@ -21,6 +21,11 @@ =20 (require 'ert) =20 +(defvar regex-tests--resources-dir + (concat (concat (file-name-directory (or load-file-name buffer-file-name= )) + "/regex-resources/")) + "Path to regex-resources directory next to the \"regex-tests.el\" file.") + (ert-deftest regex-word-cc-fallback-test () "Test that =E2=80=98[[:cc:]]*x=E2=80=99 matches =E2=80=98x=E2=80=99 (bug= #24020). =20 @@ -98,7 +103,7 @@ regex-tests-generic-line =20 `(with-temp-buffer (modify-syntax-entry ?_ "w;; ") ; tests expect _ to be a word - (insert-file-contents ,(concat "src/regex-resources/" test-file)) + (insert-file-contents (concat regex-tests--resources-dir ,test-file)) (let ((case-fold-search nil) (line-number 1) (whitelist-idx 0)) --=20 Best regards =E3=83=9F=E3=83=8F=E3=82=A6 =E2=80=9C=F0=9D=93=B6=F0=9D=93=B2=F0=9D=93=B7= =F0=9D=93=AA86=E2=80=9D =E3=83=8A=E3=82=B6=E3=83=AC=E3=83=B4=E3=82=A4=E3=83= =84 =C2=ABIf at first you don=E2=80=99t succeed, give up skydiving=C2=BB