diff options
| author | Shea Levy <shea@shealevy.com> | 2011-11-06T00·13+0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2011-11-06T00·13+0000 |
| commit | 2721e9f56f92f5bd630dcbb0104fc56159cb28d4 (patch) | |
| tree | f46ac1a8807b81cc54d176e8fb72915aa057f0ac /tests/timeout.sh | |
| parent | bffe35acedafcd7c7237cb1415798362bff8a180 (diff) | |
| parent | a6a3f3a8c26fdd6900880c13e924e6879d6c714c (diff) | |
Merge from trunk
Diffstat (limited to 'tests/timeout.sh')
| -rw-r--r-- | tests/timeout.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/timeout.sh b/tests/timeout.sh index f27739fb2b52..2101d13a7894 100644 --- a/tests/timeout.sh +++ b/tests/timeout.sh @@ -2,14 +2,14 @@ source common.sh -drvPath=$($nixinstantiate timeout.nix) +drvPath=$(nix-instantiate timeout.nix) -test "$($nixstore -q --binding system "$drvPath")" = "$system" +test "$(nix-store -q --binding system "$drvPath")" = "$system" echo "derivation is $drvPath" failed=0 -messages="`$nixstore -r --timeout 2 $drvPath 2>&1 || failed=1`" +messages="`nix-store -r --timeout 2 $drvPath 2>&1 || failed=1`" if test $failed -ne 0; then echo "error: \`nix-store' succeeded; should have timed out" >&2 exit 1 |