tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r930634 - in /tuscany/sca-cpp/trunk: modules/http/ modules/java/ modules/python/ modules/server/ modules/wsgi/ test/store-cpp/ test/store-java/ test/store-python/ test/store-scheme/
Date Sun, 04 Apr 2010 07:31:24 GMT
Author: jsdelfino
Date: Sun Apr  4 07:31:23 2010
New Revision: 930634

URL: http://svn.apache.org/viewvc?rev=930634&view=rev
Log:
Use curl configured at build time instead of curl found on system path.

Modified:
    tuscany/sca-cpp/trunk/modules/http/Makefile.am
    tuscany/sca-cpp/trunk/modules/http/httpd-test
    tuscany/sca-cpp/trunk/modules/java/wiring-test
    tuscany/sca-cpp/trunk/modules/python/wiring-test
    tuscany/sca-cpp/trunk/modules/server/httpd-test
    tuscany/sca-cpp/trunk/modules/server/wiring-test
    tuscany/sca-cpp/trunk/modules/wsgi/wiring-test
    tuscany/sca-cpp/trunk/modules/wsgi/wsgi-test
    tuscany/sca-cpp/trunk/test/store-cpp/server-test
    tuscany/sca-cpp/trunk/test/store-java/server-test
    tuscany/sca-cpp/trunk/test/store-python/server-test
    tuscany/sca-cpp/trunk/test/store-scheme/server-test

Modified: tuscany/sca-cpp/trunk/modules/http/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/Makefile.am?rev=930634&r1=930633&r2=930634&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/http/Makefile.am Sun Apr  4 07:31:23 2010
@@ -23,10 +23,12 @@ mod_SCRIPTS = httpd-conf httpd-start htt
 curl_test_SOURCES = curl-test.cpp
 curl_test_LDFLAGS = -lxml2 -lcurl -lmozjs
 
-prefix_DATA = httpd.prefix
+prefix_DATA = httpd.prefix curl.prefix
 prefixdir=$(prefix)/modules/http
 httpd.prefix: $(top_builddir)/config.status
 	echo ${HTTPD_PREFIX} >httpd.prefix
+curl.prefix: $(top_builddir)/config.status
+	echo ${CURL_PREFIX} >curl.prefix
 
 noinst_PROGRAMS = curl-test
 TESTS = httpd-test http-test

Modified: tuscany/sca-cpp/trunk/modules/http/httpd-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/httpd-test?rev=930634&r1=930633&r2=930634&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/httpd-test (original)
+++ tuscany/sca-cpp/trunk/modules/http/httpd-test Sun Apr  4 07:31:23 2010
@@ -18,6 +18,8 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../http/curl.prefix`
 
 # Setup
 ./httpd-conf tmp localhost 8090 htdocs
@@ -25,7 +27,7 @@ echo "Testing..."
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
+$curl_prefix/bin/curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
 diff tmp/index.html htdocs/index.html
 rc=$?
 

Modified: tuscany/sca-cpp/trunk/modules/java/wiring-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/java/wiring-test?rev=930634&r1=930633&r2=930634&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/java/wiring-test (original)
+++ tuscany/sca-cpp/trunk/modules/java/wiring-test Sun Apr  4 07:31:23 2010
@@ -18,6 +18,8 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../http/curl.prefix`
 
 # Setup
 ../http/httpd-conf tmp localhost 8090 ../server/htdocs
@@ -34,37 +36,37 @@ export CLASSPATH="`pwd`/libmod-tuscany-j
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
+$curl_prefix/bin/curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
 diff tmp/index.html ../server/htdocs/index.html
 rc=$?
 
 # Test ATOMPub
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/ >tmp/feed.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/ >tmp/feed.xml 2>/dev/null
     diff tmp/feed.xml ../server/htdocs/feed.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/111 >tmp/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/111 >tmp/entry.xml 2>/dev/null
     diff tmp/entry.xml ../server/htdocs/entry.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/ -X POST -H "Content-type: application/atom+xml" --data
