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 a76553b..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.
 ##
@@ -22,6 +23,7 @@
 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                 \
@@ -33,16 +35,19 @@ SCM_TESTS = tests/00-initial-env.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                   \
@@ -50,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                    \
@@ -63,14 +69,18 @@ SCM_TESTS = tests/00-initial-env.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               \
@@ -98,12 +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                   \
@@ -118,6 +128,7 @@ SCM_TESTS = tests/00-initial-env.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                  \
@@ -149,11 +160,14 @@ SCM_TESTS = tests/00-initial-env.test             \
            tests/version.test                  \
            tests/vlist.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
@@ -197,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) tests/sxml-match-tests.ss