emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] scratch/merge-cedet-tests 7661178 186/316: Improve compila


From: Edward John Steere
Subject: [Emacs-diffs] scratch/merge-cedet-tests 7661178 186/316: Improve compilation error checking
Date: Sat, 28 Jan 2017 09:10:00 +0000 (UTC)

branch: scratch/merge-cedet-tests
commit 7661178135c78a554a634f4879e533a202b564f9
Author: zappo <address@hidden>
Commit: Edward John Steere <address@hidden>

    Improve compilation error checking
    
    * test/manual/cedet/cedet-integ-test.el (cit-compile-and-wait): Pull
     out error checking. Add support for stripping erroneous
     events. (cit-check-compilation-for-error): New, from above.
---
 test/manual/cedet/cedet-integ-test.el |   26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/test/manual/cedet/cedet-integ-test.el 
b/test/manual/cedet/cedet-integ-test.el
index e62ae74..66e5cac 100644
--- a/test/manual/cedet/cedet-integ-test.el
+++ b/test/manual/cedet/cedet-integ-test.el
@@ -1,6 +1,6 @@
 ;;; cedet-integ-test.el --- CEDET full integration tests.
 
-;; Copyright (C) 2008, 2009 Eric M. Ludlam
+;; Copyright (C) 2008, 2009, 2010 Eric M. Ludlam
 
 ;; Author: Eric M. Ludlam <address@hidden>
 
@@ -328,26 +328,36 @@ such as 'clean'."
     (compile (concat ede-make-command (or ARGS "")))
 
     (cit-wait-for-compilation)
+    (cit-check-compilation-for-error)
 
     (kill-buffer bufftokill)
     ))
 
 (defun cit-wait-for-compilation ()
   "Wait for a compilation to finish."
-
   (while compilation-in-progress
     (accept-process-output)
-    (sit-for 1))
+    ;; If sit for indicates that input is waiting, then
+    ;; read and discard whatever it is that is going on.
+    (when (not (sit-for 1))
+      (read-event nil nil .1)
+      ))
+  )
 
+(defun cit-check-compilation-for-error (&optional inverse)
+  "Error if the compilation buffer has errors in it.
+If optional INVERSE is non-nil, then throw an error if the
+compilation succeeded."
   (save-excursion
     (set-buffer "*compilation*")
     (goto-char (point-max))
 
-    (when (re-search-backward " Error " nil t)
-      (error "Compilation failed!"))
-
-    )
-  )
+    (if (re-search-backward "Compilation exited abnormally " nil t)
+       (when (not inverse)
+         (error "Compilation failed!"))
+      (when inverse
+       (error "Compilation succeeded erroneously!"))
+      )))
 
 (defun cit-run-target (command)
   "Run the program (or whatever) that is associated w/ the current target.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]