From 54f9f998bc8eaa4b05be88b9b39a0cffbc70a070 Mon Sep 17 00:00:00 2001
From: Emanuel Borsboom <manny@fpcomplete.com>
Date: Wed, 4 May 2016 04:23:41 -0700
Subject: [PATCH] Integration tests: use lts-5

---
 etc/scripts/release.hs                                          | 2 +-
 test/integration/lib/StackTest.hs                               | 2 +-
 test/integration/tests/1337-unicode-everywhere/files/stack.yaml | 2 +-
 test/integration/tests/1884-url-to-tarball/files/stack.yaml     | 2 +-
 test/integration/tests/32-unlisted-module/files/stack.yaml      | 2 +-
 test/integration/tests/335-multi-package-flags/files/stack.yaml | 2 +-
 test/integration/tests/345-override-bytestring/files/stack.yaml | 2 +-
 test/integration/tests/365-invalid-success/files/stack.yaml     | 2 +-
 test/integration/tests/366-non-root-dir/files/stack.yaml        | 2 +-
 .../tests/397-case-insensitive-flags/files/stack.yaml           | 2 +-
 .../tests/606-local-version-not-exist/files/stack.yaml          | 2 +-
 test/integration/tests/763-buildable-false/files/stack.yaml     | 2 +-
 test/integration/tests/duplicate-package-ids/files/stack1.yaml  | 2 +-
 test/integration/tests/duplicate-package-ids/files/stack2.yaml  | 2 +-
 test/integration/tests/multi-test/files/stack.yaml              | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/etc/scripts/release.hs b/etc/scripts/release.hs
index 85e01b0b..06ba18d8 100644
--- a/etc/scripts/release.hs
+++ b/etc/scripts/release.hs
@@ -159,7 +159,7 @@ rules global@Global{..} args = do
                     ["--local-bin-path=" ++ tmpDir]
             () <- cmd0 $ concat $ concat
                 [["install --pedantic --no-haddock-deps"], [" --haddock" | gTestHaddocks]]
-            () <- cmd0 "install --resolver=lts-4.0 cabal-install"
+            () <- cmd0 "install --resolver=lts-5.0 cabal-install"
             let cmd' = cmd (AddPath [tmpDir] []) stackProgName (stackArgs global) gBuildArgs
             () <- cmd' "test --pedantic --flag stack:integration-tests"
             return ()
diff --git a/test/integration/lib/StackTest.hs b/test/integration/lib/StackTest.hs
index af53c97a..88834132 100644
--- a/test/integration/lib/StackTest.hs
+++ b/test/integration/lib/StackTest.hs
@@ -129,4 +129,4 @@ isMacOSX = os == "darwin"
 -- version is released, pass this argument to @stack@ when running in
 -- a global context.  The LTS major version here should match that of
 -- the main @stack.yaml@.
-defaultResolverArg = "--resolver=lts-4"
+defaultResolverArg = "--resolver=lts-5"
diff --git a/test/integration/tests/1337-unicode-everywhere/files/stack.yaml b/test/integration/tests/1337-unicode-everywhere/files/stack.yaml
index f541e026..94dbf870 100644
--- a/test/integration/tests/1337-unicode-everywhere/files/stack.yaml
+++ b/test/integration/tests/1337-unicode-everywhere/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-4.0
+resolver: lts-5.0
 packages:
 - '.'
 extra-deps: []
diff --git a/test/integration/tests/1884-url-to-tarball/files/stack.yaml b/test/integration/tests/1884-url-to-tarball/files/stack.yaml
index 4809871c..f5fb59b6 100644
--- a/test/integration/tests/1884-url-to-tarball/files/stack.yaml
+++ b/test/integration/tests/1884-url-to-tarball/files/stack.yaml
@@ -1,4 +1,4 @@
 packages:
 - https://hackage.haskell.org/package/half-0.2.2.3/half-0.2.2.3.tar.gz
 extra-deps: []
