Merge remote-tracking branch 'origin/stable-2.0'

[bpt/guile.git] / test-suite / Makefile.am

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index b08233f..c20a977 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in.
 ##
-## Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Software Foundation, Inc.
+## Copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
+##   2010, 2011, 2012 Software Foundation, Inc.
 ##
 ## This file is part of GUILE.
 ##
@@ -19,29 +20,34 @@
 ##   write to the Free Software Foundation, Inc., 51 Franklin Street,
 ##   Fifth Floor, Boston, MA 02110-1301 USA
 
-SUBDIRS = standalone
+SUBDIRS = standalone vm
 
 SCM_TESTS = tests/00-initial-env.test          \
+           tests/00-socket.test                \
             tests/alist.test                   \
            tests/and-let-star.test             \
            tests/arbiters.test                 \
            tests/arrays.test                   \
            tests/asm-to-bytecode.test          \
            tests/bit-operations.test           \
+           tests/bitvectors.test               \
            tests/brainfuck.test                \
            tests/bytevectors.test              \
            tests/c-api.test                    \
            tests/chars.test                    \
+           tests/coding.test                   \
            tests/common-list.test              \
            tests/control.test                  \
            tests/continuations.test            \
            tests/coverage.test                 \
+           tests/cse.test                      \
            tests/curried-definitions.test      \
            tests/ecmascript.test               \
            tests/elisp.test                    \
            tests/elisp-compiler.test           \
            tests/elisp-reader.test             \
            tests/eval.test                     \
+           tests/eval-string.test              \
            tests/exceptions.test               \
            tests/filesys.test                  \
            tests/fluids.test                   \
@@ -49,6 +55,7 @@ SCM_TESTS = tests/00-initial-env.test         \
            tests/format.test                   \
            tests/fractions.test                \
            tests/ftw.test                      \
+           tests/future.test                   \
            tests/gc.test                       \
            tests/getopt-long.test              \
            tests/goops.test                    \
@@ -61,26 +68,39 @@ SCM_TESTS = tests/00-initial-env.test               \
            tests/keywords.test                 \
            tests/list.test                     \
            tests/load.test                     \
+           tests/match.test                    \
+           tests/match.test.upstream           \
            tests/modules.test                  \
            tests/multilingual.nottest          \
            tests/net-db.test                   \
            tests/numbers.test                  \
            tests/optargs.test                  \
            tests/options.test                  \
+           tests/parameters.test               \
+           tests/peval.test                    \
            tests/print.test                    \
            tests/procprop.test                 \
+           tests/procs.test                    \
            tests/poe.test                      \
            tests/popen.test                    \
+           tests/popen-child.scm               \
            tests/ports.test                    \
            tests/posix.test                    \
            tests/q.test                        \
            tests/r4rs.test                     \
            tests/r5rs_pitfall.test             \
            tests/r6rs-arithmetic-bitwise.test  \
+           tests/r6rs-arithmetic-fixnums.test  \
+           tests/r6rs-arithmetic-flonums.test  \
+           tests/r6rs-base.test                \
+           tests/r6rs-conditions.test          \
            tests/r6rs-control.test             \
+           tests/r6rs-enums.test               \
+           tests/r6rs-eval.test                \
            tests/r6rs-exceptions.test          \
            tests/r6rs-files.test               \
            tests/r6rs-hashtables.test          \
+           tests/r6rs-lists.test               \
            tests/r6rs-ports.test               \
            tests/r6rs-records-inspection.test  \
            tests/r6rs-records-procedural.test  \
@@ -88,11 +108,12 @@ SCM_TESTS = tests/00-initial-env.test              \
            tests/r6rs-unicode.test             \
            tests/rnrs-libraries.test           \
            tests/ramap.test                    \
+           tests/rdelim.test                   \
            tests/reader.test                   \
            tests/receive.test                  \
            tests/regexp.test                   \
+           tests/session.test                  \
            tests/signals.test                  \
-           tests/socket.test                   \
            tests/srcprop.test                  \
            tests/srfi-1.test                   \
            tests/srfi-6.test                   \
@@ -102,12 +123,17 @@ SCM_TESTS = tests/00-initial-env.test             \
            tests/srfi-14.test                  \
            tests/srfi-19.test                  \
            tests/srfi-26.test                  \
+           tests/srfi-27.test                  \
            tests/srfi-31.test                  \
            tests/srfi-34.test                  \
            tests/srfi-35.test                  \
            tests/srfi-37.test                  \
+           tests/srfi-38.test                  \
            tests/srfi-39.test                  \
+           tests/srfi-42.test                  \
+           tests/srfi-45.test                  \
            tests/srfi-60.test                  \
+           tests/srfi-67.test                  \
            tests/srfi-69.test                  \
            tests/srfi-88.test                  \
            tests/srfi-4.test                   \
@@ -116,6 +142,7 @@ SCM_TESTS = tests/00-initial-env.test               \
            tests/strings.test                  \
            tests/structs.test                  \
            tests/sxml.fold.test                \
+           tests/sxml.match.test               \
            tests/sxml.simple.test              \
            tests/sxml.ssax.test                \
            tests/sxml.transform.test           \
@@ -132,11 +159,15 @@ SCM_TESTS = tests/00-initial-env.test             \
            tests/tree-il.test                  \
            tests/version.test                  \
            tests/vlist.test                    \
-           tests/weaks.test
+           tests/weaks.test                    \
+           tests/web-http.test                 \
+           tests/web-request.test              \
+           tests/web-response.test             \
+           tests/web-uri.test
 
 EXTRA_DIST = \
        guile-test \
-       lib.scm \
+       test-suite/lib.scm \
        $(SCM_TESTS) \
        tests/rnrs-test-a.scm
        ChangeLog-2008
@@ -180,6 +211,8 @@ LALR_EXTRA +=                                       \
   lalr/run-guile-test.sh
 
 TESTS = $(LALR_TESTS)
-TESTS_ENVIRONMENT = $(top_builddir)/meta/guile --no-autocompile
+TESTS_ENVIRONMENT =                            \
+  @LOCALCHARSET_TESTS_ENVIRONMENT@             \
+  $(top_builddir)/meta/guile --no-auto-compile
 
-EXTRA_DIST += $(LALR_EXTRA) $(LALR_TESTS)
+EXTRA_DIST += $(LALR_EXTRA) $(LALR_TESTS) tests/sxml-match-tests.ss