emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Martyn Jago <martyn.jago@btinternet.com>
To: emacs-orgmode@gnu.org
Subject: Re: [bug] regression tests broken
Date: Sun, 13 Nov 2011 16:08:16 +0000	[thread overview]
Message-ID: <m2k474ngy7.fsf@btinternet.com> (raw)
In-Reply-To: m2obwgnix5.fsf@btinternet.com

[-- Attachment #1: Type: text/plain, Size: 379 bytes --]

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.
>


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Fix-don-t-load-symlinks-Emacs-interlocking-files --]
[-- Type: text/x-patch, Size: 1191 bytes --]

From b868e208dd3ece7c10818ed73f2cf0dc86dac94b Mon Sep 17 00:00:00 2001
From: Martyn Jago <martyn.jago@btinternet.com>
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


[-- Attachment #3: Type: text/plain, Size: 22 bytes --]


Best, Martyn

[...]


  reply	other threads:[~2011-11-13 16:08 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-11 21:29 [bug] regression tests broken Martyn Jago
2011-11-11 21:43 ` Eric Schulte
2011-11-12 18:22   ` Martyn Jago
2011-11-13 15:25     ` Martyn Jago
2011-11-13 16:08       ` Martyn Jago [this message]
2011-11-13 16:15       ` Eric Schulte
2011-11-13 16:04     ` Eric Schulte
2011-11-13 18:37       ` Martyn Jago

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=m2k474ngy7.fsf@btinternet.com \
    --to=martyn.jago@btinternet.com \
    --cc=emacs-orgmode@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).