From cbbeea6603ef2178ae9beac57d40d2096eff857c Mon Sep 17 00:00:00 2001
From: Mikael Djurfeldt <djurfeldt@nada.kth.se>
Date: Wed, 19 Feb 2003 15:31:30 +0000
Subject: [PATCH] * tests/elisp.test: Use module (ice-9 weak-vector).

* tests/weaks.test: Use module (ice-9 weak-vector).
---
 test-suite/ChangeLog        |  6 ++++++
 test-suite/tests/elisp.test |  4 +++-
 test-suite/tests/weaks.test | 28 +++++++++++++++-------------
 3 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/test-suite/ChangeLog b/test-suite/ChangeLog
index 0bee1cc34..689040a92 100644
--- a/test-suite/ChangeLog
+++ b/test-suite/ChangeLog
@@ -1,3 +1,9 @@
+2003-02-19  Mikael Djurfeldt  <djurfeldt@nada.kth.se>
+
+	* tests/elisp.test: Use module (ice-9 weak-vector).
+
+	* tests/weaks.test: Use module (ice-9 weak-vector).
+
 2002-12-08  Rob Browning  <rlb@defaultvalue.org>
 
 	* tests/version.test: test (effective-version).
diff --git a/test-suite/tests/elisp.test b/test-suite/tests/elisp.test
index ab0039332..e3ed9ed7d 100644
--- a/test-suite/tests/elisp.test
+++ b/test-suite/tests/elisp.test
@@ -1,5 +1,5 @@
 ;;;; elisp.test --- tests guile's elisp support     -*- scheme -*-
-;;;; Copyright (C) 2002 Free Software Foundation, Inc.
+;;;; Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 ;;;;
 ;;;; This program is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -44,6 +44,8 @@
 ;;; elisp
 ;;;
 
+(use-modules (ice-9 weak-vector))
+
 (if (defined? '%nil)
 
     (with-test-prefix "scheme"
diff --git a/test-suite/tests/weaks.test b/test-suite/tests/weaks.test
index e66c89282..8b73c0b27 100644
--- a/test-suite/tests/weaks.test
+++ b/test-suite/tests/weaks.test
@@ -1,5 +1,5 @@
 ;;;; weaks.test --- tests guile's weaks     -*- scheme -*-
-;;;; Copyright (C) 1999, 2001 Free Software Foundation, Inc.
+;;;; Copyright (C) 1999, 2001, 2003 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This program is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -58,6 +58,8 @@
 ;;; other reasons why they might not work as tested here, so if you
 ;;; haven't done anything to weaks, don't sweat it :)
 
+(use-modules (ice-9 weak-vector))
+
 ;;; Creation functions 
 
 
@@ -86,28 +88,28 @@
 		     exception:wrong-type-arg
 		     (list->weak-vector 32)))
 
- (with-test-prefix "make-weak-key-hash-table"
+ (with-test-prefix "make-weak-key-alist-vector"
 		   (pass-if "create"
-		     (make-weak-key-hash-table 17)
+		     (make-weak-key-alist-vector 17)
 		     #t)
 		   (pass-if-exception "bad-args"
 		     exception:wrong-type-arg
-		     (make-weak-key-hash-table '(bad arg))))
- (with-test-prefix "make-weak-value-hash-table"
+		     (make-weak-key-alist-vector '(bad arg))))
+ (with-test-prefix "make-weak-value-alist-vector"
 		   (pass-if "create"
-		     (make-weak-value-hash-table 17)
+		     (make-weak-value-alist-vector 17)
 		     #t)
 		   (pass-if-exception "bad-args"
 		     exception:wrong-type-arg
-		     (make-weak-value-hash-table '(bad arg))))
+		     (make-weak-value-alist-vector '(bad arg))))
 
- (with-test-prefix "make-doubly-weak-hash-table"
+ (with-test-prefix "make-doubly-weak-alist-vector"
 		   (pass-if "create"
-		     (make-doubly-weak-hash-table 17)
+		     (make-doubly-weak-alist-vector 17)
 		     #t)
 		   (pass-if-exception "bad-args"
 		     exception:wrong-type-arg
-		     (make-doubly-weak-hash-table '(bad arg)))))
+		     (make-doubly-weak-alist-vector '(bad arg)))))
 
 
 
@@ -143,9 +145,9 @@
 		  (not (vector-ref global-weak 3))
 		  (not (vector-ref global-weak 4)))))))
 
- (let ((x (make-weak-key-hash-table 17))
-      (y (make-weak-value-hash-table 17))
-      (z (make-doubly-weak-hash-table 17))
+ (let ((x (make-weak-key-alist-vector 17))
+      (y (make-weak-value-alist-vector 17))
+      (z (make-doubly-weak-alist-vector 17))
       (test-key "foo")
       (test-value "bar"))
   (with-test-prefix