From 259afadbab63227c87a0cff24201959ac3f77826 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 12 Mar 2012 20:56:41 +0100 Subject: [PATCH] Set $PERL5LIB properly in hydra-init in "make check" --- tests/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 8ced1ed7..f510956e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,3 +1,5 @@ +perl5lib = "$(srcdir):$(top_srcdir)/src/lib:$$PERL5LIB" + TESTS_ENVIRONMENT = \ BZR_HOME="$(abs_builddir)/data" \ HYDRA_DBI="dbi:SQLite:db.sqlite" \ @@ -10,7 +12,7 @@ TESTS_ENVIRONMENT = \ NIX_STORE_DIR="$(abs_builddir)/nix/store" \ NIX_LOG_DIR="$(abs_builddir)/nix/var/log/nix" \ NIX_BUILD_HOOK= \ - PERL5LIB="$(srcdir):$(top_srcdir)/src/lib:$$PERL5LIB" \ + PERL5LIB=$(perl5lib) \ PATH=$(abs_top_srcdir)/src/script:$(abs_top_srcdir)/src/c:$$PATH \ perl -w @@ -31,7 +33,7 @@ clean : check_SCRIPTS = db.sqlite repos db.sqlite : $(top_srcdir)/src/sql/hydra-sqlite.sql - perl $(top_srcdir)/src/script/hydra-init + PERL5LIB=$(perl5lib) perl $(top_srcdir)/src/script/hydra-init repos : dirs git-repo hg-repo svn-repo svn-checkout-repo bzr-repo bzr-checkout-repo