From cd55407949abee58e663cad28945ce48d0fb2a52 Mon Sep 17 00:00:00 2001
From: jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 17 Jan 2010 09:02:57 +0000
Subject: Simplified Makefiles a bit. Added -R options to configure shared
 library runtime search path and not require LD_LIBRARY_PATH anymore.
 Refactored test shell scripts and added a store-cpp integration test.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@900073 13f79535-47bb-0310-9956-ffa450edef68
---
 sca-cpp/trunk/test/store-scheme/server-test | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

(limited to 'sca-cpp/trunk/test/store-scheme/server-test')

diff --git a/sca-cpp/trunk/test/store-scheme/server-test b/sca-cpp/trunk/test/store-scheme/server-test
index bb327347a8..64315d7d92 100755
--- a/sca-cpp/trunk/test/store-scheme/server-test
+++ b/sca-cpp/trunk/test/store-scheme/server-test
@@ -20,21 +20,7 @@
 echo "Testing..."
 
 # Setup
-../../modules/http/httpd-conf tmp 8090 htdocs
-../../modules/server/server-conf tmp
-../../modules/server/scheme-conf tmp
-cat >>tmp/conf/httpd.conf <<EOF
-
-<Location />
-SCAContribution `pwd`/
-SCAComposite store.composite
-</Location>
-EOF
-
-apachectl -k start -d `pwd`/tmp
-
-mc="memcached -l 127.0.0.1 -m 4 -p 11211"
-$mc &
+./start
 sleep 2
 
 # Test HTTP GET
@@ -43,9 +29,9 @@ diff tmp/store.html htdocs/store.html
 rc=$?
 
 # Cleanup
-apachectl -k stop -d `pwd`/tmp
-kill `ps -f | grep -v grep | grep "$mc" | awk '{ print $2 }'`
+./stop
 sleep 2
+
 if [ "$rc" = "0" ]; then
     echo "OK"
 fi
-- 
cgit v1.2.3