emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] scratch/merge-cedet-tests e78d9b8 201/316: Fix merge error


From: Edward John Steere
Subject: [Emacs-diffs] scratch/merge-cedet-tests e78d9b8 201/316: Fix merge error in unit tests.
Date: Fri, 27 Jan 2017 20:03:40 +0000 (UTC)

branch: scratch/merge-cedet-tests
commit e78d9b879edf77ab96c195638d939342929e9453
Author: David Engster <address@hidden>
Commit: Edward John Steere <address@hidden>

    Fix merge error in unit tests.
---
 test/manual/cedet/cedet-utests.el |    6 ------
 1 file changed, 6 deletions(-)

diff --git a/test/manual/cedet/cedet-utests.el 
b/test/manual/cedet/cedet-utests.el
index ecfc4c3..f0c5cc6 100644
--- a/test/manual/cedet/cedet-utests.el
+++ b/test/manual/cedet/cedet-utests.el
@@ -201,12 +201,6 @@ of just logging the error."
       (error "Could not locate 'eieio/eieio-tests.el'"))
     (message "EIEIO Base tests loading from: %S" lib)
     (load-file lib)
-    )
-  (let ((lib (locate-library "eieio/eieio-test-methodinvoke.el" t)))
-    (unless lib
-      (error "Could not locate 'eieio/eieio-test-methodinvoke.el'"))
-    (message "EIEIO MethodInvoke tests loading from: %S" lib)
-    (load-file lib)
     ))
 
 (provide 'cedet-utests)



reply via email to

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