[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
16/376: Fix test
From: |
Ludovic Courtès |
Subject: |
16/376: Fix test |
Date: |
Wed, 28 Jan 2015 22:03:44 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit ceed8192848760430c9c23659f9cb979aad1f9c3
Author: Eelco Dolstra <address@hidden>
Date: Thu May 29 19:04:27 2014 +0200
Fix test
---
tests/lang/eval-okay-search-path.exp | 2 +-
tests/lang/eval-okay-search-path.nix | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/lang/eval-okay-search-path.exp
b/tests/lang/eval-okay-search-path.exp
index ad05904..4519bc4 100644
--- a/tests/lang/eval-okay-search-path.exp
+++ b/tests/lang/eval-okay-search-path.exp
@@ -1 +1 @@
-"abcca"
+"abccX"
diff --git a/tests/lang/eval-okay-search-path.nix
b/tests/lang/eval-okay-search-path.nix
index e0f433f..f48bf3f 100644
--- a/tests/lang/eval-okay-search-path.nix
+++ b/tests/lang/eval-okay-search-path.nix
@@ -8,4 +8,4 @@ assert length (filter (x: x.prefix == "nix") nixPath) == 1;
assert length (filter (x: baseNameOf x.path == "dir4") nixPath) == 1;
import <a.nix> + import <b.nix> + import <c.nix> + import <dir5/c.nix>
- + (let nixPath = [ { path = ./dir1; } { path = ./dir2; } ]; in import
<a.nix>)
+ + (let nixPath = [ { path = ./dir2; } { path = ./dir1; } ]; in import
<a.nix>)
- 12/376: dev-shell is a bash script, not sh, (continued)
- 12/376: dev-shell is a bash script, not sh, Ludovic Courtès, 2015/01/28
- 09/376: Make the Nix search path declarative, Ludovic Courtès, 2015/01/28
- 03/376: Disable parallel.sh test, Ludovic Courtès, 2015/01/28
- 10/376: Remove ExprBuiltin, Ludovic Courtès, 2015/01/28
- 02/376: nix-store -l: Fetch build logs from the Internet, Ludovic Courtès, 2015/01/28
- 13/376: nix-build: --add-root also takes 1 parameter, Ludovic Courtès, 2015/01/28
- 07/376: Add constant ‘nixPath’, Ludovic Courtès, 2015/01/28
- 17/376: nix-env -qa --json: Generate valid JSON even if there are invalid meta attrs, Ludovic Courtès, 2015/01/28
- 14/376: Use std::unordered_set, Ludovic Courtès, 2015/01/28
- 15/376: Sort nixPath attributes, Ludovic Courtès, 2015/01/28
- 16/376: Fix test,
Ludovic Courtès <=
- 21/376: Add autoloads, make code more concise & idiomatic, Ludovic Courtès, 2015/01/28
- 18/376: Print a warning when loading a large path into memory, Ludovic Courtès, 2015/01/28
- 19/376: Report daemon OOM better, Ludovic Courtès, 2015/01/28
- 22/376: Share code between scopedImport and import, Ludovic Courtès, 2015/01/28
- 28/376: Only add the importNative primop if the allow-arbitrary-code-during-evaluation option is true (default false), Ludovic Courtès, 2015/01/28
- 26/376: Don't use member initialisers, Ludovic Courtès, 2015/01/28
- 27/376: Add importNative primop, Ludovic Courtès, 2015/01/28
- 29/376: Merge branch 'shlevy-import-native', Ludovic Courtès, 2015/01/28
- 20/376: == operator: Ignore string context, Ludovic Courtès, 2015/01/28
- 30/376: allow-arbitrary-code-during-evaluation -> allow-unsafe-native-code-during-evaluation, Ludovic Courtès, 2015/01/28