[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/merge-cedet-tests e4db2c3 187/316: Disable auto ad
From: |
Edward John Steere |
Subject: |
[Emacs-diffs] scratch/merge-cedet-tests e4db2c3 187/316: Disable auto add, do shared-library-only test |
Date: |
Sat, 28 Jan 2017 09:10:00 +0000 (UTC) |
branch: scratch/merge-cedet-tests
commit e4db2c3802702e51d6ff6519a5bdc7d5a98ce20f
Author: zappo <address@hidden>
Commit: Edward John Steere <address@hidden>
Disable auto add, do shared-library-only test
for automake and show output
* test/manual/cedet/cedet-integ-test.el (cit-symref): New require.
(cedet-integ-test-proj): Disable auto add. Only do shared library
test with automake. (cit-run-target): Don't kill the buffer, wait
and show program output instead.
---
test/manual/cedet/cedet-integ-test.el | 110 +++++++++++++++++++--------------
1 file changed, 63 insertions(+), 47 deletions(-)
diff --git a/test/manual/cedet/cedet-integ-test.el
b/test/manual/cedet/cedet-integ-test.el
index 66e5cac..b763347 100644
--- a/test/manual/cedet/cedet-integ-test.el
+++ b/test/manual/cedet/cedet-integ-test.el
@@ -74,8 +74,14 @@
;; b Generate C++ code from the graph.
;; c Compile the sources.
;;
-;; @TODO -
-;; 6) Create a distribution file.
+;; 6) Symref
+;; a Attempt to use symref to create a results list.
+;; b open/close entries in symref
+;; c Use 'rename' command to rename and rebuild.
+;; d See if GNU Global is installed
+;; e repeat above.
+;;
+;; 7) Create a distribution file.
;; a Call "make dist"
;; b update the version number
;; c make a new dist. Verify version number.
@@ -94,6 +100,7 @@
)
(require 'cit-cpp)
+(require 'cit-symref)
(require 'cit-uml)
(require 'cit-srec)
(require 'cit-el)
@@ -124,49 +131,57 @@ Optional argument MAKE-TYPE is the style of EDE project
to test."
(error "Invalid make-type for test: %S" make-type))
(message "Running integration test of style %S" make-type)
- ;; 1 a) build directories
- ;;
- (cit-make-dir cedet-integ-base)
- (cit-make-dir cedet-integ-target)
- ;; 1 c) make src and include directories
- (cit-make-dir (cit-file "src"))
- (cit-make-dir (cit-file "lib"))
- (cit-make-dir (cit-file "include"))
- (cit-make-dir (cit-file "uml"))
- ;;
- ;; 1 b) make a toplevel project
- ;;
- (find-file (expand-file-name "README" cedet-integ-target))
- (ede-new make-type "CEDET_Integ_Test_Project")
- ;; 1 d) Put C++ src into the right directories.
- ;; 2 a) Create sources with SRecode
- ;;
- (cit-srecode-fill-cpp make-type)
-
- ;; 5 a,b,c) UML code generation test
- (cit-fill-uml make-type)
-
- ;; 1 e) remove files from a project
- (cit-remove-add-to-project-cpp)
-
- ;; 1 f) remove files from a project
- (cit-remove-and-do-shared-lib make-type)
-
- ;; 2 e) srecode map manipulation
- (cit-srecode-map-test)
-
- ;; Do some more with Emacs Lisp.
- (cit-srecode-fill-el make-type)
-
- ;; Do some texinfo documentation.
- (cit-srecode-fill-texi)
-
- ;; Create a distribution
- (find-file (expand-file-name "README" cedet-integ-target))
- (cit-make-dist)
-
- (cit-finish-message "PASSED" make-type)
- )
+ ;; Setup EDE to be turned on.
+ (let ((ede-auto-add-method 'never))
+ (global-ede-mode 1)
+
+ ;; 1 a) build directories
+ ;;
+ (cit-make-dir cedet-integ-base)
+ (cit-make-dir cedet-integ-target)
+ ;; 1 c) make src and include directories
+ (cit-make-dir (cit-file "src"))
+ (cit-make-dir (cit-file "lib"))
+ (cit-make-dir (cit-file "include"))
+ (cit-make-dir (cit-file "uml"))
+ ;;
+ ;; 1 b) make a toplevel project
+ ;;
+ (find-file (expand-file-name "README" cedet-integ-target))
+ (ede-new make-type "CEDET_Integ_Test_Project")
+ ;; 1 d) Put C++ src into the right directories.
+ ;; 2 a) Create sources with SRecode
+ ;;
+ (cit-srecode-fill-cpp make-type)
+
+ ;; 5 a,b,c) UML code generation test
+ (cit-fill-uml make-type)
+
+ ;; 1 e) remove files from a project
+ (cit-remove-add-to-project-cpp)
+
+ ;; 1 f) remove files from a project
+ (when (string= make-type "Automake") ;; Only works w/ Automake
+ (cit-remove-and-do-shared-lib make-type))
+
+ ;; 6) Test symref/refactoring tools
+ (cit-symref)
+
+ ;; 2 e) srecode map manipulation
+ (cit-srecode-map-test)
+
+ ;; Do some more with Emacs Lisp.
+ (cit-srecode-fill-el make-type)
+
+ ;; Do some texinfo documentation.
+ (cit-srecode-fill-texi)
+
+ ;; Create a distribution
+ (find-file (expand-file-name "README" cedet-integ-target))
+ (cit-make-dist)
+
+ (cit-finish-message "PASSED" make-type)
+ ))
(defun cedet-integ-test-GNUStep ()
"Run the CEDET integration test using GNUStep style project."
@@ -376,8 +391,9 @@ Use COMMAND to run the program."
(setq cnt (1+ cnt))
(when (> cnt 10) (error "Program output not detected"))
(sit-for .1))
- ;; Kill the buffer.
- (kill-buffer (ede-shell-buffer target)))
+ ;; Show program output
+ (sit-for .2)
+ )
)))
(provide 'cedet-integ-test)
- [Emacs-diffs] scratch/merge-cedet-tests 24be9ac 184/316: Insert tag's code if it's there, (continued)
- [Emacs-diffs] scratch/merge-cedet-tests 24be9ac 184/316: Insert tag's code if it's there, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 9ec7a1b 161/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests a40bc3f 191/316: (Cit-Android): New Require. (Cedet-Integ-Test-Gnustep): Fix Typo. (Cedet-Integ-Test-Android): New Build Type Support For Android. (Cit-Make-Dir): Allow Making Trees Of Directories. (Cit-Compile-And-Wait): Only Regenerate The Project If That Project Type Can Be Regenerated. (Cit-Compile-And-Wait-Using-Ede-Command): New Way To Build That Uses Ede Commands Instead Of Hard-Coded Make Commands., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 6bbf499 171/316: (cit-srec): New require (cedet-integ-test): Call srec test., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 558874e 169/316: Update comments, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests ede9f83 214/316: Simplify alias referencing and add tests., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 1d09e4c 217/316: C++: Deal with 'using' statements when calculating scope, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests e267436 232/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 29a5165 216/316: C/C++: Parse 'using' statements in the correct order., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests e7118b0 221/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests e4db2c3 187/316: Disable auto add, do shared-library-only test,
Edward John Steere <=
- [Emacs-diffs] scratch/merge-cedet-tests cd9aeb4 258/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 39f1464 235/316: (cit-srecode-fill-cpp): Fixed misspelling of target name., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests aa72e43 200/316: Fix unit testing for several tests and do better error checking., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 658ff90 205/316: (cedet-utest): Add EDE sanity check to the end., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 02f847a 288/316: New tests., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests ad45c79 263/316: Remove obsolete cvs-auto-updated 'X-RCS' line., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 9e6abad 241/316: Run the code for the compiled binary, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 5a2a1da 293/316: (priority): Set to a low number. (cit-project-template): New template., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 7f7d6bf 229/316: Synchronize cedet/srecode with Emacs., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 66c8eb7 256/316: Remove useless generated skeleton and old NEWS, Edward John Steere, 2017/01/28