From 657944cda7228ba824239d94b270160ac0460934 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 9 Jul 2015 21:42:34 -0400 Subject: Suppress http_proxy env var for llcorehttp integration test. Sometimes it can be useful to have http_proxy set in the environment, but if we leave it set while INTEGRATION_TEST_llcorehttp is running, the test hangs. Suppress that variable for that integration test. --- indra/llcorehttp/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/llcorehttp') diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index a0b1ea13b1..9631e960c5 100755 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -134,9 +134,13 @@ if (LL_TESTS) ${BOOST_THREAD_LIBRARY} ) + # If http_proxy is in the current environment (e.g. to fetch s3-proxy + # autobuild packages), suppress it for this integration test: it screws up + # the tests. LL_ADD_INTEGRATION_TEST(llcorehttp "${llcorehttp_TEST_SOURCE_FILES}" "${test_libs}" + "-Dhttp_proxy" ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llcorehttp_peer.py" ) -- cgit v1.2.3 From c8726aba303bcf1207b730a344536e25491420bc Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 10 Nov 2015 09:48:56 -0500 Subject: remove execute permission from many files that should not have it --- indra/llcorehttp/CMakeLists.txt | 0 indra/llcorehttp/_httpinternal.h | 0 indra/llcorehttp/_httplibcurl.cpp | 0 indra/llcorehttp/_httplibcurl.h | 0 indra/llcorehttp/_httpopcancel.cpp | 0 indra/llcorehttp/_httpopcancel.h | 0 indra/llcorehttp/_httpoperation.cpp | 0 indra/llcorehttp/_httpoperation.h | 0 indra/llcorehttp/_httpoprequest.cpp | 0 indra/llcorehttp/_httpoprequest.h | 0 indra/llcorehttp/_httpopsetget.cpp | 0 indra/llcorehttp/_httpopsetget.h | 0 indra/llcorehttp/_httpopsetpriority.cpp | 0 indra/llcorehttp/_httpopsetpriority.h | 0 indra/llcorehttp/_httppolicy.cpp | 0 indra/llcorehttp/_httppolicy.h | 0 indra/llcorehttp/_httppolicyclass.cpp | 0 indra/llcorehttp/_httppolicyclass.h | 0 indra/llcorehttp/_httppolicyglobal.cpp | 0 indra/llcorehttp/_httppolicyglobal.h | 0 indra/llcorehttp/_httpreadyqueue.h | 0 indra/llcorehttp/_httpreplyqueue.cpp | 0 indra/llcorehttp/_httpreplyqueue.h | 0 indra/llcorehttp/_httprequestqueue.cpp | 0 indra/llcorehttp/_httprequestqueue.h | 0 indra/llcorehttp/_httpretryqueue.h | 0 indra/llcorehttp/_httpservice.cpp | 0 indra/llcorehttp/_httpservice.h | 0 indra/llcorehttp/_mutex.h | 0 indra/llcorehttp/_refcounted.cpp | 0 indra/llcorehttp/_refcounted.h | 0 indra/llcorehttp/_thread.h | 0 indra/llcorehttp/bufferarray.cpp | 0 indra/llcorehttp/bufferarray.h | 0 indra/llcorehttp/bufferstream.cpp | 0 indra/llcorehttp/bufferstream.h | 0 indra/llcorehttp/examples/http_texture_load.cpp | 0 indra/llcorehttp/httpcommon.cpp | 0 indra/llcorehttp/httpcommon.h | 0 indra/llcorehttp/httphandler.h | 0 indra/llcorehttp/httpheaders.cpp | 0 indra/llcorehttp/httpheaders.h | 0 indra/llcorehttp/httpoptions.cpp | 0 indra/llcorehttp/httpoptions.h | 0 indra/llcorehttp/httprequest.cpp | 0 indra/llcorehttp/httprequest.h | 0 indra/llcorehttp/httpresponse.cpp | 0 indra/llcorehttp/httpresponse.h | 0 indra/llcorehttp/tests/llcorehttp_test.cpp | 0 indra/llcorehttp/tests/llcorehttp_test.h | 0 indra/llcorehttp/tests/test_allocator.cpp | 0 indra/llcorehttp/tests/test_allocator.h | 0 indra/llcorehttp/tests/test_bufferarray.hpp | 0 indra/llcorehttp/tests/test_bufferstream.hpp | 0 indra/llcorehttp/tests/test_httpheaders.hpp | 0 indra/llcorehttp/tests/test_httpoperation.hpp | 0 indra/llcorehttp/tests/test_httprequest.hpp | 0 indra/llcorehttp/tests/test_httprequestqueue.hpp | 0 indra/llcorehttp/tests/test_httpstatus.hpp | 0 indra/llcorehttp/tests/test_refcounted.hpp | 0 60 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 indra/llcorehttp/CMakeLists.txt mode change 100755 => 100644 indra/llcorehttp/_httpinternal.h mode change 100755 => 100644 indra/llcorehttp/_httplibcurl.cpp mode change 100755 => 100644 indra/llcorehttp/_httplibcurl.h mode change 100755 => 100644 indra/llcorehttp/_httpopcancel.cpp mode change 100755 => 100644 indra/llcorehttp/_httpopcancel.h mode change 100755 => 100644 indra/llcorehttp/_httpoperation.cpp mode change 100755 => 100644 indra/llcorehttp/_httpoperation.h mode change 100755 => 100644 indra/llcorehttp/_httpoprequest.cpp mode change 100755 => 100644 indra/llcorehttp/_httpoprequest.h mode change 100755 => 100644 indra/llcorehttp/_httpopsetget.cpp mode change 100755 => 100644 indra/llcorehttp/_httpopsetget.h mode change 100755 => 100644 indra/llcorehttp/_httpopsetpriority.cpp mode change 100755 => 100644 indra/llcorehttp/_httpopsetpriority.h mode change 100755 => 100644 indra/llcorehttp/_httppolicy.cpp mode change 100755 => 100644 indra/llcorehttp/_httppolicy.h mode change 100755 => 100644 indra/llcorehttp/_httppolicyclass.cpp mode change 100755 => 100644 indra/llcorehttp/_httppolicyclass.h mode change 100755 => 100644 indra/llcorehttp/_httppolicyglobal.cpp mode change 100755 => 100644 indra/llcorehttp/_httppolicyglobal.h mode change 100755 => 100644 indra/llcorehttp/_httpreadyqueue.h mode change 100755 => 100644 indra/llcorehttp/_httpreplyqueue.cpp mode change 100755 => 100644 indra/llcorehttp/_httpreplyqueue.h mode change 100755 => 100644 indra/llcorehttp/_httprequestqueue.cpp mode change 100755 => 100644 indra/llcorehttp/_httprequestqueue.h mode change 100755 => 100644 indra/llcorehttp/_httpretryqueue.h mode change 100755 => 100644 indra/llcorehttp/_httpservice.cpp mode change 100755 => 100644 indra/llcorehttp/_httpservice.h mode change 100755 => 100644 indra/llcorehttp/_mutex.h mode change 100755 => 100644 indra/llcorehttp/_refcounted.cpp mode change 100755 => 100644 indra/llcorehttp/_refcounted.h mode change 100755 => 100644 indra/llcorehttp/_thread.h mode change 100755 => 100644 indra/llcorehttp/bufferarray.cpp mode change 100755 => 100644 indra/llcorehttp/bufferarray.h mode change 100755 => 100644 indra/llcorehttp/bufferstream.cpp mode change 100755 => 100644 indra/llcorehttp/bufferstream.h mode change 100755 => 100644 indra/llcorehttp/examples/http_texture_load.cpp mode change 100755 => 100644 indra/llcorehttp/httpcommon.cpp mode change 100755 => 100644 indra/llcorehttp/httpcommon.h mode change 100755 => 100644 indra/llcorehttp/httphandler.h mode change 100755 => 100644 indra/llcorehttp/httpheaders.cpp mode change 100755 => 100644 indra/llcorehttp/httpheaders.h mode change 100755 => 100644 indra/llcorehttp/httpoptions.cpp mode change 100755 => 100644 indra/llcorehttp/httpoptions.h mode change 100755 => 100644 indra/llcorehttp/httprequest.cpp mode change 100755 => 100644 indra/llcorehttp/httprequest.h mode change 100755 => 100644 indra/llcorehttp/httpresponse.cpp mode change 100755 => 100644 indra/llcorehttp/httpresponse.h mode change 100755 => 100644 indra/llcorehttp/tests/llcorehttp_test.cpp mode change 100755 => 100644 indra/llcorehttp/tests/llcorehttp_test.h mode change 100755 => 100644 indra/llcorehttp/tests/test_allocator.cpp mode change 100755 => 100644 indra/llcorehttp/tests/test_allocator.h mode change 100755 => 100644 indra/llcorehttp/tests/test_bufferarray.hpp mode change 100755 => 100644 indra/llcorehttp/tests/test_bufferstream.hpp mode change 100755 => 100644 indra/llcorehttp/tests/test_httpheaders.hpp mode change 100755 => 100644 indra/llcorehttp/tests/test_httpoperation.hpp mode change 100755 => 100644 indra/llcorehttp/tests/test_httprequest.hpp mode change 100755 => 100644 indra/llcorehttp/tests/test_httprequestqueue.hpp mode change 100755 => 100644 indra/llcorehttp/tests/test_httpstatus.hpp mode change 100755 => 100644 indra/llcorehttp/tests/test_refcounted.hpp (limited to 'indra/llcorehttp') diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httpinternal.h b/indra/llcorehttp/_httpinternal.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httplibcurl.cpp b/indra/llcorehttp/_httplibcurl.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httplibcurl.h b/indra/llcorehttp/_httplibcurl.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httpopcancel.cpp b/indra/llcorehttp/_httpopcancel.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httpopcancel.h b/indra/llcorehttp/_httpopcancel.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httpoperation.cpp b/indra/llcorehttp/_httpoperation.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httpoperation.h b/indra/llcorehttp/_httpoperation.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httpoprequest.h b/indra/llcorehttp/_httpoprequest.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httpopsetget.cpp b/indra/llcorehttp/_httpopsetget.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httpopsetget.h b/indra/llcorehttp/_httpopsetget.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httpopsetpriority.cpp b/indra/llcorehttp/_httpopsetpriority.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httpopsetpriority.h b/indra/llcorehttp/_httpopsetpriority.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httppolicy.cpp b/indra/llcorehttp/_httppolicy.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httppolicy.h b/indra/llcorehttp/_httppolicy.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httppolicyclass.cpp b/indra/llcorehttp/_httppolicyclass.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httppolicyclass.h b/indra/llcorehttp/_httppolicyclass.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httppolicyglobal.cpp b/indra/llcorehttp/_httppolicyglobal.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httppolicyglobal.h b/indra/llcorehttp/_httppolicyglobal.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httpreadyqueue.h b/indra/llcorehttp/_httpreadyqueue.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httpreplyqueue.cpp b/indra/llcorehttp/_httpreplyqueue.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httpreplyqueue.h b/indra/llcorehttp/_httpreplyqueue.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httprequestqueue.cpp b/indra/llcorehttp/_httprequestqueue.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httprequestqueue.h b/indra/llcorehttp/_httprequestqueue.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httpretryqueue.h b/indra/llcorehttp/_httpretryqueue.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httpservice.cpp b/indra/llcorehttp/_httpservice.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_httpservice.h b/indra/llcorehttp/_httpservice.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_mutex.h b/indra/llcorehttp/_mutex.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_refcounted.cpp b/indra/llcorehttp/_refcounted.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_refcounted.h b/indra/llcorehttp/_refcounted.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/_thread.h b/indra/llcorehttp/_thread.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/bufferarray.cpp b/indra/llcorehttp/bufferarray.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/bufferarray.h b/indra/llcorehttp/bufferarray.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/bufferstream.cpp b/indra/llcorehttp/bufferstream.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/bufferstream.h b/indra/llcorehttp/bufferstream.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/examples/http_texture_load.cpp b/indra/llcorehttp/examples/http_texture_load.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/httpcommon.cpp b/indra/llcorehttp/httpcommon.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/httpcommon.h b/indra/llcorehttp/httpcommon.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/httphandler.h b/indra/llcorehttp/httphandler.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/httpheaders.cpp b/indra/llcorehttp/httpheaders.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/httpheaders.h b/indra/llcorehttp/httpheaders.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/httpoptions.cpp b/indra/llcorehttp/httpoptions.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/httpoptions.h b/indra/llcorehttp/httpoptions.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/httprequest.cpp b/indra/llcorehttp/httprequest.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/httprequest.h b/indra/llcorehttp/httprequest.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/httpresponse.cpp b/indra/llcorehttp/httpresponse.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/httpresponse.h b/indra/llcorehttp/httpresponse.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/tests/llcorehttp_test.cpp b/indra/llcorehttp/tests/llcorehttp_test.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/tests/llcorehttp_test.h b/indra/llcorehttp/tests/llcorehttp_test.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/tests/test_allocator.cpp b/indra/llcorehttp/tests/test_allocator.cpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/tests/test_allocator.h b/indra/llcorehttp/tests/test_allocator.h old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/tests/test_bufferarray.hpp b/indra/llcorehttp/tests/test_bufferarray.hpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/tests/test_bufferstream.hpp b/indra/llcorehttp/tests/test_bufferstream.hpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/tests/test_httpheaders.hpp b/indra/llcorehttp/tests/test_httpheaders.hpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/tests/test_httpoperation.hpp b/indra/llcorehttp/tests/test_httpoperation.hpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/tests/test_httprequest.hpp b/indra/llcorehttp/tests/test_httprequest.hpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/tests/test_httprequestqueue.hpp b/indra/llcorehttp/tests/test_httprequestqueue.hpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/tests/test_httpstatus.hpp b/indra/llcorehttp/tests/test_httpstatus.hpp old mode 100755 new mode 100644 diff --git a/indra/llcorehttp/tests/test_refcounted.hpp b/indra/llcorehttp/tests/test_refcounted.hpp old mode 100755 new mode 100644 -- cgit v1.2.3