diff options
| author | Anchor <none@none> | 2019-03-05 21:25:24 -0800 |
|---|---|---|
| committer | Anchor <none@none> | 2019-03-05 21:25:24 -0800 |
| commit | 2cd1a22587b26e7b034e3100ebf46f244d576bff (patch) | |
| tree | 16435bc171f03102980faa810ed3fa5180b06475 /indra/llmessage/tests/llhttpclient_test.cpp | |
| parent | 1b449fa055ea6c85b464bc799f196e0ab3b7026e (diff) | |
| parent | 03db2ddc9c27cf842c6185826617b0da0d2b87f5 (diff) | |
Merge
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: |