From d37e1592d415e72b9fc37dd76dfc8d61054108c1 Mon Sep 17 00:00:00 2001
From: Kazu Yamamoto <kazu@iij.ad.jp>
Date: Thu, 5 Sep 2013 16:47:52 +0900
Subject: [PATCH] test for Cabal 1.18.0.

---
 test/CradleSpec.hs                            |  8 +++---
 .../i386-osx-ghc-7.6.3-packages.conf.d}/dummy |  0
 test/data/cabal.sandbox.config                | 25 +++++++++++++++++++
 3 files changed, 29 insertions(+), 4 deletions(-)
 rename test/data/{cabal-dev/packages-7.6.2.conf => .cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d}/dummy (100%)
 create mode 100644 test/data/cabal.sandbox.config

diff --git a/test/CradleSpec.hs b/test/CradleSpec.hs
index e0c269e..da5a222 100644
--- a/test/CradleSpec.hs
+++ b/test/CradleSpec.hs
@@ -35,23 +35,23 @@ spec = do
 
         it "finds a sandbox" $ do
             withDirectory "test/data/subdir1/subdir2" $ \dir -> do
-                res <- relativeCradle dir <$> findCradle Nothing "7.6.2"
+                res <- relativeCradle dir <$> findCradle Nothing "7.6.3"
                 res `shouldBe` Cradle {
                     cradleCurrentDir = "test" </> "data" </> "subdir1" </> "subdir2"
                   , cradleCabalDir = Just ("test" </> "data")
                   , cradleCabalFile = Just ("test" </> "data" </> "cabalapi.cabal")
-                  , cradlePackageConf = Just ("test" </> "data" </> "cabal-dev" </> "packages-7.6.2.conf")
+                  , cradlePackageConf = Just ("test" </> "data" </> ".cabal-sandbox" </> "i386-osx-ghc-7.6.3-packages.conf.d")
                   }
 
         it "finds a sandbox if exists" $ do
             withDirectory "/" $ \dir -> do
                 curDir <- canonicalizePath "/"
-                res <- relativeCradle dir <$> findCradle (Just $ addTrailingPathSeparator dir ++ ("test" </> "data" </> "cabal-dev")) "7.6.2"
+                res <- relativeCradle dir <$> findCradle (Just $ addTrailingPathSeparator dir ++ ("test" </> "data" </> ".cabal-sandbox")) "7.6.3"
                 res `shouldBe` Cradle {
                     cradleCurrentDir = curDir
                   , cradleCabalDir = Nothing
                   , cradleCabalFile = Nothing
-                  , cradlePackageConf = Just ("test" </> "data" </> "cabal-dev" </> "packages-7.6.2.conf")
+                  , cradlePackageConf = Just ("test" </> "data" </> ".cabal-sandbox" </> "i386-osx-ghc-7.6.3-packages.conf.d")
                   }
 
         it "throws an error if the sandbox does not exist" $ do
diff --git a/test/data/cabal-dev/packages-7.6.2.conf/dummy b/test/data/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d/dummy
similarity index 100%
rename from test/data/cabal-dev/packages-7.6.2.conf/dummy
rename to test/data/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d/dummy
diff --git a/test/data/cabal.sandbox.config b/test/data/cabal.sandbox.config
new file mode 100644
index 0000000..3b7feaf
--- /dev/null
+++ b/test/data/cabal.sandbox.config
@@ -0,0 +1,25 @@
+-- This is a Cabal package environment file.
+-- THIS FILE IS AUTO-GENERATED. DO NOT EDIT DIRECTLY.
+-- Please create a 'cabal.config' file in the same directory
+-- if you want to change the default settings for this sandbox.
+
+
+local-repo: /Users/kazu/work/ghc-mod/test/data/.cabal-sandbox/packages
+logs-dir: /Users/kazu/work/ghc-mod/test/data/.cabal-sandbox/logs
+world-file: /Users/kazu/work/ghc-mod/test/data/.cabal-sandbox/world
+user-install: False
+package-db: /Users/kazu/work/ghc-mod/test/data/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d
+build-summary: /Users/kazu/work/ghc-mod/test/data/.cabal-sandbox/logs/build.log
+
+install-dirs 
+  prefix: /Users/kazu/work/ghc-mod/test/data/.cabal-sandbox
+  bindir: $prefix/bin
+  libdir: $prefix/lib
+  libsubdir: $arch-$os-$compiler/$pkgid
+  libexecdir: $prefix/libexec
+  datadir: $prefix/share
+  datasubdir: $arch-$os-$compiler/$pkgid
+  docdir: $datadir/doc/$arch-$os-$compiler/$pkgid
+  htmldir: $docdir/html
+  haddockdir: $htmldir
+  sysconfdir: $prefix/etc