Author: rob
Date: Thu Mar 24 13:45:01 2011
New Revision: 26491
URL: https://svn.nixos.org/websvn/nix/?rev=26491&sc=1
Log:
hydra: fixed and re-enabled evaluation tests
Modified:
hydra/trunk/deps.nix
hydra/trunk/release.nix
hydra/trunk/tests/Makefile.am
hydra/trunk/tests/evaluation-tests.pl.in
Modified: hydra/trunk/deps.nix
==============================================================================
--- hydra/trunk/deps.nix Thu Mar 24 12:05:34 2011 (r26490)
+++ hydra/trunk/deps.nix Thu Mar 24 13:45:01 2011 (r26491)
@@ -2,21 +2,6 @@
with pkgs;
-let
-
- nixPerl = buildPerlPackage {
- name = "Nix-0.15";
- src = fetchsvn {
- url = https://svn.nixos.org/repos/nix/nix-perl/trunk;
- rev = 24774;
- sha256 = "1akj695gpnbrjlnwd1gdnnnk7ppvpp1qsinjn04az7q6hjqzbm6p";
- };
- NIX_PREFIX = nixSqlite;
- doCheck = false; # tests currently don't work
- };
-
-in
-
[ perlPackages.CatalystDevel
perlPackages.CatalystPluginSessionStoreFastMmap
perlPackages.CatalystPluginStackTrace
@@ -40,5 +25,5 @@
perlPackages.DigestSHA1
perlPackages.CryptRandPasswd
perlPackages.TestMore
- nixPerl
+ perlPackages.nixPerl
]
Modified: hydra/trunk/release.nix
==============================================================================
--- hydra/trunk/release.nix Thu Mar 24 12:05:34 2011 (r26490)
+++ hydra/trunk/release.nix Thu Mar 24 13:45:01 2011 (r26491)
@@ -73,7 +73,7 @@
--set NIX_RELEASE ${nix.name}
done
''; # */
-
+ LOGNAME="$USER";
meta = {
description = "Build of Hydra on ${system}";
};
Modified: hydra/trunk/tests/Makefile.am
==============================================================================
--- hydra/trunk/tests/Makefile.am Thu Mar 24 12:05:34 2011 (r26490)
+++ hydra/trunk/tests/Makefile.am Thu Mar 24 13:45:01 2011 (r26491)
@@ -9,7 +9,7 @@
NIX_STORE_DIR="$(abs_builddir)/nix/store" \
NIX_LOG_DIR="$(abs_builddir)/nix/var/log/nix" \
PERL5LIB="$(srcdir):$(top_srcdir)/src/lib:$$PERL5LIB" \
- PATH=$(abs_top_srcdir)/src/script:$$PATH \
+ PATH=$(abs_top_srcdir)/src/script:$(abs_top_srcdir)/src/c:$$PATH \
perl -w
EXTRA_DIST = \
@@ -18,8 +18,8 @@
$(wildcard jobs/*.sh)
TESTS = \
- query-all-tables.pl
-# evaluation-tests.pl
+ query-all-tables.pl \
+ evaluation-tests.pl
clean :
chmod -R a+w nix
Modified: hydra/trunk/tests/evaluation-tests.pl.in
==============================================================================
--- hydra/trunk/tests/evaluation-tests.pl.in Thu Mar 24 12:05:34 2011
(r26490)
+++ hydra/trunk/tests/evaluation-tests.pl.in Thu Mar 24 13:45:01 2011
(r26491)
@@ -10,7 +10,7 @@
my $db = openHydraDB;
-use Test::Simple tests => 22;
+use Test::Simple tests => 28;
hydra_setup($db);
@@ -40,6 +40,19 @@
ok(evalSucceeds($jobset), "Evaluating
jobs/build-output-as-input.nix should exit with return code 0");
ok(nrQueuedBuildsForJobset($jobset) == 1 , "Evaluating
jobs/build-output-as-input.nix for first time should result in 1 build in
queue");
+for my $build (queuedBuildsForJobset($jobset)) {
+ ok(runBuild($build), "Build '".$build->job->name."' from jobs/basic.nix
should exit with code 0");
+ my $newbuild = $db->resultset('Builds')->find($build->id);
+ ok($newbuild->buildresultinfo->buildstatus == 0, "Build
'".$build->job->name."' from jobs/basic.nix should have buildstatus 0");
+}
+
+ok(evalSucceeds($jobset), "Evaluating
jobs/build-output-as-input.nix for second time should exit with return code 0");
+ok(nrQueuedBuildsForJobset($jobset) == 1 , "Evaluating
jobs/build-output-as-input.nix for second time after building build1 should
result in 1 build in queue");
+for my $build (queuedBuildsForJobset($jobset)) {
+ ok(runBuild($build), "Build '".$build->job->name."' from jobs/basic.nix
should exit with code 0");
+ my $newbuild = $db->resultset('Builds')->find($build->id);
+ ok($newbuild->buildresultinfo->buildstatus == 0, "Build
'".$build->job->name."' from jobs/basic.nix should have buildstatus 0");
+}
# Test scm inputs
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
