snaakey/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Fix the test

Browse source
This commit is contained in:
Eelco Dolstra 2011-11-30 18:03:50 +01:00
parent 82d17a2d0b
commit dd6e5d49ba
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
release.nix
View file

@ -17,7 +17,7 @@ rec {
version = builtins.readFile ./version; version = builtins.readFile ./version;
buildInputs = buildInputs =
[ perl libxslt dblatex tetex nukeReferences pkgconfig boehmgc ] ; [ perl libxslt dblatex tetex nukeReferences pkgconfig boehmgc ];
preConfigure = '' preConfigure = ''
# TeX needs a writable font cache. # TeX needs a writable font cache.
@ -63,6 +63,8 @@ rec {
gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial gnused graphviz bazaar gzip bzip2 lzma gnutar unzip git gitAndTools.topGit mercurial gnused graphviz bazaar
] ++ ( if stdenv.isLinux then [rpm dpkg cdrkit] else [] ))); ] ++ ( if stdenv.isLinux then [rpm dpkg cdrkit] else [] )));
preConfigure = "patchShebangs .";
postInstall = '' postInstall = ''
ensureDir $out/nix-support ensureDir $out/nix-support
nuke-refs $out/share/doc/hydra/manual/manual.pdf nuke-refs $out/share/doc/hydra/manual/manual.pdf

10
tests/Makefile.am
View file

@ -1,7 +1,7 @@
TESTS_ENVIRONMENT = \ TESTS_ENVIRONMENT = \
BZR_HOME="$(abs_builddir)/data" \ BZR_HOME="$(abs_builddir)/data" \
HYDRA_DBI="dbi:SQLite:db.sqlite" \ HYDRA_DBI="dbi:SQLite:db.sqlite" \
HYDRA_DATA="$(abs_builddir)/data" \ HYDRA_DATA="$(abs_builddir)/data" \
HYDRA_HOME="$(top_srcdir)/src" \ HYDRA_HOME="$(top_srcdir)/src" \
NIX_REMOTE= \ NIX_REMOTE= \
NIX_CONF_DIR="$(abs_builddir)/nix/etc/nix" \ NIX_CONF_DIR="$(abs_builddir)/nix/etc/nix" \
@ -19,8 +19,6 @@ EXTRA_DIST = \
$(wildcard jobs/*.sh) \ $(wildcard jobs/*.sh) \
$(TESTS) $(TESTS)
TESTS_ENVIRONMENT = $(perl) -w
TESTS = \ TESTS = \
query-all-tables.pl \ query-all-tables.pl \
evaluation-tests.pl evaluation-tests.pl
@ -29,7 +27,7 @@ clean :
chmod -R a+w nix chmod -R a+w nix
rm -rf db.sqlite data nix git-repo hg-repo svn-repo svn-checkout svn-checkout-repo bzr-repo bzr-checkout-repo rm -rf db.sqlite data nix git-repo hg-repo svn-repo svn-checkout svn-checkout-repo bzr-repo bzr-checkout-repo
$(TESTS) : db.sqlite repos check_SCRIPTS = db.sqlite repos
db.sqlite : $(top_srcdir)/src/sql/hydra-sqlite.sql db.sqlite : $(top_srcdir)/src/sql/hydra-sqlite.sql
sqlite3 db.sqlite < $(top_srcdir)/src/sql/hydra-sqlite.sql sqlite3 db.sqlite < $(top_srcdir)/src/sql/hydra-sqlite.sql

4
tests/Setup.pm
View file

@ -59,14 +59,14 @@ sub createJobsetWithOneInput {
sub evalSucceeds { sub evalSucceeds {
my ($jobset) = @_; my ($jobset) = @_;
my $res = captureStdoutStderr(60, ("../src/script/hydra_evaluator.pl", $jobset->project->name, $jobset->name)); my $res = captureStdoutStderr(60, ("../src/script/hydra-evaluator", $jobset->project->name, $jobset->name));
print STDERR "Evaluation errors for jobset ".$jobset->project->name.":".$jobset->name.": \n".$jobset->errormsg."\n" if $jobset->errormsg; print STDERR "Evaluation errors for jobset ".$jobset->project->name.":".$jobset->name.": \n".$jobset->errormsg."\n" if $jobset->errormsg;
return $res; return $res;
} }
sub runBuild { sub runBuild {
my ($build) = @_; my ($build) = @_;
return captureStdoutStderr(60, ("../src/script/hydra_build.pl", $build->id)); return captureStdoutStderr(60, ("../src/script/hydra-build", $build->id));
} }
1; 1;