Reify bytevector? in the correct module

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

diff --git a/test-suite/guile-test b/test-suite/guile-test
index 3917395..4a264b4 100755 (executable)
--- a/test-suite/guile-test
+++ b/test-suite/guile-test
@@ -1,11 +1,11 @@
-#!../libguile/guile \
+#!../meta/guile \
 -e main -s
 !#
 
 ;;;; guile-test --- run the Guile test suite
 ;;;; Jim Blandy <jimb@red-bean.com> --- May 1999
 ;;;;
-;;;;   Copyright (C) 1999, 2001, 2006, 2010 Free Software Foundation, Inc.
+;;;; Copyright (C) 1999, 2001, 2006, 2010, 2014 Free Software Foundation, Inc.
 ;;;;
 ;;;; This program is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public
@@ -92,12 +92,15 @@
 
 \f
 ;;; User configurable settings:
-(define default-test-suite
-  (string-append (getenv "HOME") "/bogus-path/test-suite"))
+(define (default-test-suite)
+  (let ((argv0 (car (program-arguments))))
+    (if (string=? (basename argv0) "guile-test")
+        (dirname argv0)
+        (error "Cannot find default test suite."))))
 
 \f
 ;;; Variables that will receive their actual values later.
-(define test-suite default-test-suite)
+(define test-suite)
 
 (define tmp-dir #f)
 
@@ -192,7 +195,7 @@
     (set! test-suite
          (or (opt 'test-suite #f)
              (getenv "TEST_SUITE_DIR")
-             default-test-suite))
+             (default-test-suite)))
 
     ;; directory where temporary files are created.
     ;; when run from "make check", this must be under the build-dir,
@@ -236,8 +239,10 @@
                  (lambda ()
                    (for-each (lambda (test)
                                (display (string-append "Running " test "\n"))
+                               (when (defined? 'setlocale)
+                                 (setlocale LC_ALL "C"))
                                (with-test-prefix test
-                                                 (load (test-file-name test))))
+                                 (load (test-file-name test))))
                              tests))))
             (if (opt 'coverage #f)
                 (let-values (((coverage-data _)