From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martyn Jago Subject: Re: [bug] regression tests broken Date: Sun, 13 Nov 2011 16:08:16 +0000 Message-ID: References: <87bosil4hi.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([140.186.70.92]:60374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPcbj-0000xP-Gk for emacs-orgmode@gnu.org; Sun, 13 Nov 2011 11:08:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RPcbh-0003e5-V1 for emacs-orgmode@gnu.org; Sun, 13 Nov 2011 11:08:35 -0500 Received: from lo.gmane.org ([80.91.229.12]:44417) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPcbh-0003dw-L2 for emacs-orgmode@gnu.org; Sun, 13 Nov 2011 11:08:33 -0500 Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1RPcbg-00083H-J1 for emacs-orgmode@gnu.org; Sun, 13 Nov 2011 17:08:32 +0100 Received: from 88-96-171-138.dsl.zen.co.uk ([88.96.171.138]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 13 Nov 2011 17:08:32 +0100 Received: from martyn.jago by 88-96-171-138.dsl.zen.co.uk with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 13 Nov 2011 17:08:32 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org --=-=-= Content-Type: text/plain Hi Eric Oops, the patch was broken - this one fixes the problem... [...] > Currently `org-test-load' will happily attempt to load an interlocking > symbolic link (such as .#test-ob-exp.el -> > martyn@88-96-171-138.59787). This results in a failure to run any tests, > and is particularly annoying during test development. Below is a patch > that fixes this problem for me. > --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-Fix-don-t-load-symlinks-Emacs-interlocking-files.patch Content-Description: Fix-don-t-load-symlinks-Emacs-interlocking-files >From b868e208dd3ece7c10818ed73f2cf0dc86dac94b Mon Sep 17 00:00:00 2001 From: Martyn Jago Date: Sun, 13 Nov 2011 16:03:51 +0000 Subject: [PATCH] Fix don't load symlinks (Emacs interlocking files) * testing/org-test.el: During test development various interlocking files may be present in testing/lisp directory (since they are being edited by emacs). Currently org-test-load will attempt to load these --- testing/org-test.el | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/testing/org-test.el b/testing/org-test.el index ea8cae4..7d2f7e7 100644 --- a/testing/org-test.el +++ b/testing/org-test.el @@ -276,8 +276,9 @@ otherwise place the point at the beginning of the inserted text." (if (file-directory-p path) (rld path) (catch 'missing-test-dependency - (when (string-match "^[A-Za-z].*\\.el$" path) - load-file path)))) + (when (string-match "^[A-Za-z].*\\.el$" + (file-name-nondirectory path)) + (load-file path))))) (directory-files base 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*\\.el$")))) (rld (expand-file-name "lisp" org-test-dir)) -- 1.7.3.4 --=-=-= Content-Type: text/plain Best, Martyn [...] --=-=-=--