ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki 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
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/Makefile.am
View File

@ -1,7 +1,7 @@
TESTS_ENVIRONMENT = \
BZR_HOME="$(abs_builddir)/data" \
TESTS_ENVIRONMENT = \
BZR_HOME="$(abs_builddir)/data" \
HYDRA_DBI="dbi:SQLite:db.sqlite" \
HYDRA_DATA="$(abs_builddir)/data" \
HYDRA_DATA="$(abs_builddir)/data" \
HYDRA_HOME="$(top_srcdir)/src" \
NIX_REMOTE= \
NIX_CONF_DIR="$(abs_builddir)/nix/etc/nix" \
@ -19,8 +19,6 @@ EXTRA_DIST = \
$(wildcard jobs/*.sh) \
$(TESTS)
TESTS_ENVIRONMENT = $(perl) -w
TESTS = \
query-all-tables.pl \
evaluation-tests.pl
@ -29,7 +27,7 @@ clean :
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
$(TESTS) : db.sqlite repos
check_SCRIPTS = db.sqlite repos
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 {
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;
return $res;
}
sub runBuild {
my ($build) = @_;
return captureStdoutStderr(60, ("../src/script/hydra_build.pl", $build->id));
return captureStdoutStderr(60, ("../src/script/hydra-build", $build->id));
}
1;