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.
This commit is contained in:
Ludovic Courtès 2012-07-07 22:50:27 +02:00
parent 162dcc8b4c
commit e1e7b29aae
2 changed files with 7 additions and 3 deletions

1
.gitignore vendored
View file

@ -35,3 +35,4 @@ config.cache
/po/stamp-po
/po/guix.pot
/guix-build
/tests/*.trs

View file

@ -48,9 +48,12 @@ TESTS = \
tests/build-utils.scm \
tests/packages.scm
TESTS_ENVIRONMENT = \
NIXPKGS="$(NIXPKGS)" \
GUILE_LOAD_COMPILED_PATH="$(top_builddir):$$GUILE_LOAD_COMPILED_PATH" \
TESTS_ENVIRONMENT = \
NIXPKGS="$(NIXPKGS)"; \
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)"
EXTRA_DIST = build-aux/config.rpath $(TESTS)