summaryrefslogtreecommitdiffstats
path: root/sca-cpp/trunk/modules/server/httpd-test
diff options
context:
space:
mode:
Diffstat (limited to 'sca-cpp/trunk/modules/server/httpd-test')
-rwxr-xr-xsca-cpp/trunk/modules/server/httpd-test7
1 files changed, 2 insertions, 5 deletions
diff --git a/sca-cpp/trunk/modules/server/httpd-test b/sca-cpp/trunk/modules/server/httpd-test
index 79651c8351..86718f96c5 100755
--- a/sca-cpp/trunk/modules/server/httpd-test
+++ b/sca-cpp/trunk/modules/server/httpd-test
@@ -24,14 +24,11 @@ echo "Testing..."
./server-conf tmp
./scheme-conf tmp
cat >>tmp/conf/httpd.conf <<EOF
-
-<Location />
SCAContribution `pwd`/
SCAComposite domain-test.composite
-</Location>
EOF
-apachectl -k start -d `pwd`/tmp
+../http/httpd-start tmp
sleep 2
# Test HTTP GET
@@ -71,7 +68,7 @@ if [ "$rc" = "0" ]; then
fi
# Cleanup
-apachectl -k stop -d `pwd`/tmp
+../http/httpd-stop tmp
sleep 2
if [ "$rc" = "0" ]; then
echo "OK"