From 65c4a37df026a0f0a297dd2821e1463da7c314ed Mon Sep 17 00:00:00 2001 From: "Paolo G. Giarrusso" Date: Thu, 21 Jul 2016 02:23:59 +0200 Subject: [PATCH] Revert "integration-tests: disable failing unicode package name on OS X, for now (#1810)" This reverts commit 87fec57bce65934d30022b6b16b714c8b9d8db35, now that we have a proper fix. --- test/integration/lib/StackTest.hs | 3 --- test/integration/tests/1336-1337-new-package-names/Main.hs | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/test/integration/lib/StackTest.hs b/test/integration/lib/StackTest.hs index 137ed4c90d..eda29d15ae 100644 --- a/test/integration/lib/StackTest.hs +++ b/test/integration/lib/StackTest.hs @@ -122,9 +122,6 @@ exeExt = if isWindows then ".exe" else "" -- | Is the OS Windows? isWindows = os == "mingw32" --- | Is the OS Mac OS X? -isMacOSX = os == "darwin" - -- | To avoid problems with GHC version mismatch when a new LTS major -- version is released, pass this argument to @stack@ when running in -- a global context. The LTS major version here should match that of diff --git a/test/integration/tests/1336-1337-new-package-names/Main.hs b/test/integration/tests/1336-1337-new-package-names/Main.hs index 02c6f9bab7..8f091b6fb6 100644 --- a/test/integration/tests/1336-1337-new-package-names/Main.hs +++ b/test/integration/tests/1336-1337-new-package-names/Main.hs @@ -1,5 +1,4 @@ import StackTest -import Control.Monad import System.Directory import System.FilePath @@ -18,7 +17,7 @@ main = stackErr ["new", "44444444444444"] stackErr ["new", "abc-1"] stackErr ["new", "444-ば日本-4本"] - unless isMacOSX $ stack ["new", "ば日本-4本"] + stack ["new", "ば日本-4本"] stack ["new", "אבהץש"] stack ["new", "ΔΘΩϬ"] doesExist "./ΔΘΩϬ/stack.yaml"