Add a test for --max-silent-time
This commit is contained in:
parent
cc3b93c991
commit
90ee1e3fe3
3 changed files with 24 additions and 7 deletions
|
@ -1,2 +0,0 @@
|
|||
echo "‘timeout’ builder entering an infinite loop"
|
||||
while true ; do echo -n .; done
|
|
@ -1,6 +1,20 @@
|
|||
with import ./config.nix;
|
||||
|
||||
mkDerivation {
|
||||
name = "timeout";
|
||||
builder = ./timeout.builder.sh;
|
||||
{
|
||||
|
||||
infiniteLoop = mkDerivation {
|
||||
name = "timeout";
|
||||
buildCommand = ''
|
||||
echo "‘timeout’ builder entering an infinite loop"
|
||||
while true ; do echo -n .; done
|
||||
'';
|
||||
};
|
||||
|
||||
silent = mkDerivation {
|
||||
name = "silent";
|
||||
buildCommand = ''
|
||||
sleep 60
|
||||
'';
|
||||
};
|
||||
|
||||
}
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
source common.sh
|
||||
|
||||
failed=0
|
||||
messages="`nix-build -Q timeout.nix --timeout 2 2>&1 || failed=1`"
|
||||
messages="`nix-build -Q timeout.nix -A infiniteLoop --timeout 2 2>&1 || failed=1`"
|
||||
if [ $failed -ne 0 ]; then
|
||||
echo "error: ‘nix-store’ succeeded; should have timed out"
|
||||
exit 1
|
||||
|
@ -15,7 +15,12 @@ if ! echo "$messages" | grep -q "timed out"; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
if nix-build -Q timeout.nix --option build-max-log-size 100; then
|
||||
if nix-build -Q timeout.nix -A infiniteLoop --option build-max-log-size 100; then
|
||||
echo "build should have failed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if nix-build timeout.nix -A silent --max-silent-time 2; then
|
||||
echo "build should have failed"
|
||||
exit 1
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue