From 81504de8bdd74d13d055dee254c543e6079084a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Mon, 5 May 2014 09:26:56 +0200 Subject: [PATCH] spec: Be more forgiving for ghc opts in `getCompilerOptions` --- test/CabalApiSpec.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/CabalApiSpec.hs b/test/CabalApiSpec.hs index 00e78ab..46b6b8e 100644 --- a/test/CabalApiSpec.hs +++ b/test/CabalApiSpec.hs @@ -37,8 +37,8 @@ spec = do , includeDirs = map (toRelativeDir dir) (includeDirs res) } if ghcVersion < 706 - then ghcOptions res' `shouldBe` ["-global-package-conf", "-no-user-package-conf","-package-conf",cwd "test/data/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d","-XHaskell98"] - else ghcOptions res' `shouldBe` ["-global-package-db", "-no-user-package-db","-package-db",cwd "test/data/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d","-XHaskell98","-optP-include","-optP" ++ cwd "test/data/dist/build/autogen/cabal_macros.h"] + then ghcOptions res' `shouldContain` ["-global-package-conf", "-no-user-package-conf","-package-conf",cwd "test/data/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d","-XHaskell98"] + else ghcOptions res' `shouldContain` ["-global-package-db", "-no-user-package-db","-package-db",cwd "test/data/.cabal-sandbox/i386-osx-ghc-7.6.3-packages.conf.d","-XHaskell98"] includeDirs res' `shouldBe` ["test/data","test/data/dist/build","test/data/dist/build/autogen","test/data/subdir1/subdir2","test/data/test"] (pkgName `map` depPackages res') `shouldContain` ["Cabal"]