diff options
| author | jfarrell <jfarrell@apache.org> | 2014-10-08 23:21:19 -0400 |
|---|---|---|
| committer | jfarrell <jfarrell@apache.org> | 2014-10-08 23:21:19 -0400 |
| commit | 5d4953fc4c90445807e1b52f3a2f6c915d82dd42 (patch) | |
| tree | d956a14339b88e842b15e3be50cd4bf3f2dd5c2f | |
| parent | 2c7eb9ee60e5e8235f2c756ca67778a765ba019f (diff) | |
| download | thrift-5d4953fc4c90445807e1b52f3a2f6c915d82dd42.tar.gz | |
THRIFT-2764: Haskell does not build/test when using the Trusty Vagrantfile
Client: build
Patch: jfarrell
Fix hs to compile and run all tests
| -rwxr-xr-x | lib/hs/Makefile.am | 13 | ||||
| -rw-r--r-- | test/hs/Makefile.am | 6 | ||||
| -rw-r--r-- | test/hs/NameConflictTest_Main.hs | 20 |
3 files changed, 9 insertions, 30 deletions
diff --git a/lib/hs/Makefile.am b/lib/hs/Makefile.am index 3c891f44d..5b007faa8 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 2629ca166..b974ed82f 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 @@ clean-local: 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 7de0f4dc9..000000000 --- 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) |