diff options
Diffstat (limited to '')
| -rwxr-xr-x | sca-cpp/trunk/test/store-python/server-test | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/sca-cpp/trunk/test/store-python/server-test b/sca-cpp/trunk/test/store-python/server-test index aacf9e5a77..64315d7d92 100755 --- a/sca-cpp/trunk/test/store-python/server-test +++ b/sca-cpp/trunk/test/store-python/server-test @@ -20,21 +20,7 @@ echo "Testing..." # Setup -../../modules/http/httpd-conf tmp 8090 htdocs -../../modules/server/server-conf tmp -../../modules/python/python-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 |