summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--build-aux/test-driver.scm.in (renamed from build-aux/test-driver.scm)5
-rw-r--r--configure.ac1
3 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 3dee68b..c4bf107 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,9 +65,9 @@ info_TEXINFOS = doc/guile-email.texi
 
 EXTRA_DIST +=			\
   $(TESTS)			\
-  build-aux/test-driver.scm	\
   tests/multipart-email-with-a-8bit-encoding-and-non-utf8-charset-part	\
   tests/email-with-8bit-encoding-and-non-utf8-charset	\
+  build-aux/test-driver.scm.in	\
   COPYING			\
   README.org
 
diff --git a/build-aux/test-driver.scm b/build-aux/test-driver.scm.in
index 0daad1d..71aa042 100644
--- a/build-aux/test-driver.scm
+++ b/build-aux/test-driver.scm.in
@@ -42,10 +42,11 @@
                 (test-runner-test-name runner))))
     runner))
 
-
 (let ((opts (getopt-long (command-line) %options)))
-  (set! test-log-to-file (option-ref opts 'log-file #f))
+  (set! test-log-to-file (string-append "@abs_top_builddir@/"
+                                        (option-ref opts 'log-file #f)))
   (call-with-output-file (option-ref opts 'trs-file #f)
     (lambda (trs-port)
+      (chdir "@abs_top_srcdir@")
       (test-with-runner (my-gnu-runner trs-port)
         (load-from-path (option-ref opts 'test-name #f))))))
diff --git a/configure.ac b/configure.ac
index ce3ff0c..5de8c76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,4 +30,5 @@ fi
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env])
+AC_CONFIG_FILES([build-aux/test-driver.scm])
 AC_OUTPUT