diff options
| author | Joe George <joe@zeroc.com> | 2016-12-16 11:00:45 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-12-21 10:46:34 -0500 |
| commit | dbf8fb5053d9a3ace17e319379c5e29dd8158738 (patch) | |
| tree | de526af8eeccf15c0ed367504c4b626db1f0d2ef /cpp/test/IceUtil/stacktrace/Client.cpp | |
| parent | Added support for running browser test with WebWorkers (diff) | |
| download | ice-dbf8fb5053d9a3ace17e319379c5e29dd8158738.tar.bz2 ice-dbf8fb5053d9a3ace17e319379c5e29dd8158738.tar.xz ice-dbf8fb5053d9a3ace17e319379c5e29dd8158738.zip | |
Replaced USE_BIN_DIST with ICE_BIN_DIST
ICE_BIN_DIST is a list of binary distributions to build against
Diffstat (limited to 'cpp/test/IceUtil/stacktrace/Client.cpp')
| -rw-r--r-- | cpp/test/IceUtil/stacktrace/Client.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/test/IceUtil/stacktrace/Client.cpp b/cpp/test/IceUtil/stacktrace/Client.cpp index fbf133fa329..6351ea12114 100644 --- a/cpp/test/IceUtil/stacktrace/Client.cpp +++ b/cpp/test/IceUtil/stacktrace/Client.cpp @@ -150,9 +150,9 @@ int main(int argc, char* argv[]) #if defined(_WIN32) bool binDist = false; vector<wchar_t> buf(256); - DWORD ret = GetEnvironmentVariableW(L"USE_BIN_DIST", &buf[0], static_cast<DWORD>(buf.size())); + DWORD ret = GetEnvironmentVariableW(L"ICE_BIN_DIST", &buf[0], static_cast<DWORD>(buf.size())); string valstr = (ret > 0 && ret < buf.size()) ? wstringToString(&buf[0]) : string(""); - binDist = valstr == "yes"; + binDist = (valstr.find("all") != std::string::npos) || == (valstr.find("cpp") != std::string::npos); if(binDist) { @@ -183,10 +183,10 @@ int main(int argc, char* argv[]) #if defined(__APPLE__) bool binDist = false; - const char* s = getenv("USE_BIN_DIST"); + const char* s = getenv("ICE_BIN_DIST"); if(s && *s != '\0') { - binDist = string(s) == "yes"; + binDist = (string(s).find("all") != std::string::npos) || (string(s).find("cpp") != std::string::npos); } if(binDist && !optimized) |