diff options
| author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-11 08:30:15 +0000 |
|---|---|---|
| committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2010-01-11 08:30:15 +0000 |
| commit | e22bdc0f9572b6a1a2304799d481b25b3e962f87 (patch) | |
| tree | f25fbce46285d0d1b4081daaa632a6f24399b857 /sca-cpp/trunk/test | |
| parent | 030239cff2f98c0e7b2a66e1930008eed418e07d (diff) | |
Improvements to autoconf build to make support for python, web service etc and relevant test cases optional and generate ac_defines used in ifdefs to check for debug and multithreading. Moved some optional code and test cases around to run them only when the tested features are built.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@897791 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-cpp/trunk/test')
| -rw-r--r-- | sca-cpp/trunk/test/store-python/Makefile.am | 3 | ||||
| -rwxr-xr-x | sca-cpp/trunk/test/store-python/server-test | 1 | ||||
| -rw-r--r-- | sca-cpp/trunk/test/store-scheme/Makefile.am | 5 | ||||
| -rwxr-xr-x | sca-cpp/trunk/test/store-scheme/server-test | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/sca-cpp/trunk/test/store-python/Makefile.am b/sca-cpp/trunk/test/store-python/Makefile.am index 345e58d544..2bdd776e10 100644 --- a/sca-cpp/trunk/test/store-python/Makefile.am +++ b/sca-cpp/trunk/test/store-python/Makefile.am @@ -15,5 +15,8 @@ # specific language governing permissions and limitations # under the License. +if WANT_PYTHON + TESTS = server-test +endif diff --git a/sca-cpp/trunk/test/store-python/server-test b/sca-cpp/trunk/test/store-python/server-test index b41c4e5393..aacf9e5a77 100755 --- a/sca-cpp/trunk/test/store-python/server-test +++ b/sca-cpp/trunk/test/store-python/server-test @@ -22,6 +22,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 /> diff --git a/sca-cpp/trunk/test/store-scheme/Makefile.am b/sca-cpp/trunk/test/store-scheme/Makefile.am index 19b2640f3b..268e111805 100644 --- a/sca-cpp/trunk/test/store-scheme/Makefile.am +++ b/sca-cpp/trunk/test/store-scheme/Makefile.am @@ -17,10 +17,7 @@ noinst_PROGRAMS = script-test -INCLUDES = -I. -I$(top_builddir)/kernel -I${LIBXML2_INCLUDE} -I${APR_INCLUDE} -I${JS_INCLUDE} - script_test_SOURCES = script-test.cpp -script_test_LDADD = -L${LIBXML2_LIB} -lxml2 -L${APR_LIB} -lapr-1 -laprutil-1 -L${JS_LIB} -lmozjs +script_test_LDADD = -lxml2 -lmozjs TESTS = script-test server-test - diff --git a/sca-cpp/trunk/test/store-scheme/server-test b/sca-cpp/trunk/test/store-scheme/server-test index b41c4e5393..bb327347a8 100755 --- a/sca-cpp/trunk/test/store-scheme/server-test +++ b/sca-cpp/trunk/test/store-scheme/server-test @@ -22,6 +22,7 @@ echo "Testing..." # Setup ../../modules/http/httpd-conf tmp 8090 htdocs ../../modules/server/server-conf tmp +../../modules/server/scheme-conf tmp cat >>tmp/conf/httpd.conf <<EOF <Location /> |