Commit c4b67894 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Fix test-systed-asdf on Windows (hopefully).

More test cleanups: use assert-compare and assert-equal some more.
parent af1e8fcf
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@
  ;; :depends-on ((:version :asdf "2.017.18")) ; no :around-compile before that.
  :components ((:file "test")))
(load-system 'test-around-compile :force t)
(assert (= 3 (funcall 'add10 1))) ;; add10 must have been compiled in base 2
(assert-equal 3 (funcall 'add10 1)) ;; add10 must have been compiled in base 2

(fmakunbound 'add10)

@@ -21,4 +21,4 @@
                      (funcall thunk)))
  :components ((:file "test")))
(load-system 'test-around-compile-lambda :force t)
(assert (= 10 (funcall 'add10 1))) ;; add10 must have been compiled in base 16
(assert-equal 10 (funcall 'add10 1)) ;; add10 must have been compiled in base 16
+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@
  (operate 'dll-op :test-asdf/dll-test)
  (si:load-foreign-module (first (output-files 'dll-op :test-asdf/dll-test)))
  (operate 'load-op :test-asdf/dll-user)
  (assert (= (test-package::sample-function) 42))
  (assert-equal (test-package::sample-function) 42)
  (operate 'monolithic-dll-op :test-asdf/monodll)
  (si:load-foreign-module (first (output-files 'monolithic-dll-op :test-asdf/monodll)))
  (operate 'load-op :test-asdf/monodll-user)
  (assert (= (test-package::always-42) 42)))
  (assert-equal (test-package::always-42) 42))
+1 −1
Original line number Diff line number Diff line
@@ -19,4 +19,4 @@

;; forced, it should be later
(load-system 'test-force :force t)
(assert (>= (get-file-stamp file1) file1-date))
(assert-compare (>= (get-file-stamp file1) file1-date))
+4 −3
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@
(assert-pathname-equal file2.fasl (test-fasl "file2"))
(assert-pathname-equal file3.fasl (test-fasl "file3"))

(assert (and file1-date file3-date))
(assert file1-date)
(assert file3-date)

;; and loaded
(assert (asymval '#:*file1* :test-package))
@@ -27,6 +28,6 @@
(touch-file file2.fasl :timestamp (- file3-date 30))
(touch-file file3.fasl :timestamp (- file3-date 15))
(load-system 'test-module-depend)
(assert (>= (get-file-stamp file2.fasl) file3-date))
(assert-compare (>= (get-file-stamp file2.fasl) file3-date))
;; does this properly go to the second level?
(assert (>= (get-file-stamp file3.fasl) file3-date))
(assert-compare (>= (get-file-stamp file3.fasl) file3-date))
+2 −2
Original line number Diff line number Diff line
@@ -75,8 +75,8 @@
(when (loop :for (o . c) :in plan :thereis (and (eq c file3c) (typep o 'asdf:compile-op)))
  (error "Excessive operations on file3-only system.  Bad propagation of dependencies."))
(operate 'load-op 'test-module-excessive-depend)
(assert (>= (file-write-date file1) before))
(assert (>= (file-write-date file2) before))
(assert-compare (>= (file-write-date file1) before))
(assert-compare (>= (file-write-date file2) before))
(unless (= (file-write-date file3)
           file3-date)
  (error "Excessive compilation of file3.lisp:  traverse bug."))
Loading