aboutsummaryrefslogtreecommitdiff
path: root/tests/lang
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2018-02-21 15:34:40 +0100
committerEelco Dolstra <edolstra@gmail.com>2018-02-21 15:35:28 +0100
commite2d71bd1862cdda65f957c6a6c41016258d9e003 (patch)
tree7c13f993b0b5952ac398449e49f594b1391cd9ca /tests/lang
parenta6c497f526489cc550240575ea7ab37c07785e55 (diff)
Revert "libexpr: Fix prim_replaceStrings() to work on an empty source string"
This reverts commit 4ea9707591beceacf9988b3c185faf50da238403. It causes an infinite loop in Nixpkgs evaluation, e.g. "nix-instantiate -A hello" hung. PR #1886.
Diffstat (limited to 'tests/lang')
-rw-r--r--tests/lang/eval-okay-replacestrings.exp2
-rw-r--r--tests/lang/eval-okay-replacestrings.nix2
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/lang/eval-okay-replacestrings.exp b/tests/lang/eval-okay-replacestrings.exp
index 590c281ac..a2add1b7b 100644
--- a/tests/lang/eval-okay-replacestrings.exp
+++ b/tests/lang/eval-okay-replacestrings.exp
@@ -1 +1 @@
-[ "faabar" "fbar" "fubar" "faboor" "fubar" "XaXbXcX" "X" ]
+[ "faabar" "fbar" "fubar" "faboor" "fubar" ]
diff --git a/tests/lang/eval-okay-replacestrings.nix b/tests/lang/eval-okay-replacestrings.nix
index c84e9269f..6284a0e66 100644
--- a/tests/lang/eval-okay-replacestrings.nix
+++ b/tests/lang/eval-okay-replacestrings.nix
@@ -5,6 +5,4 @@ with builtins;
(replaceStrings ["oo"] ["u"] "foobar")
(replaceStrings ["oo" "a"] ["a" "oo"] "foobar")
(replaceStrings ["oo" "oo"] ["u" "i"] "foobar")
- (replaceStrings [""] ["X"] "abc")
- (replaceStrings [""] ["X"] "")
]