*** empty log message ***

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

diff --git a/test-suite/tests/r4rs.test b/test-suite/tests/r4rs.test
index c9fbb15..347d05d 100644 (file)
--- a/test-suite/tests/r4rs.test
+++ b/test-suite/tests/r4rs.test
@@ -1,44 +1,23 @@
 ;;;; r4rs.test --- tests for R4RS compliance      -*- scheme -*-
 ;;;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1999, 2001 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
-;;;; the Free Software Foundation; either version 2, or (at your option)
-;;;; any later version.
+;;;; 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.
 ;;;; 
-;;;; This program is distributed in the hope that it will be useful,
+;;;; This library is distributed in the hope that it will be useful,
 ;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;;; GNU General Public License for more details.
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;;; Lesser General Public License for more details.
 ;;;; 
-;;;; You should have received a copy of the GNU General Public License
-;;;; along with this software; see the file COPYING.  If not, write to
-;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-;;;; Boston, MA 02111-1307 USA
-;;;;
-;;;; As a special exception, the Free Software Foundation gives permission
-;;;; for additional uses of the text contained in its release of GUILE.
-;;;;
-;;;; The exception is that, if you link the GUILE library with other files
-;;;; to produce an executable, this does not by itself cause the
-;;;; resulting executable to be covered by the GNU General Public License.
-;;;; Your use of that executable is in no way restricted on account of
-;;;; linking the GUILE library code into it.
-;;;;
-;;;; This exception does not however invalidate any other reasons why
-;;;; the executable file might be covered by the GNU General Public License.
-;;;;
-;;;; This exception applies only to the code released by the
-;;;; Free Software Foundation under the name GUILE.  If you copy
-;;;; code from other Free Software Foundation releases into a copy of
-;;;; GUILE, as the General Public License permits, the exception does
-;;;; not apply to the code that you add in this way.  To avoid misleading
-;;;; anyone as to the status of such modified files, you must delete
-;;;; this exception notice from them.
-;;;;
-;;;; If you write modifications of your own for GUILE, it is your choice
-;;;; whether to permit this exception to apply to your modifications.
-;;;; If you do not wish that, delete this exception notice.  
+;;;; You should have received a copy of the GNU Lesser General Public
+;;;; License along with this library; if not, write to the Free Software
+;;;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+(define-module (test-suite test-r4rs)
+  :use-module (test-suite lib)
+  :use-module (test-suite guile-test))
 
 
 ;;;; ============= NOTE =============
@@ -87,7 +66,15 @@
 ;;; send corrections or additions to jaffer@ai.mit.edu or
 ;;; Aubrey Jaffer, 84 Pleasant St., Wakefield MA 01880, USA
 
+;; Note: The following two expressions are being read as part of the tests in
+;; section (6 10 2).  Those tests expect that above the following two
+;; expressions there should be only one arbitrary s-expression (which is the
+;; define-module expression).  Further, the two expressions should be written
+;; on one single line without a blank between them.  If you change this, you
+;; will also have to change the corresponding tests in section (6 10 2).
+
 (define cur-section '())(define errs '())
+
 (define SECTION (lambda args
                  (set! cur-section args) #t))
 (define record-error (lambda (e) (set! errs (cons (list cur-section e) errs))))
@@ -941,6 +928,7 @@
 (SECTION 6 10 2)
 (test #\; peek-char this-file)
 (test #\; read-char this-file)
+(read this-file) ;; skip define-module expression
 (test '(define cur-section '()) read this-file)
 (test #\( peek-char this-file)
 (test '(define errs '()) read this-file)
@@ -1013,12 +1001,6 @@
 (test-delay)
 "last item in file"
 
-
-;; FIXME:  We shouldn't create any global bindings in the test files or
-;; alternatively execute every test file's code in a module of its own
-(if (defined? 'x) (undefine x))
-(if (defined? 'y) (undefine y))
-
 (delete-file (data-file-name "tmp1"))
 (delete-file (data-file-name "tmp2"))
 (delete-file (data-file-name "tmp3"))