-resolver: lts-4.0
+resolver: lts-5.0
diff --git a/test/integration/tests/32-unlisted-module/files/stack.yaml b/test/integration/tests/32-unlisted-module/files/stack.yaml
index cd1a4d32..f8a01a5e 100644
--- a/test/integration/tests/32-unlisted-module/files/stack.yaml
+++ b/test/integration/tests/32-unlisted-module/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-4.0
+resolver: lts-5.0
diff --git a/test/integration/tests/335-multi-package-flags/files/stack.yaml b/test/integration/tests/335-multi-package-flags/files/stack.yaml
index cd1a4d32..f8a01a5e 100644
--- a/test/integration/tests/335-multi-package-flags/files/stack.yaml
+++ b/test/integration/tests/335-multi-package-flags/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-4.0
+resolver: lts-5.0
diff --git a/test/integration/tests/345-override-bytestring/files/stack.yaml b/test/integration/tests/345-override-bytestring/files/stack.yaml
index 712ac5ca..d8121294 100644
--- a/test/integration/tests/345-override-bytestring/files/stack.yaml
+++ b/test/integration/tests/345-override-bytestring/files/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-4.0
+resolver: lts-5.0
 extra-deps:
 - bytestring-0.10.6.0
 packages:
diff --git a/test/integration/tests/365-invalid-success/files/stack.yaml b/test/integration/tests/365-invalid-success/files/stack.yaml
index cd1a4d32..f8a01a5e 100644
--- a/test/integration/tests/365-invalid-success/files/stack.yaml
+++ b/test/integration/tests/365-invalid-success/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-4.0
+resolver: lts-5.0
diff --git a/test/integration/tests/366-non-root-dir/files/stack.yaml b/test/integration/tests/366-non-root-dir/files/stack.yaml
index cd1a4d32..f8a01a5e 100644
--- a/test/integration/tests/366-non-root-dir/files/stack.yaml
+++ b/test/integration/tests/366-non-root-dir/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-4.0
+resolver: lts-5.0
diff --git a/test/integration/tests/397-case-insensitive-flags/files/stack.yaml b/test/integration/tests/397-case-insensitive-flags/files/stack.yaml
index 64231b7b..f0abaa26 100644
--- a/test/integration/tests/397-case-insensitive-flags/files/stack.yaml
+++ b/test/integration/tests/397-case-insensitive-flags/files/stack.yaml
@@ -1 +1 @@
-resolver: lts-4.0
+resolver: lts-5.0
diff --git a/test/integration/tests/606-local-version-not-exist/files/stack.yaml b/test/integration/tests/606-local-version-not-exist/files/stack.yaml
index cd1a4d32..f8a01a5e 100644
--- a/test/integration/tests/606-local-version-not-exist/files/stack.yaml
+++ b/test/integration/tests/606-local-version-not-exist/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-4.0
+resolver: lts-5.0
diff --git a/test/integration/tests/763-buildable-false/files/stack.yaml b/test/integration/tests/763-buildable-false/files/stack.yaml
index cd1a4d32..f8a01a5e 100644
--- a/test/integration/tests/763-buildable-false/files/stack.yaml
+++ b/test/integration/tests/763-buildable-false/files/stack.yaml
@@ -2,4 +2,4 @@ flags: {}
 packages:
 - '.'
 extra-deps: []
-resolver: lts-4.0
+resolver: lts-5.0
diff --git a/test/integration/tests/duplicate-package-ids/files/stack1.yaml b/test/integration/tests/duplicate-package-ids/files/stack1.yaml
index 5c7f614e..5729ead8 100644
--- a/test/integration/tests/duplicate-package-ids/files/stack1.yaml
+++ b/test/integration/tests/duplicate-package-ids/files/stack1.yaml
@@ -1,2 +1,2 @@
-resolver: lts-4.0
+resolver: lts-5.0
 packages: []
diff --git a/test/integration/tests/duplicate-package-ids/files/stack2.yaml b/test/integration/tests/duplicate-package-ids/files/stack2.yaml
index c3412904..aa5728e8 100644
--- a/test/integration/tests/duplicate-package-ids/files/stack2.yaml
+++ b/test/integration/tests/duplicate-package-ids/files/stack2.yaml
@@ -1,3 +1,3 @@
-resolver: lts-4.0
+resolver: lts-5.0
 packages:
 - auto-update-0.1.2.1
diff --git a/test/integration/tests/multi-test/files/stack.yaml b/test/integration/tests/multi-test/files/stack.yaml
index d905baf1..3968cd40 100644
--- a/test/integration/tests/multi-test/files/stack.yaml
+++ b/test/integration/tests/multi-test/files/stack.yaml
@@ -4,4 +4,4 @@ packages:
 - sub-package
 - cyclic
 extra-deps: []
-resolver: lts-4.0
+resolver: lts-5.0