Closes #151: Add CCL to Travis CI

* sly-tests.el (compile-defun): Test split into two parts.
(compile-defun-with-reader-characters): Split from `compile-defun'
as CCL does not pass this part.
* .travis.yml: added targets to include CCL 1.9 for Travis builds
* contrib/test/sly-autodoc-tests.el: Mark several tests as failing for
CCL 1.9

(cherry picked from SLIME commit
0e3508a5)

Conflicts:
	.travis.yml
	ChangeLog
	contrib/ChangeLog
	sly-tests.el

.travis.yml

@@ -4,8 +4,10 @@ env:
   # for emacs24, use more combinations
   - "CHECK_TARGET=check       LISP=sbcl  EMACS=emacs24"
   - "CHECK_TARGET=check       LISP=cmucl EMACS=emacs24"
+  - "CHECK_TARGET=check       LISP=ccl   EMACS=emacs24"
   - "CHECK_TARGET=check-fancy LISP=sbcl  EMACS=emacs24"
   - "CHECK_TARGET=check-fancy LISP=cmucl EMACS=emacs24"
+  - "CHECK_TARGET=check-fancy LISP=ccl   EMACS=emacs24"
 
   # also, for emacs24/sbcl test some more contribs in isolation
   - "CHECK_TARGET=check-repl LISP=sbcl EMACS=emacs24"

contrib/test/sly-autodoc-tests.el

@@ -102,7 +102,7 @@
   ;; Test &optional
   ("(swank::symbol-status foo *HERE*"
    "(symbol-status symbol &optional\
- ===> (package (symbol-package symbol)) <===)" :fails-for ("allegro"))
+ ===> (package (symbol-package symbol)) <===)" :fails-for ("allegro" "ccl"))
 
   ;; Test context-sensitive autodoc (DEFMETHOD)
   ("(defmethod swank::arglist-dispatch (*HERE*"
@@ -116,40 +116,40 @@
   ("(apply 'swank::eval-for-emacs*HERE*"
    "(apply 'eval-for-emacs &optional form buffer-package id &rest args)")
   ("(apply #'swank::eval-for-emacs*HERE*"
-   "(apply #'eval-for-emacs &optional form buffer-package id &rest args)")
+   "(apply #'eval-for-emacs &optional form buffer-package id &rest args)" :fails-for ("ccl"))
   ("(apply 'swank::eval-for-emacs foo *HERE*"
    "(apply 'eval-for-emacs &optional form\
  ===> buffer-package <=== id &rest args)")
   ("(apply #'swank::eval-for-emacs foo *HERE*"
    "(apply #'eval-for-emacs &optional form\
- ===> buffer-package <=== id &rest args)")
+ ===> buffer-package <=== id &rest args)" :fails-for ("ccl"))
 
   ;; Test context-sensitive autodoc (ERROR, CERROR)
   ("(error 'simple-condition*HERE*"
    "(error 'simple-condition &rest arguments\
- &key format-arguments format-control)")
+ &key format-arguments format-control)" :fails-for ("ccl"))
   ("(cerror \"Foo\" 'simple-condition*HERE*"
    "(cerror \"Foo\" 'simple-condition\
  &rest arguments &key format-arguments format-control)"
-   :fails-for ("allegro"))
+   :fails-for ("allegro" "ccl"))
 
   ;; Test &KEY and nested arglists
   ("(swank::with-retry-restart (:msg *HERE*"
    "(with-retry-restart (&key ===> (msg \"Retry.\") <===) &body body)"
-   :fails-for ("allegro"))
+   :fails-for ("allegro" "ccl"))
   ("(swank::with-retry-restart (:msg *HERE*(foo"
    "(with-retry-restart (&key ===> (msg \"Retry.\") <===) &body body)"
    :skip-trailing-test-p t
-   :fails-for ("allegro"))
+   :fails-for ("allegro" "ccl"))
   ("(swank::start-server \"/tmp/foo\" :dont-close *HERE*"
    "(start-server port-file &key (style swank:*communication-style*)\
  ===> (dont-close swank:*dont-close*) <===)"
-   :fails-for ("allegro"))
+   :fails-for ("allegro" "ccl"))
 
   ;; Test declarations and type specifiers
   ("(declare (string *HERE*"
    "(declare (string &rest ===> variables <===))"
-   :fails-for ("allegro"))
+   :fails-for ("allegro") :fails-for ("ccl"))
   ("(declare ((string *HERE*"
    "(declare ((string &optional ===> size <===) &rest variables))")
   ("(declare (type (string *HERE*"
@@ -161,6 +161,6 @@
   ("(labels ((foo (x y) (+ x y))) (foo *HERE*" "(foo ===> x <=== y)")
   ("(labels ((foo (x y) (+ x y))
                  (bar (y) (foo *HERE*"
-   "(foo ===> x <=== y)" :fails-for ("cmucl" "sbcl" "allegro")))
+   "(foo ===> x <=== y)" :fails-for ("cmucl" "sbcl" "allegro" "ccl")))
 
 (provide 'sly-autodoc-tests)

sly-tests.el

@@ -549,8 +549,7 @@ string buffer position filename policy)")
                        (lambda (pattern arglist)
                          (and arglist (string-match pattern arglist))))))
 
-(def-sly-test (compile-defun (:fails-for "allegro" "lispworks" "clisp"
-                                           "ccl"))
+(def-sly-test (compile-defun (:fails-for "allegro" "lispworks" "clisp"))
     (program subform)
     "Compile PROGRAM containing errors.
 Confirm that SUBFORM is correctly located."
@@ -582,12 +581,32 @@ Confirm that SUBFORM is correctly located."
            (cl-user::bar))
 
         "
-       (cl-user::bar))
-      ("(defun foo ()
+       (cl-user::bar)))
+  (slime-check-top-level)
+  (with-temp-buffer
+    (lisp-mode)
+    (insert program)
+    (let ((font-lock-verbose nil))
+      (setq slime-buffer-package ":swank")
+      (slime-compile-string (buffer-string) 1)
+      (setq slime-buffer-package ":cl-user")
+      (slime-sync-to-top-level 5)
+      (goto-char (point-max))
+      (slime-previous-note)
+      (slime-check error-location-correct
+        (equal (read (current-buffer)) subform))))
+  (slime-check-top-level))
+
+;; This test ideally would be collapsed into the previous
+;; compile-defun test, but only 1 case fails for ccl--and that's here
+(def-slime-test (compile-defun-with-reader-characters (:fails-for "allegro" "lispworks" "clisp" "ccl"))
+    (program subform)
+    "Compile PROGRAM containing errors.
+Confirm that SUBFORM is correctly located."
+    '(("(defun foo ()
           #+#.'(:and) (/ 1 0))"
-       (/ 1 0))
-      )
-  (sly-check-top-level)
+       (/ 1 0)))
+  (slime-check-top-level)
   (with-temp-buffer
     (lisp-mode)
     (insert program)
@@ -996,7 +1015,7 @@ the buffer's undo-list."
                           0.5))
   (sly-sync-to-top-level 1))
 
-(def-sly-test (break2 (:fails-for "cmucl" "allegro" "ccl"))
+(def-sly-test (break2 (:fails-for "cmucl" "allegro"))
     (times exp)
     "Backends should arguably make sure that BREAK does not depend
 on *DEBUGGER-HOOK*."