From c40077ece17ad5f25f460b4c3dad8944551a605b Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 24 May 2017 10:00:38 -0400
Subject: [PATCH] Fix tests

---
 src/script/hydra-eval-jobset | 3 ++-
 tests/Makefile.am            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/script/hydra-eval-jobset b/src/script/hydra-eval-jobset
index 87095e79..7d2aa8a2 100755
--- a/src/script/hydra-eval-jobset
+++ b/src/script/hydra-eval-jobset
@@ -471,7 +471,8 @@ sub checkBuild {
         print STDERR "added build ${\$build->id} (${\$jobset->project->name}:${\$jobset->name}:$jobName)\n";
     });
 
-    system("hydra-notify build-queued " . $build->id) if defined $buildMap->{$build->id} && $buildMap->{$build->id}->{new};
+    system("hydra-notify build-queued " . $build->id)
+        if defined $build && defined $buildMap->{$build->id} && $buildMap->{$build->id}->{new};
     return $build;
 };
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fd7496f3..fde2d01f 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -12,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="$(srcdir):$(abs_top_srcdir)/src/lib:$$PERL5LIB"	\
   PATH=$(abs_top_srcdir)/src/hydra-evaluator:$(abs_top_srcdir)/src/script:$(abs_top_srcdir)/src/hydra-eval-jobs:$(abs_top_srcdir)/src/hydra-queue-runner:$$PATH \
   perl -w