X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-introspect%2Fxref-test.lisp;h=dd3b33835f8677dc580335d86ede06a3c6b9ed18;hb=d351f80b1076dd54e5aee3dacab82d59c2e58060;hp=e1970900e985d2032e4a28c1d622fb227d5022b2;hpb=8b1ad2754eff900f83ca41a0ab853d79fc662854;p=sbcl.git

diff --git a/contrib/sb-introspect/xref-test.lisp b/contrib/sb-introspect/xref-test.lisp
index e197090..dd3b338 100644
--- a/contrib/sb-introspect/xref-test.lisp
+++ b/contrib/sb-introspect/xref-test.lisp
@@ -1,46 +1,51 @@
-(defpackage :sb-introspect-test/xref
-  (:use "SB-INTROSPECT" "CL"))
+;;;; This software is part of the SBCL system. See the README file for
+;;;; more information.
+;;;;
+;;;; This software is derived from the CMU CL system, which was
+;;;; written at Carnegie Mellon University and released into the
+;;;; public domain. The software is in the public domain and is
+;;;; provided with absolutely no warranty. See the COPYING and CREDITS
+;;;; files for more information.
 
 (in-package :sb-introspect-test/xref)
 
-(load (compile-file (merge-pathnames "xref-test-data.lisp" *load-pathname*)))
-
-(labels ((natural< (a b)
-           (string< (princ-to-string a) (princ-to-string b))))
-  (let ((tests '(((sb-introspect::who-calls 'foo) ())
-                 ((sb-introspect::who-calls 'bar) (xref/1 xref/3))
-                 ((sb-introspect::who-calls 'xref/1) (xref/2))
-                 ((sb-introspect::who-calls 'xref/2)
-                  (xref/5 xref/6 xref/8 xref/8 xref/12
-                   (sb-pcl::fast-method xref/10
-                                        (t t t t t t t t fixnum))
-                   (sb-pcl::fast-method xref/11 (fixnum))))
-                 ((sb-introspect::who-calls 'xref/3)
-                  (inline/1 (sb-pcl::fast-method xref/11 (float))))
-                 ((sb-introspect::who-calls 'xref/4) ())
-                 ((sb-introspect::who-calls 'xref/5) ())
-                 ((sb-introspect::who-calls 'xref/6) (xref/7))
-                 ((sb-introspect::who-calls 'xref/7) ())
-                 ((sb-introspect::who-calls 'xref/8) ())
-                 ((sb-introspect::who-calls 'xref/10) ())
-                 ((sb-introspect::who-calls 'xref/11) ())
-                 ((sb-introspect::who-calls 'inline/1) (xref/12))
-                 ((sb-introspect::who-calls 'xref/12) (macro/1))
-                 ((sb-introspect::who-macroexpands 'macro/1)
-                  (macro-use/1 macro-use/2 macro-use/3 macro-use/4 inline/2))
-                 ((sb-introspect::who-binds '*a*) (xref/2))
-                 ((sb-introspect::who-sets '*a*) (xref/2 xref/13))
-                 ((sb-introspect::who-references '*a*)
-                  (xref/1 xref/2 xref/4 inline/1 xref/14))
-                 ((sb-introspect::who-references '+z+)
-                  (inline/1)))))
-    (loop for x in tests
-          for form = (first x)
-          for wanted = (sort (second x) #'natural<)
-          for result = (sort (loop for name in (eval form)
-                                   collect (car name))
-                             #'natural<)
-          do (assert (equalp wanted result)
-                     nil
-                     "form=~a~%wanted=~a~%result=~a~%" form wanted result))))
-
+(deftest xrefs
+    (labels ((natural< (a b)
+               (string< (princ-to-string a) (princ-to-string b))))
+      (let ((tests '(((sb-introspect::who-calls 'foo) ())
+                     ((sb-introspect::who-calls 'bar) (xref/1 xref/3))
+                     ((sb-introspect::who-calls 'xref/1) (xref/2))
+                     ((sb-introspect::who-calls 'xref/2)
+                      (xref/5 xref/6 xref/8 xref/8 xref/12
+                       (sb-pcl::fast-method xref/10
+                                            (t t t t t t t t fixnum))
+                       (sb-pcl::fast-method xref/11 (fixnum))))
+                     ((sb-introspect::who-calls 'xref/3)
+                      (inline/1 (sb-pcl::fast-method xref/11 (float))))
+                     ((sb-introspect::who-calls 'xref/4) ())
+                     ((sb-introspect::who-calls 'xref/5) ())
+                     ((sb-introspect::who-calls 'xref/6) (xref/7))
+                     ((sb-introspect::who-calls 'xref/7) ())
+                     ((sb-introspect::who-calls 'xref/8) ())
+                     ((sb-introspect::who-calls 'xref/10) ())
+                     ((sb-introspect::who-calls 'xref/11) ())
+                     ((sb-introspect::who-calls 'inline/1) (xref/12))
+                     ((sb-introspect::who-calls 'xref/12) (macro/1))
+                     ((sb-introspect::who-macroexpands 'macro/1)
+                      (macro-use/1 macro-use/2 macro-use/3 macro-use/4 inline/2))
+                     ((sb-introspect::who-binds '*a*) (xref/2))
+                     ((sb-introspect::who-sets '*a*) (xref/2 xref/13))
+                     ((sb-introspect::who-references '*a*)
+                      (xref/1 xref/2 xref/4 inline/1 xref/14))
+                     ((sb-introspect::who-references '+z+)
+                      (inline/1)))))
+        (loop for x in tests
+              for form = (first x)
+              for wanted = (sort (second x) #'natural<)
+              for result = (sort (loop for name in (eval form)
+                                       collect (car name))
+                                 #'natural<)
+              do (unless (equalp wanted result)
+                   (return (format nil "form=~a~%wanted=~a~%result=~a~%"
+                                   form wanted result))))))
+  nil)