You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by br...@apache.org on 2009/03/24 01:36:00 UTC
svn commit: r757620 - in /incubator/thrift/trunk/test/hs: runclient.sh
runserver.sh
Author: bryanduxbury
Date: Tue Mar 24 00:36:00 2009
New Revision: 757620
URL: http://svn.apache.org/viewvc?rev=757620&view=rev
Log:
THRIFT-392. hs: Make test scripts easier to use
Modified:
incubator/thrift/trunk/test/hs/runclient.sh
incubator/thrift/trunk/test/hs/runserver.sh
Modified: incubator/thrift/trunk/test/hs/runclient.sh
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/hs/runclient.sh?rev=757620&r1=757619&r2=757620&view=diff
==============================================================================
--- incubator/thrift/trunk/test/hs/runclient.sh (original)
+++ incubator/thrift/trunk/test/hs/runclient.sh Tue Mar 24 00:36:00 2009
@@ -1,2 +1,11 @@
-#!/bin/bash
-ghci -fglasgow-exts -i/home/iproctor/code/projects/thrift/trunk/lib/hs/src -igen-hs Client.hs
+#!/bin/sh
+
+if [ -z $BASE_PKG ]; then
+ BASE_PKG=`ghc-pkg --simple-output list base-3* | sed -e "s/.*\(base-3\(.[0-9]\){3}\).*/\1/"`
+fi
+
+if [ -z $BASE ]; then
+ BASE=../..
+fi
+
+ghci -fglasgow-exts -package $BASE_PKG -hide-package syb -i$BASE/lib/hs/src -i$BASE/test/hs/gen-hs Client.hs
Modified: incubator/thrift/trunk/test/hs/runserver.sh
URL: http://svn.apache.org/viewvc/incubator/thrift/trunk/test/hs/runserver.sh?rev=757620&r1=757619&r2=757620&view=diff
==============================================================================
--- incubator/thrift/trunk/test/hs/runserver.sh (original)
+++ incubator/thrift/trunk/test/hs/runserver.sh Tue Mar 24 00:36:00 2009
@@ -1,2 +1,12 @@
-#!/bin/bash
-ghci -fglasgow-exts -i/home/iproctor/code/projects/thrift/trunk/lib/hs/src -igen-hs Server.hs
+#!/bin/sh
+
+if [ -z $BASE_PKG ]; then
+ BASE_PKG=`ghc-pkg --simple-output list base-3* | sed -e "s/.*\(base-3\(.[0-9]\){3}\).*/\1/"`
+fi
+
+if [ -z $BASE ]; then
+ BASE=../..
+fi
+
+printf "Starting server... "
+ghc -fglasgow-exts -package $BASE_PKG -hide-package syb -i$BASE/lib/hs/src -i$BASE/test/hs/gen-hs Server.hs -e "putStrLn \"ready.\" >> Server.main"