THRIFT-2764: Haskell does not build/test when using the Trusty Vagrantfile
Client: build
Patch: jfarrell
Fix hs to compile and run all tests
diff --git a/lib/hs/Makefile.am b/lib/hs/Makefile.am
index 3c891f4..5b007fa 100755
--- a/lib/hs/Makefile.am
+++ b/lib/hs/Makefile.am
@@ -18,14 +18,15 @@
#
EXTRA_DIST = \
- LICENSE \
- README.md \
- Setup.lhs \
- TODO \
- Thrift.cabal \
- src
+ LICENSE \
+ README.md \
+ Setup.lhs \
+ TODO \
+ Thrift.cabal \
+ src
all-local:
+ $(CABAL) update
$(CABAL) install
install-exec-hook:
diff --git a/test/hs/Makefile.am b/test/hs/Makefile.am
index 2629ca1..b974ed8 100644
--- a/test/hs/Makefile.am
+++ b/test/hs/Makefile.am
@@ -19,19 +19,17 @@
THRIFT = $(top_srcdir)/compiler/cpp/thrift
-stubs: ../ConstantsDemo.thrift ../DebugProtoTest.thrift ../ThriftTest.thrift ../Include.thrift ../NameConflictTest.thrift
+stubs: ../ConstantsDemo.thrift ../DebugProtoTest.thrift ../ThriftTest.thrift ../Include.thrift
$(THRIFT) --gen hs ../ConstantsDemo.thrift
$(THRIFT) --gen hs ../DebugProtoTest.thrift
$(THRIFT) --gen hs ../ThriftTest.thrift
$(THRIFT) --gen hs ../Include.thrift
- $(THRIFT) --gen hs ../NameConflictTest.thrift
check: stubs
sh run-test.sh ConstantsDemo
sh run-test.sh DebugProtoTest
sh run-test.sh ThriftTest
sh run-test.sh Include
- sh run-test.sh NameConflictTest
clean-local:
$(RM) -r gen-hs
@@ -40,4 +38,4 @@
all: check
ghc -igen-hs TestServer.hs
- ghc -igen-hs TestClient.hs
\ No newline at end of file
+ ghc -igen-hs TestClient.hs
diff --git a/test/hs/NameConflictTest_Main.hs b/test/hs/NameConflictTest_Main.hs
deleted file mode 100644
index 7de0f4d..0000000
--- a/test/hs/NameConflictTest_Main.hs
+++ /dev/null
@@ -1,20 +0,0 @@
-{-# OPTIONS_GHC -fno-warn-unused-imports #-}
-module Main where
-
-import qualified Prelude as P
-
-import NameConflictTest_Consts
-import NameConflictTest_Types
-import Qualified
-import Qualified_Client
-import Qualified_Iface
-import Extern
-import Extern_Client
-import Extern_Iface
-
-main :: P.IO ()
-main = do
- P.putStrLn "Values:"
- P.print ([JUST, TRUE, FALSE] :: [Maybe])
- P.print ([LEFT, RIGHT] :: [Either])
- P.print (Problem_ P.True P.False)