diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-04-04 07:31:23 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-04-04 07:31:23 +0000 |
| commit | 74684a07395ea564197d630bd26298050bcda252 (patch) | |
| tree | 59e1dbf3a210a373e836efaa4418b3f3cc0ddfee /sca-cpp/trunk/modules/http | |
| parent | 6fcc4a33796196026b325e410dbdee68d5aa757d (diff) | |
Use curl configured at build time instead of curl found on system path.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@930634 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | sca-cpp/trunk/modules/http/Makefile.am | 4 | ||||
| -rwxr-xr-x | sca-cpp/trunk/modules/http/httpd-test | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sca-cpp/trunk/modules/http/Makefile.am b/sca-cpp/trunk/modules/http/Makefile.am index 6d477c2946..180529620c 100644 --- a/sca-cpp/trunk/modules/http/Makefile.am +++ b/sca-cpp/trunk/modules/http/Makefile.am @@ -23,10 +23,12 @@ mod_SCRIPTS = httpd-conf httpd-start httpd-stop httpd-restart 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 diff --git a/sca-cpp/trunk/modules/http/httpd-test b/sca-cpp/trunk/modules/http/httpd-test index ca6b3e19a1..a3b9145871 100755 --- a/sca-cpp/trunk/modules/http/httpd-test +++ b/sca-cpp/trunk/modules/http/httpd-test @@ -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=$? |