Commit 99fa8ff0 authored by Robert Goldman's avatar Robert Goldman
Browse files

Merge branch 'mark-abcl-expected-failure' into 'master'

Mark xfails on ABCL.

See merge request !191
parents 2659305d 422c0040
Pipeline #4538 passed with stage
......@@ -76,19 +76,11 @@ Regression test:
extends: .Regression test template
parallel:
matrix:
- l: [ccl, clasp, clisp, cmucl, ecl, sbcl]
- l: [abcl, ccl, clasp, clisp, cmucl, ecl, sbcl]
IMAGE_TAG: latest
- l: abcl
IMAGE_TAG: 1.7.1-jdk8
Regression test expected failure:
extends: .Regression test template
parallel:
matrix:
- l: [abcl]
IMAGE_TAG: latest
allow_failure: true
###############################################################################
# Upgrade tests
###############################################################################
......
......@@ -21,4 +21,6 @@
(funcall thunk)))
:components ((:file "test")))
(load-system 'test-around-compile-lambda :force t)
(assert-equal 10 (funcall 'add10 1)) ;; add10 must have been compiled in base 16
(with-expected-failure (#+abcl (and (uiop:version= (lisp-implementation-version) "1.8.0")
"ABCL version 1.8.0"))
(assert-equal 10 (funcall 'add10 1))) ;; add10 must have been compiled in base 16
......@@ -522,11 +522,18 @@
(define-test
"basic functionality"
(let* ((process-info (launch-program "./sleeper.sh 12 1"))
(pid (process-info-pid process-info)))
(handle-result "obtainable and plausible?"
(and (numberp pid) (plusp pid)))
(wait-process process-info)))
(with-expected-failure (#+abcl
(or
(and (eq (uiop:operating-system) :linux)
(uiop:version= (lisp-implementation-version) "1.8.0"))
(not (eq (uiop:operating-system) :linux))))
(let* ((process-info (launch-program "./sleeper.sh 12 1"))
(pid (process-info-pid process-info)))
(handle-result "obtainable and plausible?"
(and (numberp pid) (plusp pid)))
(wait-process process-info))))
(new-test-suite "wait-process")
......
......@@ -3,7 +3,7 @@
(:use :uiop/common-lisp :uiop/package :uiop/utility)
(:export
#:*uiop-version*
#:parse-version #:unparse-version #:version< #:version<= ;; version support, moved from uiop/utility
#:parse-version #:unparse-version #:version< #:version<= #:version= ;; version support, moved from uiop/utility
#:next-version
#:deprecated-function-condition #:deprecated-function-name ;; deprecation control
#:deprecated-function-style-warning #:deprecated-function-warning
......@@ -63,6 +63,12 @@ and return it as a string."
"Given two version strings, return T if the second is newer or the same"
(not (version< version2 version1))))
(defun version= (version1 version2)
"Given two version strings, return T if the first is newer or the same and
the second is also newer or the same."
(and (version<= version1 version2)
(version<= version2 version1)))
(with-upgradability ()
(define-condition deprecated-function-condition (condition)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment