From: David Engster <dengste@eml.cc>
Date: Sun, 22 Apr 2012 10:52:47 +0000 (+0200)
Subject: Fix merge error in unit tests.
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e78d9b879edf77ab96c195638d939342929e9453;p=emacs.git

Fix merge error in unit tests.
---

diff --git a/test/manual/cedet/cedet-utests.el b/test/manual/cedet/cedet-utests.el
index ecfc4c32e31..f0c5cc6d6f2 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)