@../server/htdocs/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/ -X POST -H "Content-type: application/atom+xml"
--data @../server/htdocs/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/111 -X PUT -H "Content-type: application/atom+xml"
--data @../server/htdocs/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/111 -X PUT -H "Content-type: application/atom+xml"
--data @../server/htdocs/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/111 -X DELETE 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/111 -X DELETE 2>/dev/null
     rc=$?
 fi
 
 # Test JSON-RPC
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/ -X POST -H "Content-type: application/json-rpc" --data
@../server/htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/ -X POST -H "Content-type: application/json-rpc"
--data @../server/htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
     diff tmp/json-result.txt ../server/htdocs/json-result.txt
     rc=$?
 fi

Modified: tuscany/sca-cpp/trunk/modules/python/wiring-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/python/wiring-test?rev=930634&r1=930633&r2=930634&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/python/wiring-test (original)
+++ tuscany/sca-cpp/trunk/modules/python/wiring-test Sun Apr  4 07:31:23 2010
@@ -18,6 +18,8 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../http/curl.prefix`
 
 # Setup
 ../http/httpd-conf tmp localhost 8090 ../server/htdocs
@@ -32,37 +34,37 @@ EOF
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
+$curl_prefix/bin/curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
 diff tmp/index.html ../server/htdocs/index.html
 rc=$?
 
 # Test ATOMPub
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/ >tmp/feed.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/ >tmp/feed.xml 2>/dev/null
     diff tmp/feed.xml ../server/htdocs/feed.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/111 >tmp/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/111 >tmp/entry.xml 2>/dev/null
     diff tmp/entry.xml ../server/htdocs/entry.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/ -X POST -H "Content-type: application/atom+xml" --data
@../server/htdocs/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/ -X POST -H "Content-type: application/atom+xml"
--data @../server/htdocs/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/111 -X PUT -H "Content-type: application/atom+xml"
--data @../server/htdocs/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/111 -X PUT -H "Content-type: application/atom+xml"
--data @../server/htdocs/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/111 -X DELETE 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/111 -X DELETE 2>/dev/null
     rc=$?
 fi
 
 # Test JSON-RPC
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/ -X POST -H "Content-type: application/json-rpc" --data
@../server/htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/ -X POST -H "Content-type: application/json-rpc"
--data @../server/htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
     diff tmp/json-result.txt ../server/htdocs/json-result.txt
     rc=$?
 fi

Modified: tuscany/sca-cpp/trunk/modules/server/httpd-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/httpd-test?rev=930634&r1=930633&r2=930634&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/httpd-test (original)
+++ tuscany/sca-cpp/trunk/modules/server/httpd-test Sun Apr  4 07:31:23 2010
@@ -18,6 +18,8 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../http/curl.prefix`
 
 # Setup
 ../http/httpd-conf tmp localhost 8090 htdocs
@@ -32,37 +34,37 @@ EOF
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
+$curl_prefix/bin/curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
 diff tmp/index.html htdocs/index.html
 rc=$?
 
 # Test ATOMPub
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/test/ >tmp/feed.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/test/ >tmp/feed.xml 2>/dev/null
     diff tmp/feed.xml htdocs/feed.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/test/111 >tmp/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/test/111 >tmp/entry.xml 2>/dev/null
     diff tmp/entry.xml htdocs/entry.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/test/ -X POST -H "Content-type: application/atom+xml" --data
@htdocs/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/test/ -X POST -H "Content-type: application/atom+xml"
--data @htdocs/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/test/111 -X PUT -H "Content-type: application/atom+xml" --data
@htdocs/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/test/111 -X PUT -H "Content-type: application/atom+xml"
--data @htdocs/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/test/111 -X DELETE 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/test/111 -X DELETE 2>/dev/null
     rc=$?
 fi
 
 # Test JSON-RPC
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/test/ -X POST -H "Content-type: application/json-rpc" --data
@htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/test/ -X POST -H "Content-type: application/json-rpc"
--data @htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
     diff tmp/json-result.txt htdocs/json-result.txt
     rc=$?
 fi

