Ignore:
Timestamp:
Jul 27, 2010, 12:59:48 AM (10 years ago)
Author:
gz
Message:

Misc tweaks and fixes from trunk (r13550,r13560,r13568,r13569,r13581,r13583,r13633-13636,r13647,r13648,r13657-r13659,r13675,r13678,r13688,r13743,r13744,r13769,r13773,r13782,r13813,r13814,r13869,r13870,r13873,r13901,r13930,r13943,r13946,r13954,r13961,r13974,r13975,r13978,r13990,r14010,r14012,r14020,r14028-r14030)

Location:
branches/qres/ccl
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/qres/ccl

  • branches/qres/ccl/lib/compile-ccl.lisp

    r13528 r14049  
    550550        (setq allow-constant-redefinition t))))
    551551    (let* ((cd (current-directory))
    552            (*cerror-on-constant-redefinition* (not allow-constant-redefinition )))
     552           (*cerror-on-constant-redefinition* (not allow-constant-redefinition ))
     553           (*warn-if-redefine-kernel* nil))
    553554      (unwind-protect
    554555           (progn
     
    668669        (multiple-value-bind (status exit-code)
    669670            (external-process-status
    670              (run-program "svn" '("update" "--non-interactive") :output out :error t))
     671             (run-program *svn-program* '("update" "--non-interactive") :output out :error t))
    671672          (when verbose (format t "~&;'svn update' complete."))
    672673          (if (not (and (eq status :exited)
     
    685686              (flet ((svn-revert (string)
    686687                       (multiple-value-bind (status exit-code)
    687                            (external-process-status (run-program "svn" `("revert" ,string)))
     688                           (external-process-status (run-program *svn-program* `("revert" ,string)))
    688689                         (when (and (eq status :exited) (eql exit-code 0))
    689690                           (setq conflicts (delete string conflicts :test #'string=))
     
    750751      (when update
    751752        (cwd "ccl:tests;")
    752         (run-program "svn" '("update")))
    753       (let* ((svn (probe-file "ccl:.svn;entries"))
    754              (repo (and svn (svn-repository)))
     753        (run-program *svn-program* '("update")))
     754      (let* ((repo (svn-repository))
     755             (url (format nil "~a/trunk/tests" repo))
    755756             (s (make-string-output-stream)))
    756         (when repo
    757           (format t "~&Checking out test suite into ccl:tests;~%")
    758           (cwd "ccl:")
    759           (multiple-value-bind (status exit-code)
     757        (if (null repo)
     758          (error "Can't determine svn repository.  ccl directory is ~s"
     759                 (ccl-directory))
     760          (progn
     761            (format t "~&Using ~a to check out test suite from ~a ~
     762                       into ccl:tests;~%" *svn-program* url)
     763            (cwd "ccl:")
     764            (multiple-value-bind (status exit-code)
    760765              (external-process-status
    761                (run-program "svn" (list "checkout" (format nil "~a/trunk/tests" repo) "tests")
    762                             :output s
    763                             :error s))
    764             (unless (and (eq status :exited)
    765                          (eql exit-code 0))
    766               (error "Failed to check out test suite: ~%~a" (get-output-stream-string s)))))))
     766               (run-program *svn-program* (list "checkout" url "tests")
     767                            :output s :error s))
     768              (unless (and (eq status :exited)
     769                           (eql exit-code 0))
     770                (error "Failed to check out test suite: ~%~a"
     771                       (get-output-stream-string s))))))))
    767772    (cwd "ccl:tests;ansi-tests;")
    768773    (run-program "make" '("-k" "clean"))
     
    797802
    798803(defun test-ccl (&key force (update t) verbose (catch-errors t) (ansi t) (ccl t)
    799                       optimization-settings)
     804                      optimization-settings exit)
    800805  (with-preserved-working-directory ()
    801806    (let* ((*package* (find-package "CL-USER")))
     
    812817          (map nil #'delete-file
    813818               (directory (merge-pathnames *.fasl-pathname* "ccl:tests;ansi-tests;temp*"))))
    814         (symbol-value failed)))))
     819        (let ((failed-tests (symbol-value failed)))
     820          (when exit
     821            (quit (if failed-tests 1 0)))
     822          failed-tests)))))
     823
Note: See TracChangeset for help on using the changeset viewer.