gnu/packages/patches/hydra-automake-1.15.patch

   1 This patch takes a slightly different approach to solving the issue reported
   2 at https://github.com/NixOS/hydra/issues/200.  This fix allows us to use
   3 Automake's parallel test harness.
   4
   5 --- source/configure.ac.orig    1969-12-31 18:00:01.000000000 -0600
   6 +++ source/configure.ac 2015-04-15 10:58:15.974679278 -0500
   7 @@ -33,7 +33,7 @@
   8  fi
   9  ])
  10
  11 -NEED_PROG(perl, perl)
  12 +NEED_PROG([PERL], perl)
  13
  14  NEED_PROG([NIX_STORE_PROGRAM], [nix-store])
  15
  16 --- source/tests/Makefile.am.orig       1969-12-31 18:00:01.000000000 -0600
  17 +++ source/tests/Makefile.am    2015-04-15 11:00:35.846682904 -0500
  18 @@ -1,19 +1,20 @@
  19 -TESTS_ENVIRONMENT = \
  20 -  BZR_HOME="$(abs_builddir)/data"                      \
  21 -  HYDRA_DBI="dbi:SQLite:db.sqlite"                     \
  22 -  HYDRA_DATA="$(abs_builddir)/data"                    \
  23 -  HYDRA_HOME="$(top_srcdir)/src"                       \
  24 -  HYDRA_CONFIG=                                                \
  25 -  NIX_REMOTE=                                          \
  26 -  GUIX_CONFIGURATION_DIRECTORY="$(abs_builddir)/nix/etc/nix"           \
  27 -  NIX_STATE_DIR="$(abs_builddir)/nix/var/nix"          \
  28 -  NIX_MANIFESTS_DIR="$(abs_builddir)/nix/var/nix/manifests"    \
  29 -  NIX_STORE_DIR="$(abs_builddir)/nix/store"                    \
  30 -  NIX_LOG_DIR="$(abs_builddir)/nix/var/log/nix"                \
  31 -  NIX_BUILD_HOOK=                                      \
  32 -  PERL5LIB="$(srcdir):$(top_srcdir)/src/lib:$$PERL5LIB"        \
  33 -  PATH=$(abs_top_srcdir)/src/script:$(abs_top_srcdir)/src/c:$$PATH \
  34 -  perl -w
  35 +AM_TESTS_ENVIRONMENT = \
  36 +  BZR_HOME="$(abs_builddir)/data"; export BZR_HOME;    \
  37 +  HYDRA_DBI="dbi:SQLite:db.sqlite"; export HYDRA_DBI;  \
  38 +  HYDRA_DATA="$(abs_builddir)/data"; export HYDRA_DATA;        \
  39 +  HYDRA_HOME="$(top_srcdir)/src"; export HYDRA_HOME;   \
  40 +  HYDRA_CONFIG=; export HYDRA_CONFIG;                  \
  41 +  NIX_REMOTE=; export NIX_REMOTE;                      \
  42 +  GUIX_CONFIGURATION_DIRECTORY="$(abs_builddir)/nix/etc/nix"; export GUIX_CONFIGURATION_DIRECTORY; \
  43 +  NIX_STATE_DIR="$(abs_builddir)/nix/var/nix"; export NIX_STATE_DIR; \
  44 +  NIX_MANIFESTS_DIR="$(abs_builddir)/nix/var/nix/manifests"; export NIX_MANIFESTS_DIR; \
  45 +  NIX_STORE_DIR="$(abs_builddir)/nix/store"; export NIX_STORE_DIR; \
  46 +  NIX_LOG_DIR="$(abs_builddir)/nix/var/log/nix"; export NIX_LOG_DIR; \
  47 +  NIX_BUILD_HOOK=; export NIX_BUILD_HOOK;              \
  48 +  PERL5LIB="$(srcdir):$(top_srcdir)/src/lib:$$PERL5LIB"; export PERL5LIB; \
  49 +  PATH=$(abs_top_srcdir)/src/script:$(abs_top_srcdir)/src/c:$$PATH; export PATH;
  50 +LOG_COMPILER = $(PERL)
  51 +AM_LOG_FLAGS = -w
  52
  53  EXTRA_DIST = \
  54    $(wildcard *.pm) \
  55 @@ -33,7 +34,7 @@
  56  check_SCRIPTS = db.sqlite repos
  57
  58  db.sqlite: $(top_srcdir)/src/sql/hydra-sqlite.sql
  59 -       $(TESTS_ENVIRONMENT) $(top_srcdir)/src/script/hydra-init
  60 +       $(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) $(top_srcdir)/src/script/hydra-init
  61
  62  repos: dirs
  63