Commit d0e33584 authored by Philipp Marek's avatar Philipp Marek
Browse files

Merge branch 'iss29' into 'master' 

fix some tests

See merge request alexandria/alexandria!27
parents bc127deb 3b08f063

.gitlab-ci.yml

+2 −3
Original line number Diff line number Diff line
@@ -9,9 +9,8 @@ variables: 
  CLCI_INSTALL_QUICKLISP_CLIENT: "yes"

  # Off by default because it's proprietary and has a separate license.

  CLCI_TEST_ALLEGRO: "yes"

  # Off by default because the Docker image is a bit out of date, due to

  # upstream churn.

  CLCI_TEST_CLASP: "yes"

  # Off by default because the Docker image is broken

  CLCI_TEST_CLASP: "no"

  # Alexandria is a non-commercial project, so we can use the express version

  # of Allegro for testing.

  I_AGREE_TO_ALLEGRO_EXPRESS_LICENSE: "yes"

alexandria-1/tests.lisp

+7 −7
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ 
            (eql-copy (copy-hash-table orig :test 'eql))

            (equal-copy (copy-hash-table orig :test 'equal))

            (equalp-copy (copy-hash-table orig :test 'equalp)))

        (list (eql (hash-table-size eq-copy) (hash-table-size orig))

        (list #-allegro (eql (hash-table-size eq-copy) (hash-table-size orig))

              (eql (hash-table-rehash-size eq-copy)

                   (hash-table-rehash-size orig))

              (hash-table-count eql-copy)
@@ -293,7 +293,7 @@ 
              (gethash (copy-seq foo) equal-copy)

              (gethash "FOO" equal-copy)

              (gethash "FOO" equalp-copy))))

  (t t 2 t nil t t nil t))

  (#-allegro t t 2 t nil t t nil t))



(deftest copy-hash-table.2

    (let ((ht (make-hash-table))
@@ -1604,9 +1604,9 @@ 
    (handler-case

        (let ((stream (make-broadcast-stream)))

          (read-stream-content-into-byte-vector stream :initial-size 0))

      (type-error ()

        :type-error))

  :type-error)

      (error ()

        :error))

  :error)



;;;; Macros
@@ -1783,14 +1783,14 @@ 
  t

  t)



#-allegro

(deftest type=.3

    (type= 'null '(and symbol list))

  t

  t)



(deftest type=.4

    (type= 'string '(satisfies emptyp))

  nil

    (nth-value 0 (type= 'string '(satisfies emptyp)))

  nil)



(deftest type=.5

alexandria-1/types.lisp

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ of TYPE." 


(declaim (inline type=))

(defun type= (type1 type2)

  "Returns a primary value of T is TYPE1 and TYPE2 are the same type,

  "Returns a primary value of T if TYPE1 and TYPE2 are the same type,

and a secondary value that is true is the type equality could be reliably

determined: primary value of NIL and secondary value of T indicates that the

types are not equivalent."