[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/merge-cedet-tests af4eb43 149/316: Additions to ge
From: |
Edward John Steere |
Subject: |
[Emacs-diffs] scratch/merge-cedet-tests af4eb43 149/316: Additions to generic project testing |
Date: |
Sat, 28 Jan 2017 09:09:55 +0000 (UTC) |
branch: scratch/merge-cedet-tests
commit af4eb4385dd32cb97a31703c5993c69726062195
Author: Eric Ludlam <address@hidden>
Commit: Edward John Steere <address@hidden>
Additions to generic project testing
* test/manual/cedet/cedet/ede/detect-utest.el:
(ede-detect-utest-project-list): Add 3 generic project detection
tests. (ede-detect-utest): Enable generic project types.
(ede-detect-utest-generic-p): New predicate.
---
test/manual/cedet/cedet/ede/detect-utest.el | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/test/manual/cedet/cedet/ede/detect-utest.el
b/test/manual/cedet/cedet/ede/detect-utest.el
index 588adc8..7dfa949 100644
--- a/test/manual/cedet/cedet/ede/detect-utest.el
+++ b/test/manual/cedet/cedet/ede/detect-utest.el
@@ -34,6 +34,10 @@
;( "src/ant/build.xml" . ede-ant-project-p )
( "src/linux/Makefile" . ede-linux-project-p )
( "src/linux/scripts/ver_linux" . ede-linux-project-p )
+ ;; Generic project types just key of Makefile, SCons, etc.
+ ( "src/generic/gen_make/sub/test.cpp" . ede-detect-utest-generic-p )
+ ( "src/generic/gen_scons/sub/test.cpp" . ede-detect-utest-generic-p )
+ ( "src/generic/gen_cmake/sub/test.cpp" . ede-detect-utest-generic-p )
;; these ROOT projects are created by hand in a .emacs file.
;; These need to be defined in here to get this test to work.
( "src/cpproot/src/main.cpp" . ede-cpp-root-project-p )
@@ -81,6 +85,10 @@ Each entry is a cons cell:
;; loading in the project type.
(ede-detect-utest-init-dirmatch)
+ ;; Enable the generic EDE project types so we can test them.
+ (ede-enable-generic-projects)
+
+ ;; Start Logging
(cedet-utest-log-setup "EDE DETECT")
(let ((errlog nil))
@@ -233,6 +241,18 @@ Each entry is a cons cell:
(not (eq project (ede-current-project)))
))
+(defun ede-detect-utest-generic-p (project)
+ "Special predicate for testing that a generic project was loaded."
+ (and (ede-generic-project-child-p project)
+ ;; This part also validates that generic projects can load in their
+ ;; configuration, and that we get the correct value from that
configuration.
+ (let ((config (oref project config)))
+ (and config
+ (oref config c-preprocessor-table)
+ (string= "TEST" (car (car (oref config c-preprocessor-table))))
+ ))
+ ))
+
;;; TEST PROJECT
;;
;; This project exists to test dirmatch.
@@ -278,7 +298,8 @@ Each entry is a cons cell:
ede-project-class-files))
(adm (oref arduinoauto proj-root-dirmatch)))
;; Splice the new tmp pref file into the system.
- (oset adm :fromconfig ede-arduino-preferences-file))
+ (oset adm :fromconfig ede-arduino-preferences-file)
+ )
)
- [Emacs-diffs] scratch/merge-cedet-tests cc6e417 123/316: Improve test utilities re complation and deletion, (continued)
- [Emacs-diffs] scratch/merge-cedet-tests cc6e417 123/316: Improve test utilities re complation and deletion, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests c86be27 133/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 216e4f4 129/316: Synchronize cedet/semantic with Emacs., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 377e041 142/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 702d44d 139/316: Fix how the target file name is created, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 7b417f2 131/316: Tests contributed by Barry OReilly, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests a3da4e8 121/316: Added new file to test completion on STL classes and namespace., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 309ef34 124/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests ae78cf0 140/316: Tests: Add ERT test for the C Bovinator, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 39048f9 153/316: (ede-detect-utest): Re-run tests with inode optimization disabled., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests af4eb43 149/316: Additions to generic project testing,
Edward John Steere <=
- [Emacs-diffs] scratch/merge-cedet-tests 614a6bb 044/316: Synchronize base 'cedet/ede' with Emacs, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests a375d40 093/316: ("cit"): Give it a new name. (Misc): New target., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests b0da906 144/316: New unit test for EDE project detection., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 9c2d002 145/316: Added cpproot and java root to detection tests, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 47c4081 165/316: sample lib srces for dirmatch tests., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests ef840da 159/316: compdb: add project detection tests, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 8c4e7fd 111/316: Added arduino and better suggestions, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 6945c33 126/316: Expand preprocessor to handle macros which open or close scope., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 89526ab 134/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 0e41dab 116/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/28