Modified: tuscany/sca-cpp/trunk/modules/server/wiring-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/wiring-test?rev=930634&r1=930633&r2=930634&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/wiring-test (original)
+++ tuscany/sca-cpp/trunk/modules/server/wiring-test Sun Apr  4 07:31:23 2010
@@ -18,6 +18,8 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../http/curl.prefix`
 
 # Setup
 ../http/httpd-conf tmp localhost 8090 htdocs
@@ -32,37 +34,37 @@ EOF
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
+$curl_prefix/bin/curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
 diff tmp/index.html htdocs/index.html
 rc=$?
 
 # Test ATOMPub
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/ >tmp/feed.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/ >tmp/feed.xml 2>/dev/null
     diff tmp/feed.xml htdocs/feed.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/111 >tmp/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/111 >tmp/entry.xml 2>/dev/null
     diff tmp/entry.xml htdocs/entry.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/ -X POST -H "Content-type: application/atom+xml" --data
@htdocs/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/ -X POST -H "Content-type: application/atom+xml"
--data @htdocs/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/111 -X PUT -H "Content-type: application/atom+xml"
--data @htdocs/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/111 -X PUT -H "Content-type: application/atom+xml"
--data @htdocs/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/111 -X DELETE 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/111 -X DELETE 2>/dev/null
     rc=$?
 fi
 
 # Test JSON-RPC
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/client/ -X POST -H "Content-type: application/json-rpc" --data
@htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/client/ -X POST -H "Content-type: application/json-rpc"
--data @htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
     diff tmp/json-result.txt htdocs/json-result.txt
     rc=$?
 fi

Modified: tuscany/sca-cpp/trunk/modules/wsgi/wiring-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/wiring-test?rev=930634&r1=930633&r2=930634&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/wiring-test (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/wiring-test Sun Apr  4 07:31:23 2010
@@ -18,6 +18,8 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../http/curl.prefix`
 uri=$1
 if [ "$uri" = "" ]; then
     uri="http://localhost:8090"
@@ -29,37 +31,37 @@ mkdir -p tmp
 sleep 2
 
 # Test HTTP GET
-curl $uri/index.html 2>/dev/null >tmp/index.html
+$curl_prefix/bin/curl $uri/index.html 2>/dev/null >tmp/index.html
 diff tmp/index.html htdocs/index.html
 rc=$?
 
 # Test ATOMPub
 if [ "$rc" = "0" ]; then
-    curl $uri/client/ >tmp/feed.xml 2>/dev/null
+    $curl_prefix/bin/curl $uri/client/ >tmp/feed.xml 2>/dev/null
     diff tmp/feed.xml htdocs/feed.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl $uri/client/111 >tmp/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl $uri/client/111 >tmp/entry.xml 2>/dev/null
     diff tmp/entry.xml htdocs/entry.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl $uri/client/ -X POST -H "Content-type: application/atom+xml" --data @htdocs/entry.xml
2>/dev/null
+    $curl_prefix/bin/curl $uri/client/ -X POST -H "Content-type: application/atom+xml" --data
@htdocs/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl $uri/client/111 -X PUT -H "Content-type: application/atom+xml" --data @htdocs/entry.xml
2>/dev/null
+    $curl_prefix/bin/curl $uri/client/111 -X PUT -H "Content-type: application/atom+xml"
--data @htdocs/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl $uri/client/111 -X DELETE 2>/dev/null
+    $curl_prefix/bin/curl $uri/client/111 -X DELETE 2>/dev/null
     rc=$?
 fi
 
 # Test JSON-RPC
 if [ "$rc" = "0" ]; then
-    curl $uri/client/ -X POST -H "Content-type: application/json-rpc" --data @htdocs/json-request.txt
>tmp/json-result.txt 2>/dev/null
+    $curl_prefix/bin/curl $uri/client/ -X POST -H "Content-type: application/json-rpc" --data
@htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
     diff tmp/json-result.txt htdocs/json-result.txt
     rc=$?
 fi

