diff options
Diffstat (limited to 'sca-cpp/trunk/test')
| -rwxr-xr-x | sca-cpp/trunk/test/store-cpp/start | 5 | ||||
| -rwxr-xr-x | sca-cpp/trunk/test/store-cpp/stop | 4 | ||||
| -rwxr-xr-x | sca-cpp/trunk/test/store-java/start | 5 | ||||
| -rwxr-xr-x | sca-cpp/trunk/test/store-java/stop | 4 | ||||
| -rwxr-xr-x | sca-cpp/trunk/test/store-python/start | 5 | ||||
| -rwxr-xr-x | sca-cpp/trunk/test/store-python/stop | 4 | ||||
| -rwxr-xr-x | sca-cpp/trunk/test/store-scheme/start | 5 | ||||
| -rwxr-xr-x | sca-cpp/trunk/test/store-scheme/stop | 4 |
8 files changed, 8 insertions, 28 deletions
diff --git a/sca-cpp/trunk/test/store-cpp/start b/sca-cpp/trunk/test/store-cpp/start index 06410aca01..3c1da356e6 100755 --- a/sca-cpp/trunk/test/store-cpp/start +++ b/sca-cpp/trunk/test/store-cpp/start @@ -25,8 +25,5 @@ SCAContribution `pwd`/ SCAComposite store.composite EOF +../../components/cache/memcached-start ../../modules/http/httpd-start tmp - -mc="memcached -l 127.0.0.1 -m 4 -p 11211" -$mc & - diff --git a/sca-cpp/trunk/test/store-cpp/stop b/sca-cpp/trunk/test/store-cpp/stop index 07231ee7ce..a59273b8ed 100755 --- a/sca-cpp/trunk/test/store-cpp/stop +++ b/sca-cpp/trunk/test/store-cpp/stop @@ -18,6 +18,4 @@ # under the License. ../../modules/http/httpd-stop tmp -mc="memcached -l 127.0.0.1 -m 4 -p 11211" -kill `ps -f | grep -v grep | grep "$mc" | awk '{ print $2 }'` - +../../components/cache/memcached-stop diff --git a/sca-cpp/trunk/test/store-java/start b/sca-cpp/trunk/test/store-java/start index 3f669f0111..ae2743178a 100755 --- a/sca-cpp/trunk/test/store-java/start +++ b/sca-cpp/trunk/test/store-java/start @@ -27,8 +27,5 @@ EOF export CLASSPATH=`pwd`/../../modules/java/libmod-tuscany-java-1.0.jar:`pwd` +../../components/cache/memcached-start ../../modules/http/httpd-start tmp - -mc="memcached -l 127.0.0.1 -m 4 -p 11211" -$mc & - diff --git a/sca-cpp/trunk/test/store-java/stop b/sca-cpp/trunk/test/store-java/stop index 54b22172bb..79d914e937 100755 --- a/sca-cpp/trunk/test/store-java/stop +++ b/sca-cpp/trunk/test/store-java/stop @@ -20,6 +20,4 @@ export CLASSPATH=`pwd`/../../modules/java/libmod-tuscany-java-1.0.jar:`pwd` ../../modules/http/httpd-stop tmp -mc="memcached -l 127.0.0.1 -m 4 -p 11211" -kill `ps -f | grep -v grep | grep "$mc" | awk '{ print $2 }'` - +../../components/cache/memcached-stop diff --git a/sca-cpp/trunk/test/store-python/start b/sca-cpp/trunk/test/store-python/start index 33758b75fd..93e1dbe755 100755 --- a/sca-cpp/trunk/test/store-python/start +++ b/sca-cpp/trunk/test/store-python/start @@ -25,8 +25,5 @@ SCAContribution `pwd`/ SCAComposite store.composite EOF +../../components/cache/memcached-start ../../modules/http/httpd-start tmp - -mc="memcached -l 127.0.0.1 -m 4 -p 11211" -$mc & - diff --git a/sca-cpp/trunk/test/store-python/stop b/sca-cpp/trunk/test/store-python/stop index 07231ee7ce..a59273b8ed 100755 --- a/sca-cpp/trunk/test/store-python/stop +++ b/sca-cpp/trunk/test/store-python/stop @@ -18,6 +18,4 @@ # under the License. ../../modules/http/httpd-stop tmp -mc="memcached -l 127.0.0.1 -m 4 -p 11211" -kill `ps -f | grep -v grep | grep "$mc" | awk '{ print $2 }'` - +../../components/cache/memcached-stop diff --git a/sca-cpp/trunk/test/store-scheme/start b/sca-cpp/trunk/test/store-scheme/start index 398e21c8e4..db8e19c4cc 100755 --- a/sca-cpp/trunk/test/store-scheme/start +++ b/sca-cpp/trunk/test/store-scheme/start @@ -25,8 +25,5 @@ SCAContribution `pwd`/ SCAComposite store.composite EOF +../../components/cache/memcached-start ../../modules/http/httpd-start tmp - -mc="memcached -l 127.0.0.1 -m 4 -p 11211" -$mc & - diff --git a/sca-cpp/trunk/test/store-scheme/stop b/sca-cpp/trunk/test/store-scheme/stop index 07231ee7ce..a59273b8ed 100755 --- a/sca-cpp/trunk/test/store-scheme/stop +++ b/sca-cpp/trunk/test/store-scheme/stop @@ -18,6 +18,4 @@ # under the License. ../../modules/http/httpd-stop tmp -mc="memcached -l 127.0.0.1 -m 4 -p 11211" -kill `ps -f | grep -v grep | grep "$mc" | awk '{ print $2 }'` - +../../components/cache/memcached-stop |