diff options
| author | Jose <jose@zeroc.com> | 2016-03-23 11:15:33 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-03-23 11:15:33 +0100 |
| commit | 814af095a0a4d928724f1ce8d5852b494725b38b (patch) | |
| tree | ed2b545e3df33079da952abd7f3c5ea7e100d377 | |
| parent | fix for PHP namespace bug in test/Ice/objects (diff) | |
| download | ice-814af095a0a4d928724f1ce8d5852b494725b38b.tar.bz2 ice-814af095a0a4d928724f1ce8d5852b494725b38b.tar.xz ice-814af095a0a4d928724f1ce8d5852b494725b38b.zip | |
stacktrace test fixes
| -rw-r--r-- | cpp/test/IceUtil/stacktrace/Client.cpp | 26 | ||||
| -rw-r--r-- | cpp/test/IceUtil/stacktrace/StackTrace.debug.Linux | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/cpp/test/IceUtil/stacktrace/Client.cpp b/cpp/test/IceUtil/stacktrace/Client.cpp index c67eff6f388..b58a1dda895 100644 --- a/cpp/test/IceUtil/stacktrace/Client.cpp +++ b/cpp/test/IceUtil/stacktrace/Client.cpp @@ -159,12 +159,12 @@ int main(int argc, char* argv[]) // // For Windows we only run the test against bindist if PDBs were installed // - string pdb = getIceHome() + "\\bin\\icebox.pdb"; - if(!ifstream(pdb)) - { - cout << "Test requires PDBs to be installed" << endl; - return EXIT_SUCCESS; - } + string pdb = getIceHome() + "\\bin\\icebox.pdb"; + if(!ifstream(pdb)) + { + cout << "Test requires PDBs to be installed" << endl; + return EXIT_SUCCESS; + } } else if(optimized) { @@ -203,7 +203,7 @@ int main(int argc, char* argv[]) # if(_MSC_VER == 1800) filename += "-vc120"; # elif(_MSC_VER == 1900) - filename += "-vc140"; + filename += "-vc140"; # endif #endif } @@ -249,12 +249,12 @@ int main(int argc, char* argv[]) test(stack == expected); } #else - vector<string> actual = splitLines(stack); - test(expected.size() <= actual.size()); - for(size_t i = 0; i < expected.size(); ++i) - { - test(actual[i].find(expected[i]) != string::npos); - } + vector<string> actual = splitLines(stack); + test(expected.size() <= actual.size()); + for(size_t i = 0; i < expected.size(); ++i) + { + test(actual[i].find(expected[i]) != string::npos); + } #endif } cout << "ok" << endl; diff --git a/cpp/test/IceUtil/stacktrace/StackTrace.debug.Linux b/cpp/test/IceUtil/stacktrace/StackTrace.debug.Linux index 84fa72a26d9..5f6c0f19732 100644 --- a/cpp/test/IceUtil/stacktrace/StackTrace.debug.Linux +++ b/cpp/test/IceUtil/stacktrace/StackTrace.debug.Linux @@ -1,6 +1,6 @@ 0 IceUtil::Exception::Exception(char const*, int) 1 IceUtil::NullHandleException::NullHandleException(char const*, int) -client +client client client client |