build: Adjust tests to Automake 1.12.
* Makefile.am (TESTS_ENVIRONMENT): Remove `guile' invocation. Add semicolons, and export the variables as shown in the Automake 1.12 manual. (LOG_COMPILER): New variable, with `guile' invocation.master
parent
162dcc8b4c
commit
e1e7b29aae
|
@ -35,3 +35,4 @@ config.cache
|
||||||
/po/stamp-po
|
/po/stamp-po
|
||||||
/po/guix.pot
|
/po/guix.pot
|
||||||
/guix-build
|
/guix-build
|
||||||
|
/tests/*.trs
|
||||||
|
|
|
@ -48,9 +48,12 @@ TESTS = \
|
||||||
tests/build-utils.scm \
|
tests/build-utils.scm \
|
||||||
tests/packages.scm
|
tests/packages.scm
|
||||||
|
|
||||||
TESTS_ENVIRONMENT = \
|
TESTS_ENVIRONMENT = \
|
||||||
NIXPKGS="$(NIXPKGS)" \
|
NIXPKGS="$(NIXPKGS)"; \
|
||||||
GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH" \
|
GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH"; \
|
||||||
|
export NIXPKGS GUILE_LOAD_COMPILED_PATH;
|
||||||
|
|
||||||
|
LOG_COMPILER = \
|
||||||
$(GUILE) --no-auto-compile -L "$(top_srcdir)"
|
$(GUILE) --no-auto-compile -L "$(top_srcdir)"
|
||||||
|
|
||||||
EXTRA_DIST = build-aux/config.rpath $(TESTS)
|
EXTRA_DIST = build-aux/config.rpath $(TESTS)
|
||||||
|
|
Reference in New Issue