[Openmcl-cvs-notifications] r14029 - /trunk/source/lib/compile-ccl.lisp

[rme at clozure.com]

Author: rme
Date: Fri Jul 23 16:34:59 2010
New Revision: 14029

Log:
Tweak ensure-tests-loaded a bit to provide some debugging information.

Modified:
    trunk/source/lib/compile-ccl.lisp

Modified: trunk/source/lib/compile-ccl.lisp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/source/lib/compile-ccl.lisp (original)
+++ trunk/source/lib/compile-ccl.lisp Fri Jul 23 16:34:59 2010
@@ -751,20 +751,24 @@
       (when update
 	(cwd "ccl:tests;")
 	(run-program "svn" '("update")))
-      (let* ((svn (probe-file "ccl:.svn;entries"))
-	     (repo (and svn (svn-repository)))
+      (let* ((repo (svn-repository))
+	     (url (format nil "~a/trunk/tests" repo))
 	     (s (make-string-output-stream)))
-	(when repo
-	  (format t "~&Checking out test suite into ccl:tests;~%")
-	  (cwd "ccl:")
-	  (multiple-value-bind (status exit-code)
+	(if (null repo)
+	  (error "Can't determine svn repository.  ccl directory is ~s"
+		 (ccl-directory))
+	  (progn
+	    (format t "~&Checking out test suite from ~a into ccl:tests;~%"
+		    url)
+	    (cwd "ccl:")
+	    (multiple-value-bind (status exit-code)
 	      (external-process-status
-	       (run-program "svn" (list "checkout" (format nil "~a/trunk/tests" r=
epo) "tests")
-			    :output s
-			    :error s))
-	    (unless (and (eq status :exited)
-			 (eql exit-code 0))
-	      (error "Failed to check out test suite: ~%~a" (get-output-stream-st=
ring s)))))))
+	       (run-program "svn" (list "checkout" url "tests")
+			    :output s :error s))
+	      (unless (and (eq status :exited)
+			   (eql exit-code 0))
+		(error "Failed to check out test suite: ~%~a"
+		       (get-output-stream-string s))))))))
     (cwd "ccl:tests;ansi-tests;")
     (run-program "make" '("-k" "clean"))
     (map nil 'delete-file (directory "*.*fsl"))