diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-01-22 00:16:47 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-01-22 00:17:42 +0100 |
| commit | 7cd1d7bd0cead9999e8d829ddce7abed37f9e9a0 (patch) | |
| tree | 61bccec91f9ceb8595e521f4909255a3196ec231 /gnu/packages/patches | |
| parent | f153d891550986f72a6e10f48cd68fd558569815 (diff) | |
| download | guix-7cd1d7bd0cead9999e8d829ddce7abed37f9e9a0.tar guix-7cd1d7bd0cead9999e8d829ddce7abed37f9e9a0.tar.gz | |
gnu: automake: Adjust test suite to lack of /bin/sh.
* gnu/packages/autotools.scm (autoconf-wrapper): New variable.
(automake): Use AUTOCONF-WRAPPER instead of AUTOCONF.
Add `automake-skip-amhello-tests.patch' as an input.
Add #:patches and #:phases arguments.
* gnu/packages/patches/automake-skip-amhello-tests.patch: New file.
* Makefile.am (dist_patch_DATA): Add it.
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/automake-skip-amhello-tests.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/gnu/packages/patches/automake-skip-amhello-tests.patch b/gnu/packages/patches/automake-skip-amhello-tests.patch new file mode 100644 index 0000000000..560281c338 --- /dev/null +++ b/gnu/packages/patches/automake-skip-amhello-tests.patch @@ -0,0 +1,39 @@ +Skip tests that rely on the `amhello' tarball that comes with Automake. +That tarball's `configure' uses #!/bin/sh, but we can't easily patch it. + +diff --git a/t/amhello-binpkg.sh b/t/amhello-binpkg.sh +index fa88cc6..d988cee 100755 +--- a/t/amhello-binpkg.sh ++++ b/t/amhello-binpkg.sh +@@ -17,6 +17,7 @@ + # Test an example from the manual about the 'amhello' package: + # using DESTDIR to build simple, no-frills binary packages. + ++exit 77 + am_create_testdir=empty + . ./defs || exit 1 + +diff --git a/t/amhello-cflags.sh b/t/amhello-cflags.sh +index 666011f..2a95e3c 100755 +--- a/t/amhello-cflags.sh ++++ b/t/amhello-cflags.sh +@@ -18,6 +18,7 @@ + # using VPATH builds to configure the same package with different + # options. + ++exit 77 + am_create_testdir=empty + required=gcc + . ./defs || exit 1 +diff --git a/t/amhello-cross-compile.sh b/t/amhello-cross-compile.sh +index 708abda..2ee4292 100755 +--- a/t/amhello-cross-compile.sh ++++ b/t/amhello-cross-compile.sh +@@ -17,6 +17,7 @@ + # Test an example from the manual about the 'amhello' package: + # cross-compiling a package from Linux/Unix to MinGW. + ++exit 77 + am_create_testdir=empty + required=i586-mingw32msvc-gcc + . ./defs || exit 1 |