emacs-orgmode
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [O] [bug] regression tests broken


From: Martyn Jago
Subject: Re: [O] [bug] regression tests broken
Date: Sun, 13 Nov 2011 16:08:16 +0000
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (darwin)

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 ->
> address@hidden). 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.
>

>From b868e208dd3ece7c10818ed73f2cf0dc86dac94b Mon Sep 17 00:00:00 2001
From: Martyn Jago <address@hidden>
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

Best, Martyn

[...]


reply via email to

[Prev in Thread] Current Thread [Next in Thread]