You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2014/08/10 21:14:54 UTC
[3/3] git commit: THRIFT-2641 Improvements to Haskell
Compiler/Libraries
THRIFT-2641 Improvements to Haskell Compiler/Libraries
some fixes
Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/862218ec
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/862218ec
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/862218ec
Branch: refs/heads/master
Commit: 862218ec1380e62ed413bb3c25a9f6b72d154212
Parents: af5d64a
Author: Roger Meier <ro...@apache.org>
Authored: Sun Aug 10 21:13:58 2014 +0200
Committer: Roger Meier <ro...@apache.org>
Committed: Sun Aug 10 21:13:58 2014 +0200
----------------------------------------------------------------------
lib/hs/src/Thrift/Transport/Handle.hs | 4 ++--
test/hs/run-test.sh | 2 +-
test/test.sh | 1 -
3 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/thrift/blob/862218ec/lib/hs/src/Thrift/Transport/Handle.hs
----------------------------------------------------------------------
diff --git a/lib/hs/src/Thrift/Transport/Handle.hs b/lib/hs/src/Thrift/Transport/Handle.hs
index d6cfe31..b7d16e4 100644
--- a/lib/hs/src/Thrift/Transport/Handle.hs
+++ b/lib/hs/src/Thrift/Transport/Handle.hs
@@ -44,8 +44,8 @@ import Data.Monoid
instance Transport Handle where
tIsOpen = hIsOpen
tClose = hClose
- tRead h n = LBS.hGet h n `catch` handleEOF mempty
- tPeek h = (Just . c2w <$> hLookAhead h) `catch` handleEOF Nothing
+ tRead h n = LBS.hGet h n `Control.Exception.catch` handleEOF mempty
+ tPeek h = (Just . c2w <$> hLookAhead h) `Control.Exception.catch` handleEOF Nothing
tWrite = LBS.hPut
tFlush = hFlush
http://git-wip-us.apache.org/repos/asf/thrift/blob/862218ec/test/hs/run-test.sh
----------------------------------------------------------------------
diff --git a/test/hs/run-test.sh b/test/hs/run-test.sh
index 46b8b2c..ecafc18 100755
--- a/test/hs/run-test.sh
+++ b/test/hs/run-test.sh
@@ -40,4 +40,4 @@ if [ ! -e $TEST_SOURCE_FILE ]; then
fi
printf "Running test... \n"
-runhaskell -Wall -i$BASE/lib/hs/src -igen-hs $TEST_SOURCE_FILE
+runhaskell -Wall -XScopedTypeVariables -i$BASE/lib/hs/src -igen-hs $TEST_SOURCE_FILE
http://git-wip-us.apache.org/repos/asf/thrift/blob/862218ec/test/test.sh
----------------------------------------------------------------------
diff --git a/test/test.sh b/test/test.sh
index 5d06e47..3a28429 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -275,7 +275,6 @@ for proto in $(intersection "${hs_protocols}" "${java_protocols}"); do
do_test "hs-java" "${proto}" "${trans}-${sock}" \
"hs/TestClient --protocol ${proto} --transport ${trans} ${extraparam}" \
"ant -f ../lib/java/build.xml -Dno-gen-thrift=\"\" -Dtestargs \"--protocol=${proto} --transport=${trans} ${extraparam}\" run-testserver" \
- "cpp/TestServer --protocol=${proto} --transport=${trans} ${extraparam}" \
"5" "1"
done
done