disable server bundles (temp)
This commit is contained in:
parent
9a89967ad7
commit
7a74b8ef0f
@ -663,6 +663,7 @@ AS_HELP_STRING([--disable-test-bundles],[Disable test bundles (default)]),
|
|||||||
)
|
)
|
||||||
|
|
||||||
AM_CONDITIONAL([USE_TEST_BUNDLES], [test "$want_test_bundles" = 'yes'])
|
AM_CONDITIONAL([USE_TEST_BUNDLES], [test "$want_test_bundles" = 'yes'])
|
||||||
|
AM_CONDITIONAL([USE_TEST_BUNDLES_SERVER], [test "$want_test_bundles" = 'DISABLED'])
|
||||||
|
|
||||||
dnl ************************************************************
|
dnl ************************************************************
|
||||||
dnl switch off particular protocols
|
dnl switch off particular protocols
|
||||||
|
|||||||
@ -2255,7 +2255,7 @@ while(@ARGV) {
|
|||||||
elsif ($ARGV[0] eq "-bundle") {
|
elsif ($ARGV[0] eq "-bundle") {
|
||||||
# use test bundles
|
# use test bundles
|
||||||
$bundle=1;
|
$bundle=1;
|
||||||
$ENV{'CURL_TEST_BUNDLES'} = 1;
|
#$ENV{'CURL_TEST_BUNDLES'} = 1;
|
||||||
}
|
}
|
||||||
elsif ($ARGV[0] eq "-d") {
|
elsif ($ARGV[0] eq "-d") {
|
||||||
# have the servers display protocol output
|
# have the servers display protocol output
|
||||||
|
|||||||
@ -32,7 +32,7 @@ set_source_files_properties(
|
|||||||
"../../lib/curl_multibyte.c"
|
"../../lib/curl_multibyte.c"
|
||||||
PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
|
PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON)
|
||||||
|
|
||||||
if(CURL_TEST_BUNDLES)
|
if(CURL_TEST_BUNDLES_SERVER)
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT "server_bundle.c"
|
OUTPUT "server_bundle.c"
|
||||||
COMMAND ${PERL_EXECUTABLE} "${CURL_SOURCE_DIR}/tests/mk-bundle-server.pl" ${SERVERPROGS} > "server_bundle.c"
|
COMMAND ${PERL_EXECUTABLE} "${CURL_SOURCE_DIR}/tests/mk-bundle-server.pl" ${SERVERPROGS} > "server_bundle.c"
|
||||||
|
|||||||
@ -53,7 +53,7 @@ include Makefile.inc
|
|||||||
|
|
||||||
EXTRA_DIST = base64.pl CMakeLists.txt .checksrc
|
EXTRA_DIST = base64.pl CMakeLists.txt .checksrc
|
||||||
|
|
||||||
if USE_TEST_BUNDLES
|
if USE_TEST_BUNDLES_SERVER
|
||||||
server_bundle.c: $(top_srcdir)/tests/mk-bundle-server.pl $(CURLX_SRCS) $(USEFUL) $(INET_PTON) $(UTIL) $(UTIL_BUNDLE)
|
server_bundle.c: $(top_srcdir)/tests/mk-bundle-server.pl $(CURLX_SRCS) $(USEFUL) $(INET_PTON) $(UTIL) $(UTIL_BUNDLE)
|
||||||
@PERL@ $(top_srcdir)/tests/mk-bundle-server.pl $(SERVERPROGS) > server_bundle.c
|
@PERL@ $(top_srcdir)/tests/mk-bundle-server.pl $(SERVERPROGS) > server_bundle.c
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user