Modified: tuscany/sca-cpp/trunk/modules/wsgi/wsgi-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/wsgi-test?rev=930634&r1=930633&r2=930634&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/wsgi-test (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/wsgi-test Sun Apr  4 07:31:23 2010
@@ -18,6 +18,8 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../http/curl.prefix`
 
 # Setup
 mkdir -p tmp
@@ -25,37 +27,37 @@ mkdir -p tmp
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
+$curl_prefix/bin/curl http://localhost:8090/index.html 2>/dev/null >tmp/index.html
 diff tmp/index.html htdocs/index.html
 rc=$?
 
 # Test ATOMPub
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/wsgi/ >tmp/feed.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/wsgi/ >tmp/feed.xml 2>/dev/null
     diff tmp/feed.xml htdocs/feed.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/wsgi/111 >tmp/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/wsgi/111 >tmp/entry.xml 2>/dev/null
     diff tmp/entry.xml htdocs/entry.xml
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/wsgi/ -X POST -H "Content-type: application/atom+xml" --data
@htdocs/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/wsgi/ -X POST -H "Content-type: application/atom+xml"
--data @htdocs/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/wsgi/111 -X PUT -H "Content-type: application/atom+xml" --data
@htdocs/entry.xml 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/wsgi/111 -X PUT -H "Content-type: application/atom+xml"
--data @htdocs/entry.xml 2>/dev/null
     rc=$?
 fi
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/wsgi/111 -X DELETE 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/wsgi/111 -X DELETE 2>/dev/null
     rc=$?
 fi
 
 # Test JSON-RPC
 if [ "$rc" = "0" ]; then
-    curl http://localhost:8090/wsgi/ -X POST -H "Content-type: application/json-rpc" --data
@htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
+    $curl_prefix/bin/curl http://localhost:8090/wsgi/ -X POST -H "Content-type: application/json-rpc"
--data @htdocs/json-request.txt >tmp/json-result.txt 2>/dev/null
     diff tmp/json-result.txt htdocs/json-result.txt
     rc=$?
 fi

Modified: tuscany/sca-cpp/trunk/test/store-cpp/server-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-cpp/server-test?rev=930634&r1=930633&r2=930634&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-cpp/server-test (original)
+++ tuscany/sca-cpp/trunk/test/store-cpp/server-test Sun Apr  4 07:31:23 2010
@@ -18,13 +18,15 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
 ./start
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
+$curl_prefix/bin/curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
 diff tmp/store.html htdocs/store.html
 rc=$?
 

Modified: tuscany/sca-cpp/trunk/test/store-java/server-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-java/server-test?rev=930634&r1=930633&r2=930634&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-java/server-test (original)
+++ tuscany/sca-cpp/trunk/test/store-java/server-test Sun Apr  4 07:31:23 2010
@@ -18,13 +18,15 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
 ./start
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
+$curl_prefix/bin/curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
 diff tmp/store.html htdocs/store.html
 rc=$?
 

Modified: tuscany/sca-cpp/trunk/test/store-python/server-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-python/server-test?rev=930634&r1=930633&r2=930634&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-python/server-test (original)
+++ tuscany/sca-cpp/trunk/test/store-python/server-test Sun Apr  4 07:31:23 2010
@@ -18,13 +18,15 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
 ./start
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
+$curl_prefix/bin/curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
 diff tmp/store.html htdocs/store.html
 rc=$?
 

Modified: tuscany/sca-cpp/trunk/test/store-scheme/server-test
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/test/store-scheme/server-test?rev=930634&r1=930633&r2=930634&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/test/store-scheme/server-test (original)
+++ tuscany/sca-cpp/trunk/test/store-scheme/server-test Sun Apr  4 07:31:23 2010
@@ -18,13 +18,15 @@
 #  under the License.
 
 echo "Testing..."
+here=`readlink -f $0`; here=`dirname $here`
+curl_prefix=`cat $here/../../modules/http/curl.prefix`
 
 # Setup
 ./start
 sleep 2
 
 # Test HTTP GET
-curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
+$curl_prefix/bin/curl http://localhost:8090/store.html 2>/dev/null >tmp/store.html
 diff tmp/store.html htdocs/store.html
 rc=$?
 



Mime
View raw message