[?]
Mar 17, 2011, 1:25 PM
FAIJDQKZH6SUUNCKW5RIOZ37YRAO5ACS6FX76MHRNN53LDBWO6ZQC

Dependencies

  • [2] M3A5PZIH hydra: Clarify the dependency on BDW-GC.
  • [3] PVBTVPKJ nix needs env vars as absolute paths
  • [4] SBKX3YH2 cleanup
  • [5] WFJ3ZPRM add tests for scm inputs
  • [6] HX4QYOYA add first evaluations tests
  • [*] FV2M6MOT hydra: use autoconf/-make
  • [*] G2ZB6464 first test, not yet in buildprocess
  • [*] JRVI4XTV tests: Use $(builddir) instead of `pwd`.
  • [*] WHS5RMPO

Change contents

  • edit in configure.ac at line 46
    [2.39]
    [8.16382]
    testPath="$(dirname $(type -p expr))"
    AC_SUBST(testPath)
  • edit in configure.ac at line 62
    [9.18]
    [8.16774]
    tests/jobs/config.nix
  • edit in tests/Makefile.am at line 7
    [10.160]
    [3.42]
    NIX_CONF_DIR="$(abs_builddir)/nix/etc/nix" \
  • edit in tests/Makefile.am at line 39
    [11.353]
    [11.353]
    mkdir -p nix/etc/nix
    touch nix/etc/nix/nix.conf
  • edit in tests/Setup.pm at line 5
    [5.561]
    [5.561]
    use Hydra::Helper::Nix;
    use Hydra::Helper::AddBuilds;
    use Cwd;
  • replacement in tests/Setup.pm at line 10
    [5.587][5.587:618]()
    our @EXPORT = qw(hydra_setup);
    [5.587]
    [5.618]
    our @EXPORT = qw(hydra_setup nrBuildsForJobset queuedBuildsForJobset nrQueuedBuildsForJobset createBaseJobset createJobsetWithOneInput evalSucceeds runBuild);
  • edit in tests/Setup.pm at line 20
    [4.97]
    [4.97]
    }
    sub queuedBuildsForJobset {
    my ($jobset) = @_;
    return $jobset->builds->search({},{ join => 'schedulingInfo' });
  • replacement in tests/Setup.pm at line 29
    [4.151][4.151:226]()
    return $jobset->builds->search({},{ join => 'schedulingInfo' })->count ;
    [4.151]
    [4.226]
    return queuedBuildsForJobset($jobset)->count ;
  • replacement in tests/Setup.pm at line 34
    [4.291][4.291:408]()
    my $project = $db->resultset('Projects')->update_or_create({name => "tests", displayname => "", owner => "root"});
    [4.291]
    [4.408]
    my $project = openHydraDB->resultset('Projects')->update_or_create({name => "tests", displayname => "", owner => "root"});
  • edit in tests/Setup.pm at line 67
    [4.1485]
    [5.766]
    sub runBuild {
    my ($build) = @_;
    return captureStdoutStderr(60, ("../src/script/hydra_build.pl", $build->id));
    }
  • replacement in tests/evaluation-tests.pl.in at line 13
    [5.969][4.1486:1516]()
    use Test::Simple tests => 16;
    [5.969]
    [5.998]
    use Test::Simple tests => 22;
  • edit in tests/evaluation-tests.pl.in at line 31
    [5.797]
    [5.838]
    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);
    my $expected = $build->job->name eq "fails" ? 1 : 0;
    ok($newbuild->buildresultinfo->buildstatus == $expected, "Build '".$build->job->name."' from jobs/basic.nix should have buildstatus $expected");
    }
  • edit in tests/jobs/basic.nix at line 1
    [5.1747]
    [5.1759]
    with import ./config.nix;
  • replacement in tests/jobs/basic.nix at line 4
    [5.1778][5.1778:1795]()
    derivation {
    [5.1778]
    [5.1795]
    mkDerivation {
  • edit in tests/jobs/basic.nix at line 6
    [5.1821][5.1821:1860]()
    system = builtins.currentSystem;
  • replacement in tests/jobs/basic.nix at line 10
    [5.1919][5.1919:1936]()
    derivation {
    [5.1919]
    [5.1936]
    mkDerivation {
  • edit in tests/jobs/basic.nix at line 12
    [5.1958][5.1958:1997]()
    system = builtins.currentSystem;
  • replacement in tests/jobs/basic.nix at line 16
    [5.2057][5.2057:2074]()
    derivation {
    [5.2057]
    [5.2074]
    mkDerivation {
  • edit in tests/jobs/basic.nix at line 18
    [5.2110][5.2110:2149]()
    system = builtins.currentSystem;
  • file addition: build-output-as-input.nix (----------)
    [5.1729]
    with import ./config.nix;
    let
    jobs = {
    build1 =
    mkDerivation {
    name = "build1";
    builder = ./empty-dir-builder.sh;
    };
    build2 =
    {build1 ? jobs.build1 }:
    mkDerivation {
    name = "build2";
    builder = ./empty-dir-builder.sh;
    inherit build1;
    };
    };
    in jobs
  • edit in tests/jobs/bzr-checkout-input.nix at line 1
    [5.2058]
    [5.2059]
    with import ./config.nix;
  • replacement in tests/jobs/bzr-checkout-input.nix at line 5
    [5.2082][5.2082:2099]()
    derivation {
    [5.2082]
    [5.2099]
    mkDerivation {
  • edit in tests/jobs/bzr-checkout-input.nix at line 7
    [5.2134][5.2134:2173]()
    system = builtins.currentSystem;
  • edit in tests/jobs/bzr-checkout-input.nix at line 8
    [5.2207]
    [5.2207]
    inherit src;
  • edit in tests/jobs/bzr-input.nix at line 1
    [5.2265]
    [5.2266]
    with import ./config.nix;
  • replacement in tests/jobs/bzr-input.nix at line 5
    [5.2289][5.2289:2306]()
    derivation {
    [5.2289]
    [5.2306]
    mkDerivation {
  • edit in tests/jobs/bzr-input.nix at line 7
    [5.2332][5.2332:2371]()
    system = builtins.currentSystem;
  • edit in tests/jobs/bzr-input.nix at line 8
    [5.2405]
    [5.2405]
    inherit src;
  • file addition: config.nix.in (----------)
    [5.1729]
    rec {
    path = "@testPath@";
    mkDerivation = args:
    derivation ({
    system = builtins.currentSystem;
    PATH = path;
    } // args);
    }
  • edit in tests/jobs/empty-dir-builder.sh at line 1
    [5.2236]
    [5.2237]
    #! /bin/sh
  • edit in tests/jobs/fail.sh at line 1
    [5.2295]
    [5.2296]
    #! /bin/sh
  • edit in tests/jobs/git-input.nix at line 1
    [5.2454]
    [5.2455]
    with import ./config.nix;
  • replacement in tests/jobs/git-input.nix at line 5
    [5.2478][5.2478:2495]()
    derivation {
    [5.2478]
    [5.2495]
    mkDerivation {
  • edit in tests/jobs/git-input.nix at line 7
    [5.2521][5.2521:2560]()
    system = builtins.currentSystem;
  • edit in tests/jobs/git-input.nix at line 8
    [5.2594]
    [5.2594]
    inherit src;
  • edit in tests/jobs/hg-input.nix at line 1
    [5.2643]
    [5.2644]
    with import ./config.nix;
  • replacement in tests/jobs/hg-input.nix at line 5
    [5.2667][5.2667:2684]()
    derivation {
    [5.2667]
    [5.2684]
    mkDerivation {
  • edit in tests/jobs/hg-input.nix at line 7
    [5.2709][5.2709:2748]()
    system = builtins.currentSystem;
  • edit in tests/jobs/hg-input.nix at line 8
    [5.2782]
    [5.2782]
    inherit src;
  • edit in tests/jobs/scm-builder.sh at line 1
    [5.2830]
    [5.2831]
    #! /bin/sh
  • edit in tests/jobs/succeed-with-failed.sh at line 1
    [5.2337]
    [5.2338]
    #! /bin/sh
  • edit in tests/jobs/svn-checkout-input.nix at line 1
    [5.2902]
    [5.2903]
    with import ./config.nix;
  • replacement in tests/jobs/svn-checkout-input.nix at line 5
    [5.2926][5.2926:2943]()
    derivation {
    [5.2926]
    [5.2943]
    mkDerivation {
  • edit in tests/jobs/svn-checkout-input.nix at line 7
    [5.2978][5.2978:3017]()
    system = builtins.currentSystem;
  • edit in tests/jobs/svn-checkout-input.nix at line 8
    [5.3051]
    [5.3051]
    inherit src;
  • edit in tests/jobs/svn-input.nix at line 1
    [5.3109]
    [5.3110]
    with import ./config.nix;
  • replacement in tests/jobs/svn-input.nix at line 5
    [5.3133][5.3133:3150]()
    derivation {
    [5.3133]
    [5.3150]
    mkDerivation {
  • edit in tests/jobs/svn-input.nix at line 7
    [5.3176][5.3176:3215]()
    system = builtins.currentSystem;
  • edit in tests/jobs/svn-input.nix at line 8
    [5.3249]
    [5.3249]
    inherit src;