diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 02:25:50 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-03-01 02:25:50 +0200 |
| commit | 2ab914a9cdd1ad809879aca05dbf4b624949ecea (patch) | |
| tree | c2eb5d49ad6d0db73cf2374704ede44370910d12 /indra/llmessage/tests/llhttpclient_test.cpp | |
| parent | de91391bdd71dd7c9634cf9a736e1032d0fe983e (diff) | |
| parent | 36cb6933e6c1ad92e1887503b74a05c32988b0f1 (diff) | |
Merged in lindenlab/viewer-bear
Diffstat (limited to 'indra/llmessage/tests/llhttpclient_test.cpp')
| -rw-r--r-- | indra/llmessage/tests/llhttpclient_test.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/llmessage/tests/llhttpclient_test.cpp b/indra/llmessage/tests/llhttpclient_test.cpp index 9356a14f1f..78faa66a0d 100644 --- a/indra/llmessage/tests/llhttpclient_test.cpp +++ b/indra/llmessage/tests/llhttpclient_test.cpp @@ -41,6 +41,7 @@ #include "llpumpio.h" #include "lliosocket.h" +#include "llstring.h" #include "stringize.h" #include "llcleanup.h" @@ -50,13 +51,13 @@ namespace tut { public: HTTPClientTestData(): - PORT(getenv("PORT")), + PORT(LLStringUtil::getenv("PORT")), // Turning NULL PORT into empty string doesn't make things work; // that's just to keep this initializer from blowing up. We test // PORT separately in the constructor body. - local_server(STRINGIZE("http://127.0.0.1:" << (PORT? PORT : "") << "/")) + local_server(STRINGIZE("http://127.0.0.1:" << PORT << "/")) { - ensure("Set environment variable PORT to local test server port", PORT); + ensure("Set environment variable PORT to local test server port", !PORT.empty()); apr_pool_create(&mPool, NULL); LLCurl::initClass(false); mClientPump = new LLPumpIO(mPool); @@ -87,7 +88,7 @@ namespace tut } } - const char* const PORT; + const std::string PORT; const std::string local_server; private: |