diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/common.sh.in | 2 | ||||
| -rw-r--r-- | tests/lang/imported.nix | 2 | ||||
| -rw-r--r-- | tests/multiple-outputs.sh | 4 | ||||
| -rw-r--r-- | tests/nix-copy-closure.nix | 2 | ||||
| -rw-r--r-- | tests/timeout.builder.sh | 2 | ||||
| -rw-r--r-- | tests/timeout.sh | 2 | ||||
| -rw-r--r-- | tests/user-envs.sh | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/tests/common.sh.in b/tests/common.sh.in index 3862aafcf670..4565a490adfd 100644 --- a/tests/common.sh.in +++ b/tests/common.sh.in @@ -66,7 +66,7 @@ clearCacheCache() { startDaemon() { # Start the daemon, wait for the socket to appear. !!! - # 'nix-daemon' should have an option to fork into the background. + # ‘nix-daemon’ should have an option to fork into the background. rm -f $NIX_STATE_DIR/daemon-socket/socket nix-daemon & for ((i = 0; i < 30; i++)); do diff --git a/tests/lang/imported.nix b/tests/lang/imported.nix index f5c790293ff4..fb39ee4efacd 100644 --- a/tests/lang/imported.nix +++ b/tests/lang/imported.nix @@ -1,3 +1,3 @@ -# The function 'range' comes from lib.nix and was added to the lexical +# The function ‘range’ comes from lib.nix and was added to the lexical # scope by scopedImport. range 1 5 ++ import ./imported2.nix diff --git a/tests/multiple-outputs.sh b/tests/multiple-outputs.sh index 068bd20b149e..7ac77908151c 100644 --- a/tests/multiple-outputs.sh +++ b/tests/multiple-outputs.sh @@ -3,7 +3,7 @@ source common.sh clearStore # Test whether read-only evaluation works when referring to the -# 'drvPath' attribute. +# ‘drvPath’ attribute. echo "evaluating c..." #drvPath=$(nix-instantiate multiple-outputs.nix -A c --readonly-mode) @@ -14,7 +14,7 @@ drvPath=$(nix-instantiate multiple-outputs.nix -A c) grep -q 'multiple-outputs-a.drv",\["first","second"\]' $drvPath grep -q 'multiple-outputs-b.drv",\["out"\]' $drvPath -# While we're at it, test the 'unsafeDiscardOutputDependency' primop. +# While we're at it, test the ‘unsafeDiscardOutputDependency’ primop. outPath=$(nix-build multiple-outputs.nix -A d --no-out-link) drvPath=$(cat $outPath/drv) outPath=$(nix-store -q $drvPath) diff --git a/tests/nix-copy-closure.nix b/tests/nix-copy-closure.nix index 177714839ca7..44126dd64e47 100644 --- a/tests/nix-copy-closure.nix +++ b/tests/nix-copy-closure.nix @@ -1,4 +1,4 @@ -# Test 'nix-copy-closure'. +# Test ‘nix-copy-closure’. { system, nix }: diff --git a/tests/timeout.builder.sh b/tests/timeout.builder.sh index 7e72fe1a8c59..3fbdd57946ad 100644 --- a/tests/timeout.builder.sh +++ b/tests/timeout.builder.sh @@ -1,2 +1,2 @@ -echo "'timeout' builder entering an infinite loop" +echo "‘timeout’ builder entering an infinite loop" while true ; do echo -n .; done diff --git a/tests/timeout.sh b/tests/timeout.sh index 7d8f4daea560..2ebd06b9330c 100644 --- a/tests/timeout.sh +++ b/tests/timeout.sh @@ -5,7 +5,7 @@ source common.sh failed=0 messages="`nix-build -Q timeout.nix --timeout 2 2>&1 || failed=1`" if [ $failed -ne 0 ]; then - echo "error: 'nix-store' succeeded; should have timed out" + echo "error: ‘nix-store’ succeeded; should have timed out" exit 1 fi diff --git a/tests/user-envs.sh b/tests/user-envs.sh index 18d9cf762632..c4192fdc59b2 100644 --- a/tests/user-envs.sh +++ b/tests/user-envs.sh @@ -164,7 +164,7 @@ nix-env -q '*' | grep -q bar-0.1.1 # Test priorities: foo-0.1 has a lower priority than foo-1.0, so it # should be possible to install both without a collision. Also test -# '--set-flag priority' to manually override the declared priorities. +# ‘--set-flag priority’ to manually override the declared priorities. nix-env -e '*' nix-env -i foo-0.1 foo-1.0 [ "$($profiles/test/bin/foo)" = "foo-1.0" ] |