[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] scratch/merge-cedet-tests 909e1b9 158/316: (ede-detect-ute
From: |
Edward John Steere |
Subject: |
[Emacs-diffs] scratch/merge-cedet-tests 909e1b9 158/316: (ede-detect-utest-init-dirmatch): Force the dirmatch configdatastash to be unbound to force arduino to flush any cached values. |
Date: |
Sat, 28 Jan 2017 09:09:56 +0000 (UTC) |
branch: scratch/merge-cedet-tests
commit 909e1b9ff3814607f05648f2da1b9dc3cf0e565b
Author: Eric Ludlam <address@hidden>
Commit: Edward John Steere <address@hidden>
(ede-detect-utest-init-dirmatch): Force the dirmatch configdatastash to be
unbound to force arduino to flush any cached values.
---
test/manual/cedet/cedet/ede/detect-utest.el | 87 +++++++++++++++++++--------
1 file changed, 63 insertions(+), 24 deletions(-)
diff --git a/test/manual/cedet/cedet/ede/detect-utest.el
b/test/manual/cedet/cedet/ede/detect-utest.el
index 0355785..9ad1d57 100644
--- a/test/manual/cedet/cedet/ede/detect-utest.el
+++ b/test/manual/cedet/cedet/ede/detect-utest.el
@@ -1,6 +1,6 @@
;;; ede/detect.el --- Tests for detecting different kinds of projects.
;;
-;; Copyright (C) 2014 Eric M. Ludlam
+;; Copyright (C) 2014, 2015 Eric M. Ludlam
;;
;; Author: Eric M. Ludlam <address@hidden>
;;
@@ -194,6 +194,17 @@ It is passed the root project found.")
)
"List of testing entries that do not use `diretest' feature.")
+(defvar ede-detect-utest-linux-extra-project-entries
+ (list
+ (ede-detect-entry "linux driver" :file "src/linux/drivers/block/ub.c"
+ :classp 'ede-linux-project-p)
+ (ede-detect-entry "linux" :file "src/linux/Makefile"
+ :classp 'ede-linux-project-p)
+ (ede-detect-entry "linux sub" :file "src/linux/scripts/ver_linux"
+ :classp 'ede-linux-project-p)
+ )
+ "List of testing entries that do not use `diretest' feature.")
+
(defvar ede-detect-utest-project-dirmatch-entries
(list
(ede-detect-entry "dirmatch sub"
@@ -240,9 +251,11 @@ It is passed the root project found.")
(ede-detect-utest-basedir)))
;;;###autoload
-(defun ede-detect-utest ()
- "Test out the detection scheme for EDE."
+(defun ede-detect-utest (&optional FLAG)
+ "Test out the detection scheme for EDE.
+Optional FLAG is for re-running a subset of tests with an alternate config."
(interactive)
+ (unless FLAG (setq FLAG 'none))
(save-excursion
;; Make sure the dirtest project is set-up, but without
;; loading in the project type.
@@ -261,23 +274,35 @@ It is passed the root project found.")
;; (message (eieio-object-name pc) ))
;; Start Logging
- (cedet-utest-log-setup "EDE DETECT")
+ (cond
+ ((eq FLAG 'none)
+ (cedet-utest-log-setup "EDE DETECT"))
+ ((eq FLAG 'linux)
+ (cedet-utest-log-setup "EDE LINUX EXTRA DETECT"))
+ )
(let ((errlog nil))
;; Test all the primary project types.
- (ede-detect-utest-loop ede-detect-utest-project-entries)
-
- ;; Make sure we didn't accidentally pull in the project using
- ;; the dirtest project type.
- (ede-detect-utest-validate-loadstate nil)
-
- ;; Now make sure that DIRTEST is testing properly.
- (ede-detect-utest-loop ede-detect-utest-project-dirmatch-entries)
-
- ;; Make sure we did load dirtest - though that should be obvious if prev
- ;; line worked.
- (ede-detect-utest-validate-loadstate t)
+ (cond
+ ((eq FLAG 'none)
+ (ede-detect-utest-loop ede-detect-utest-project-entries FLAG))
+ ((eq FLAG 'linux)
+ (ede-detect-utest-loop ede-detect-utest-linux-extra-project-entries
FLAG))
+ )
+
+ (when (member FLAG '(none))
+ ;; Make sure we didn't accidentally pull in the project using
+ ;; the dirtest project type.
+ (ede-detect-utest-validate-loadstate nil)
+
+ ;; Now make sure that DIRTEST is testing properly.
+ (ede-detect-utest-loop ede-detect-utest-project-dirmatch-entries FLAG)
+
+ ;; Make sure we did load dirtest - though that should be obvious if pre
+ ;; line worked.
+ (ede-detect-utest-validate-loadstate t)
+ )
;; Now lets retry the basics with INODE support turned off -- assuming
;; that our test platform supports it in the first place.
@@ -289,27 +314,41 @@ It is passed the root project found.")
(cedet-utest-log "\n-- Retry All Tests w/ INODE optimizations
disabled.")
;; ReTry all the primary project types.
- (ede-detect-utest-loop ede-detect-utest-project-entries)
+ (cond
+ ((eq FLAG 'none)
+ (ede-detect-utest-loop ede-detect-utest-project-entries FLAG))
+ ((eq FLAG 'linux)
+ (ede-detect-utest-loop
ede-detect-utest-linux-extra-project-entries FLAG))
+ )
;; Now retry that DIRTEST is testing properly.
- (ede-detect-utest-loop ede-detect-utest-project-dirmatch-entries)
+ (when (member FLAG '(none))
+ (ede-detect-utest-loop
ede-detect-utest-project-dirmatch-entries FLAG))
)
(setq ede--disable-inode nil)))
;; Close out the test suite.
+ (let ((msg (cond ((eq FLAG 'none)
+ "")
+ ((eq FLAG 'linux)
+ "LINUX "))))
(cedet-utest-log-shutdown
- "EDE DETECT"
+ (concat "EDE " msg "DETECT")
(when errlog
- (format "%s Failures found." (length errlog))))
- )))
-
+ (format "%s Failures found." (length errlog))))
+ ))))
-(defun ede-detect-utest-loop (test-entries)
+(defun ede-detect-utest-loop (test-entries FLAG)
"Test the primary EDE project types."
(save-excursion
(let ((project-linux-build-directory-default 'same)
- (project-linux-architecture-default "glnx")
+ (project-linux-architecture-default
+ (cond
+ ((eq FLAG 'none)
+ 'same)
+ ((eq FLAG 'linux)
+ "/tmp/")))
(ede-project-directories t) ; safe to load Project.ede
(basedir nil)
(baselen nil)
- [Emacs-diffs] scratch/merge-cedet-tests cd08101 179/316: Added cit uml, (continued)
- [Emacs-diffs] scratch/merge-cedet-tests cd08101 179/316: Added cit uml, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests ebff99d 215/316: Another 'using namespace' fix, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 40f1fa1 163/316: Synchronize base 'cedet' with Emacs, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 3fd7717 192/316: Synchronize cedet/srecode with Emacs., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests e805e93 223/316: semantic/bovine/c: Parse C++11 strongly typed enum, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 40b4bd4 204/316: Adedd `ede-detect-utest', Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 6bd181e 224/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 765b8f9 208/316: (cedet-utest-test-alist): Add ede-detect-linux-utest., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests bf84fd5 054/316: Move tests in cedet/semantic, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 9c59d78 146/316: (ede-detect-utest): Change message formatting., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 909e1b9 158/316: (ede-detect-utest-init-dirmatch): Force the dirmatch configdatastash to be unbound to force arduino to flush any cached values.,
Edward John Steere <=
- [Emacs-diffs] scratch/merge-cedet-tests ba748b5 174/316: Added gnustep tests, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 50cce19 183/316: Added lib dir and make-type argument, Edward John Steere, 2017/01/28
- [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, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests db5f56b 172/316: (cedet-integ-test): Post a PASSED message., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests bfed386 181/316: (cit-finish-message): Add a pause, then exit with a status of "1"., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 0ceb1ef 168/316: Integration Tests., Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests d3a0e00 219/316: Erorr when appropriate, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 529fe15 195/316: Make unit tests use randomized file names, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 9b917c5 152/316: Major test restructure, Edward John Steere, 2017/01/28
- [Emacs-diffs] scratch/merge-cedet-tests 38d59cb 207/316: Tests: Add ERT test for the C Bovinator, Edward John Steere, 2017/01/28