commit 01ede042aad2d44a0dbe11818dabef7897e04db4
author Nobuaki Sukegawa <nsukeg@gmail.com> Tue Sep 29 02:16:53 2015 +0900
committer Roger Meier <roger@apache.org> Mon Sep 28 20:38:37 2015 +0200
tree c526ea0bf4a1317ff8cec2a9b0c6c01c341bb370
parent f2c9f1b968f2b5716cf6b96b36e133cd7e07cde6

THRIFT-3360 Improve cross test servers and clients further

This closes #629

test/hs/Makefile.am

diff --git a/test/hs/Makefile.am b/test/hs/Makefile.am
index e171248..b41a391 100644
--- a/test/hs/Makefile.am
+++ b/test/hs/Makefile.am
@@ -39,3 +39,5 @@
 all-local: stubs
 	ghc -igen-hs TestServer.hs
 	ghc -igen-hs TestClient.hs
+
+precross: all-local

test/hs/TestServer.hs

diff --git a/test/hs/TestServer.hs b/test/hs/TestServer.hs
index a880a5e..90ec11e 100755
--- a/test/hs/TestServer.hs
+++ b/test/hs/TestServer.hs
@@ -235,7 +235,7 @@
     System.IO.putStrLn $ "testMultiException(" ++ show s1 ++ ", " ++ show s2 ++  ")"
     case s1 of
       "Xception"   -> throw $ Xception 1001 "This is an Xception"
-      "Xception2"  -> throw $ Xception2 2002 default_Xtruct
+      "Xception2"  -> throw $ Xception2 2002 $ Xtruct "This is an Xception2" 0 0 0
       "TException" -> throw ThriftException
       _ -> return default_Xtruct{ xtruct_string_thing = s2 }