[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)
- [Emacs-diffs] scratch/merge-cedet-tests 0a0dd27 167/316: Test typedef which has the keyword "class" included, (continued)
- [Emacs-diffs] scratch/merge-cedet-tests 0a0dd27 167/316: Test typedef which has the keyword "class" included, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 529fe15 195/316: Make unit tests use randomized file names, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 9c59d78 146/316: (ede-detect-utest): Change message formatting., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 8ba639f 150/316: (ede-detect-utest-project-list): Add jvm-base projects for ant, lein, maven, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests e805e93 223/316: semantic/bovine/c: Parse C++11 strongly typed enum, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests a78c71f 255/316: Fix documentation, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests e4db2c3 187/316: Disable auto add, do shared-library-only test, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 31d40a7 257/316: Fix EIEIO methodinvoke-utest and semantic-fmt-utest., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 4730d02 197/316: Refactor tests, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 02f847a 288/316: New tests., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests e78d9b8 201/316: Fix merge error in unit tests.,
Edward John Steere <=
- [Emacs-diffs] scratch/merge-cedet-tests e7118b0 221/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 4bf5287 199/316: Fix interactive unit tests., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests c40401d 273/316: Remove obsolete cvs-auto-updated 'X-RCS' line., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 8cb6670 304/316: Fake ver_linux for project detection purposes., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests d3a0e00 219/316: Erorr when appropriate, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests c86be27 133/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 02c7dbb 310/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests cebc72c 228/316: Make unit tests use randomized file names, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 47d9c79 295/316: Moved tests about, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests f8e3bbc 311/316: Return fully qualified types if necessary., Edward John Steere, 2017/01/27