[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/merge-cedet-tests 0927d4a 180/316: (cedet-integ-te
From: |
Edward John Steere |
Subject: |
[Emacs-diffs] scratch/merge-cedet-tests 0927d4a 180/316: (cedet-integ-test-Make, cedet-integ-test-Automake, cedet-integ-test-GNUStep): New (cedet-integ-test-proj): Take a make-type argumemt. Misc tests needed on new argument. Change how ede creates projects based on make-type. Remove spaces from the project name. (cit-finish-message): Ending message now includes the make type. |
Date: |
Fri, 27 Jan 2017 20:03:38 +0000 (UTC) |
branch: scratch/merge-cedet-tests
commit 0927d4a2b91c0f6689e070a0f74aebf65c579569
Author: zappo <address@hidden>
Commit: Edward John Steere <address@hidden>
(cedet-integ-test-Make,cedet-integ-test-Automake,cedet-integ-test-GNUStep):
New (cedet-integ-test-proj): Take a make-type argumemt. Misc tests needed on
new argument. Change how ede creates projects based on make-type. Remove spaces
from the project name. (cit-finish-message): Ending message now includes the
make type.
---
test/manual/cedet/cedet-integ-test.el | 48 ++++++++++++++++++++++++++-------
1 file changed, 38 insertions(+), 10 deletions(-)
diff --git a/test/manual/cedet/cedet-integ-test.el
b/test/manual/cedet/cedet-integ-test.el
index b9a3385..e8330cc 100644
--- a/test/manual/cedet/cedet-integ-test.el
+++ b/test/manual/cedet/cedet-integ-test.el
@@ -91,9 +91,25 @@
"Root of the EDE project integration tests.")
;;; Code:
-(defun cedet-integ-test ()
- "Run the full CEDET integration test."
+(defun cedet-integ-test-Make ()
+ "Run the full CEDET integration test using a Make style project."
+ (cedet-integ-test-proj "Make"))
+
+(defun cedet-integ-test-Automake ()
+ "Run the full CEDET integration test using a Automake style project."
+ (let ((ede-pconf-create-file-query nil))
+ (cedet-integ-test-proj "Automake")))
+
+(defun cedet-integ-test-proj (&optional make-type)
+ "Run the full CEDET integration test.
+Optional argument MAKE-TYPE is the style of EDE project to test."
(interactive)
+
+ ;; Input check
+ (if (not (member make-type '("Make" "Automake")))
+ (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)
@@ -106,14 +122,14 @@
;; 1 b) make a toplevel project
;;
(find-file (expand-file-name "README" cedet-integ-target))
- (ede-new "Make" "CEDET Integ Test Project")
+ (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)
+ (cit-srecode-fill-cpp make-type)
;; 5 a,b,c) UML code generation test
- (cit-fill-uml)
+ (cit-fill-uml make-type)
;; 1 e) remove files from a project
(cit-remove-add-to-project-cpp)
@@ -122,24 +138,36 @@
(cit-srecode-map-test)
;; Do some more with Emacs Lisp.
- (cit-srecode-fill-el)
+ (cit-srecode-fill-el make-type)
;; Do some texinfo documentation.
(cit-srecode-fill-texi)
+ (cit-finish-message "PASSED" make-type)
+ )
+
+(defun cedet-integ-test-GNUStep ()
+ "Run the CEDET integration test using GNUStep style project."
+ (interactive)
+
;; Do a EDE GNUstep-Make Project
(make-directory (concat cedet-integ-target "_ede_GSMake") t)
(find-file (expand-file-name "README" (concat cedet-integ-target
"_ede_GSMake"))) ;; only to change dir
(let ((ede-auto-add-method 'always))
(cit-ede-step-test))
- ;; Leave a message
+ (cit-finish-message "PASSED" "GNUStep")
+ )
+
+(defun cit-finish-message (message style)
+ "Display a MESSAGE that some test is now finished.
+Argument STYLE is the type of build done."
(let ((b (set-buffer (get-buffer-create "*PASSED*"))))
(erase-buffer)
- (insert "\n\n PASSED!\n")
+ (insert "\n\n PASSED!\n\n Make Style: ")
+ (insert (format "%S" style) "\n")
(switch-to-buffer b)
- )
- )
+ ))
(defun cit-make-dir (dir)
"Make directory DIR if it doesn't exist."
- [Emacs-diffs] scratch/merge-cedet-tests f91e2ce 114/316: New pretend system include for cpproot test., (continued)
- [Emacs-diffs] scratch/merge-cedet-tests f91e2ce 114/316: New pretend system include for cpproot test., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 3a7b458 110/316: Fixes for security tests, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 302b4d7 107/316: eieio: Move to obsolete and use the one that ships with Emacs, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 0e41dab 116/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 309ef34 124/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 800b575 081/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 702d44d 139/316: Fix how the target file name is created, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 8d32d3a 160/316: Fix parsing of default values and display them in default formatter, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests a4e395c 156/316: Add a final call to ede list sanity check, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 9ec7a1b 161/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 0927d4a 180/316: (cedet-integ-test-Make, cedet-integ-test-Automake, cedet-integ-test-GNUStep): New (cedet-integ-test-proj): Take a make-type argumemt. Misc tests needed on new argument. Change how ede creates projects based on make-type. Remove spaces from the project name. (cit-finish-message): Ending message now includes the make type.,
Edward John Steere <=
- [Emacs-diffs] scratch/merge-cedet-tests b804ecf 166/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests a4202a0 188/316: Call external db testing suite, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 3800edd 194/316: Fix provide. (cedet-uutil, srecode/semantic): New requires., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests a7281aa 202/316: Fix EIEIO methodinvoke-utest and semantic-fmt-utest., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 2c1d730 190/316: Ignore Members On Extra Tags, Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 0ceb1ef 168/316: Integration Tests., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 816e083 151/316: (ede-detect-utest-project-list): Add test for generic VC type project. (ede-detect-utest): Add fake autoloader for VC. (ede-detect-utest-generic-vc-p): New., Edward John Steere, 2017/01/27
- [Emacs-diffs] scratch/merge-cedet-tests 323ca78 196/316: New test file for unions., Edward John Steere, 2017/01/27
- [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/27
- [Emacs-diffs] scratch/merge-cedet-tests e267436 232/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/27