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:36:47 +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 1470191982 17118 195.159.176.226 (3 Aug 2016 02:39:42 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 3 Aug 2016 02:39:42 +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:39:38 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 1bUm5p-0003x0-23 for ged-emacs-devel@m.gmane.org; Wed, 03 Aug 2016 04:39:37 +0200 Original-Received: from localhost ([::1]:59820 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUm5l-0002v0-I8 for ged-emacs-devel@m.gmane.org; Tue, 02 Aug 2016 22:39:33 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUm3F-0000Xb-2q for emacs-devel@gnu.org; Tue, 02 Aug 2016 22:36:58 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bUm3A-0007eN-T7 for emacs-devel@gnu.org; Tue, 02 Aug 2016 22:36:56 -0400 Original-Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:38327) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bUm3A-0007dL-ID for emacs-devel@gnu.org; Tue, 02 Aug 2016 22:36:52 -0400 Original-Received: by mail-wm0-x236.google.com with SMTP id o80so315295831wme.1 for ; Tue, 02 Aug 2016 19:36:52 -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=1B2DMVE/YTB/qlhj8BQ4oPzWovMBHMzzH7MH1cI8mqw=; b=XyvKIEB8k+svU5nin/oxJNl5L9vMtFCkcjlxKrlOwxsbIIX9/hObFvem5cz+rrpVuN y1S3jIyy5XF6lBvB8r5vT1HC7m9nXkP0O8fzB9YfN/FYNMiUk+rczpN2tnzgckFErdtc RVgXdRjQWvGU5yypeSwzJgO61Vv2zpgAqulsug6z+O2F0ArQfCB/+zsx9rE19wf/WmaX TCtAC2QrAidvfratmcM2G5hzLUNq62IfG+F+DOjkyOBgnTgMifX772VTpOkr1fQ4H589 pb+fzZAjGUqAfapFuIEBfBd9ENX94So7bUO3qsW3SXlhYrOxALV9cPoa0htyQzkqBYSG CwHg== 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=1B2DMVE/YTB/qlhj8BQ4oPzWovMBHMzzH7MH1cI8mqw=; b=GsR23QGC6x0AKWYbsMcA+aOkYjSUU17MocBFDHHi5kFRj6ujQZohDqjrvRm2UnCl8O V4ghiwB6I1vvzE+aLH5BadWPfDsF/um6hgvRseJGsGLDgbskvags0V407Wc2Gwyqfafl fOgcB7cuvaM/8+w0sAa8hRSQDmZ3lbRD6SGRz7NH9jbRQyLCvRejSHmEV/jMgHjpfjt6 6bN4YbzEY2vugqCEY7SVWnUGpKKTFz28CboC/tzO0FTBH2Dm3KJu6m3+2VGb7t9YjQAT +VyOYgSxCF2tyYIL1bzMWd8bcc8lYllB0bD0yItKbCJXR9PE6z6kVkg8MWQ5apAHFJTB LQuA== X-Gm-Message-State: AEkoousEhW/1IHMFyJErNm2HNCrmkiK5y22crCAZEXbQHDdL+Z+uRNbyT/44aafcozKcnjxL X-Received: by 10.28.71.197 with SMTP id m66mr66835877wmi.26.1470191811638; Tue, 02 Aug 2016 19:36:51 -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 s184sm24697669wmb.11.2016.08.02.19.36.48 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 02 Aug 2016 19:36:48 -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::Oj8Bw00Dp+yNSreT:0000000000000000000000000000000000000000001K1Z X-Hashcash: 1:20:160803:kbrown@cornell.edu::xlsa/FJ9PxPbO0A3:00000000000000000000000000000000000000000006/Jh X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::236 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:206384 Archived-At: 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 te= st from command >> line, i.e. via make, which results in (wrong-type-argument stringp n= il) >> 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: diff --git a/test/src/regex-tests.el b/test/src/regex-tests.el index 898548d..c77168b 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