Author: ludo Date: Tue Jan 4 16:10:45 2011 New Revision: 25391 URL: https://svn.nixos.org/websvn/nix/?rev=25391&sc=1
Log: guile: Enable `succeedOnFailure' and `keepBuildDirectory'. Modified: hydra-config/gnu/trunk/guile/release.nix Modified: hydra-config/gnu/trunk/guile/release.nix ============================================================================== --- hydra-config/gnu/trunk/guile/release.nix Tue Jan 4 16:10:28 2011 (r25390) +++ hydra-config/gnu/trunk/guile/release.nix Tue Jan 4 16:10:45 2011 (r25391) @@ -1,5 +1,5 @@ /* Continuous integration of GNU with Hydra/Nix. - Copyright (C) 2009, 2010 Ludovic Courtès <[email protected]> + Copyright (C) 2009, 2010, 2011 Ludovic Courtès <[email protected]> Copyright (C) 2009 Rob Vermaas <[email protected]> This program is free software: you can redistribute it and/or modify @@ -106,19 +106,8 @@ [ "CPPFLAGS=-DSCM_DEBUG=1" ] ]; - failureHook = - '' if [ -f check-guile.log ] - then - echo - echo "build failed, dumping test log..." - cat check-guile.log - elif [ -f config.log -a ! -f Makefile ] - then - echo - echo "configuration failed, dumping config.log..." - cat config.log - fi - ''; + succeedOnFailure = true; + keepBuildDirectory = true; jobs = rec { @@ -173,7 +162,7 @@ -e's/"<stdout>"/"c-tokenize.c"/g' ''; - inherit meta failureHook; + inherit meta succeedOnFailure keepBuildDirectory; }; coverage = @@ -201,7 +190,7 @@ ''; lcovExtraTraceFiles = [ "guile.info" ]; - inherit failureHook; + inherit succeedOnFailure keepBuildDirectory; meta = meta // { schedulingPriority = "20"; }; }; @@ -227,7 +216,7 @@ echo "doc-pdf manual $out/share/doc/guile/guile.pdf" >> "$out/nix-support/hydra-build-products" ''; buildOutOfSourceTree = true; - inherit meta failureHook; + inherit meta succeedOnFailure keepBuildDirectory; }; # The default build, executed on all platforms. @@ -245,7 +234,7 @@ configureFlags = defaultConfigureFlags pkgs; buildInputs = buildInputsFrom pkgs; buildOutOfSourceTree = true; - inherit meta failureHook; + inherit meta succeedOnFailure keepBuildDirectory; }; # Check what it's like to build with an old compiler. @@ -265,7 +254,7 @@ buildInputs = [ pkgs.gcc34 ] ++ (buildInputsFrom pkgs); buildOutOfSourceTree = true; preUnpack = "gcc --version"; - inherit meta failureHook; + inherit meta succeedOnFailure keepBuildDirectory; }; # Check what it's like to build with an old compiler. @@ -293,7 +282,7 @@ buildInputs = buildInputsFrom pkgs; buildOutOfSourceTree = true; patches = [ ./tinycc-isnan.patch ]; - inherit meta failureHook; + inherit meta succeedOnFailure keepBuildDirectory; }; } _______________________________________________ nix-commits mailing list [email protected] http://mail.cs.uu.nl/mailman/listinfo/nix-commits
