really boot primitive-eval from scheme.

[bpt/guile.git] / test-suite / tests / gc.test

diff --git a/test-suite/tests/gc.test b/test-suite/tests/gc.test
index 407c4a2..f5848fb 100644 (file)
--- a/test-suite/tests/gc.test
+++ b/test-suite/tests/gc.test
@@ -1,10 +1,10 @@
 ;;;; gc.test --- test guile's garbage collection    -*- scheme -*-
-;;;; Copyright (C) 2000, 2001, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
+;;;; Copyright (C) 2000, 2001, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 ;;;;
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
 ;;;; License as published by the Free Software Foundation; either
-;;;; version 2.1 of the License, or (at your option) any later version.
+;;;; version 3 of the License, or (at your option) any later version.
 ;;;; 
 ;;;; This library is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -64,18 +64,14 @@
 
             (for-each (lambda (x) (guard (make-module))) (iota total))
 
-            ;; XXX: This hack aims to clean up the stack to make sure we
-            ;; don't leave a reference to one of the modules we created.  It
-            ;; proved to be useful on SPARC:
-            ;; http://lists.gnu.org/archive/html/guile-devel/2008-02/msg00006.html .
-             (let cleanup ((i 10))
-               (and (> i 0)
-                    (begin (cleanup (1- i)) i)))
-
-            (gc)
+             (gc)
             (gc) ;; twice: have to kill the weak vectors.
-             (= (length (filter (lambda (x)
-                                  (eq? x #t))
-                                (map (lambda (x) (and (guard) #t))
-                                     (iota total))))
+             (gc) ;; thrice: because the test doesn't succeed with only
+                  ;; one gc round. not sure why.
+
+             (= (let lp ((i 0))
+                  (if (guard)
+                      (lp (1+ i))
+                      i))
                 total))))
+