diff options
Diffstat (limited to '')
| -rwxr-xr-x | sca-cpp/trunk/test/store-python/server-test | 20 | ||||
| -rwxr-xr-x | sca-cpp/trunk/test/store-python/start | 35 | ||||
| -rwxr-xr-x | sca-cpp/trunk/test/store-python/stop | 23 |
3 files changed, 61 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 diff --git a/sca-cpp/trunk/test/store-python/start b/sca-cpp/trunk/test/store-python/start new file mode 100755 index 0000000000..9e85a84cb4 --- /dev/null +++ b/sca-cpp/trunk/test/store-python/start @@ -0,0 +1,35 @@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +../../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 & + diff --git a/sca-cpp/trunk/test/store-python/stop b/sca-cpp/trunk/test/store-python/stop new file mode 100755 index 0000000000..34731dbbe1 --- /dev/null +++ b/sca-cpp/trunk/test/store-python/stop @@ -0,0 +1,23 @@ +#!/bin/sh + +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +apachectl -k stop -d `pwd`/tmp +mc="memcached -l 127.0.0.1 -m 4 -p 11211" +kill `ps -f | grep -v grep | grep "$mc" | awk '{ print $2 }'` + |