From bff1a64280afef7521123bc7de89d79cb496b9f1 Mon Sep 17 00:00:00 2001
From: Phil Jackson <phil@shellarchive.co.uk>
Date: Tue, 5 Aug 2008 22:14:57 +0100
Subject: [PATCH] etest-execute.el: `etest-execute-get-test-file' basics down.

---
 etest-execute.el | 24 ++++++++++++------------
 etest.etest      | 16 ++++++----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/etest-execute.el b/etest-execute.el
index b025aaa..7eaec37 100644
--- a/etest-execute.el
+++ b/etest-execute.el
@@ -35,22 +35,22 @@
 
 (defun etest-execute-get-test-file ()
   "Find a test file by first checking the (buffer local) variable
-`etest-file' then checking `etest-load-path' for a similarly
-named (to the buffer) file."
+`etest-file'. Then checking `etest-load-path' for a similarly
+named (to the buffer) file. Then looking in `default-directory'."
   (cond
     ((and etest-file
           (file-exists-p (expand-file-name etest-file)))
      (expand-file-name etest-file))
-    ((when etest-load-path
-       (catch 'found
-         (let ((name (concat
-                      (file-name-sans-extension
-                       (file-name-nondirectory buffer-file-name)) ".etest")))
-           (mapc '(lambda (d)
-                   (let ((name (expand-file-name (concat d name))))
-                     (when (file-exists-p name)
-                       (throw 'found name))))
-                 etest-load-path)))))))
+    ((catch 'found
+       (let ((etest-load-path (append etest-load-path (list default-directory)))
+             (name (concat
+                    (file-name-sans-extension
+                     (file-name-nondirectory buffer-file-name)) ".etest")))
+         (mapc '(lambda (d)
+                 (let ((name (expand-file-name (concat d name))))
+                   (when (file-exists-p name)
+                     (throw 'found name))))
+               etest-load-path))))))
                
 
 (defun etest-execute ()
diff --git a/etest.etest b/etest.etest
index add00dd..140bdb1 100644
--- a/etest.etest
+++ b/etest.etest
@@ -1,17 +1,13 @@
 (etest
  ("Execute"
-  (null (let ((etest-file nil)
-              (etest-load-path nil))
-          (etest-execute-get-test-file))
-        "No etest-file or load-path results in nil")
-  (like (let ((etest-file "etest.etest"))
-          (etest-execute-get-test-file))
-        (concat default-directory etest-file)
-        "etest-file being set returns a good path")
+  (like   (let ((etest-file "etest.etest"))
+            (etest-execute-get-test-file))
+          (concat default-directory etest-file)
+          "etest-file being set returns a good path")
   (like (let ((etest-file nil)
-              (etest-load-path default-directory))
+              (etest-load-path (list default-directory)))
           (etest-execute-get-test-file))
-        "^etest.etest$"
+        "/etest.etest$"
         "Load path being set returns correct value")))
 
 (etest
-- 
2.11.4.GIT