Hmm, this removes the test which was introduced here:
https://issues.apache.org/jira/browse/THRIFT-2647
see commit:
https://git-wip-us.apache.org/repos/asf?p=thrift.git;a=commitdiff;h=16c164ed3054b4edc65992a2b781307116fbca56
-roger
Quoting jfarr...@apache.org:
Repository: thrift
Updated Branches:
refs/heads/master 2c7eb9ee6 -> 5d4953fc4
THRIFT-2764: Haskell does not build/test when using the Trusty Vagrantfile
Client: build
Patch: jfarrell
Fix hs to compile and run all tests
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/5d4953fc
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/5d4953fc
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/5d4953fc
Branch: refs/heads/master
Commit: 5d4953fc4c90445807e1b52f3a2f6c915d82dd42
Parents: 2c7eb9e
Author: jfarrell <jfarr...@apache.org>
Authored: Wed Oct 8 23:21:19 2014 -0400
Committer: jfarrell <jfarr...@apache.org>
Committed: Wed Oct 8 23:21:19 2014 -0400
----------------------------------------------------------------------
lib/hs/Makefile.am | 13 +++++++------
test/hs/Makefile.am | 6 ++----
test/hs/NameConflictTest_Main.hs | 20 --------------------
3 files changed, 9 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/5d4953fc/lib/hs/Makefile.am
----------------------------------------------------------------------
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:
http://git-wip-us.apache.org/repos/asf/thrift/blob/5d4953fc/test/hs/Makefile.am
----------------------------------------------------------------------
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 @@ 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
http://git-wip-us.apache.org/repos/asf/thrift/blob/5d4953fc/test/hs/NameConflictTest_Main.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)