diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-29 07:43:28 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-29 07:56:09 +0300 |
| commit | 1b68f71348ecf3983b76b40d7940da8377f049b7 (patch) | |
| tree | 2974eddaef130a067c26033d60a59fc790365b3d /indra/test/catch_and_store_what_in.h | |
| parent | af4ea94efc1999f3b19fd8d643d0331f0b77e265 (diff) | |
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
Diffstat (limited to 'indra/test/catch_and_store_what_in.h')
| -rw-r--r-- | indra/test/catch_and_store_what_in.h | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/indra/test/catch_and_store_what_in.h b/indra/test/catch_and_store_what_in.h index 5beba06024..d3dada2acf 100644 --- a/indra/test/catch_and_store_what_in.h +++ b/indra/test/catch_and_store_what_in.h @@ -3,7 +3,7 @@ * @author Nat Goodspeed * @date 2012-02-15 * @brief catch_what() template function, CATCH_AND_STORE_WHAT_IN() macro - * + * * $LicenseInfo:firstyear=2012&license=viewerlgpl$ * Copyright (c) 2012, Linden Research, Inc. * $/LicenseInfo$ @@ -64,45 +64,45 @@ std::string catch_what(FUNC func) * ensure("some_call_that_should_throw_Foo() didn't throw", ! threw.empty()); * @endcode */ -#define CATCH_AND_STORE_WHAT_IN(THREW, EXCEPTION) \ -catch (const EXCEPTION& ex) \ -{ \ - (THREW) = ex.what(); \ -} \ +#define CATCH_AND_STORE_WHAT_IN(THREW, EXCEPTION) \ +catch (const EXCEPTION& ex) \ +{ \ + (THREW) = ex.what(); \ +} \ CATCH_MISSED_LINUX_EXCEPTION(THREW, EXCEPTION) #ifndef LL_LINUX -#define CATCH_MISSED_LINUX_EXCEPTION(THREW, EXCEPTION) \ - /* only needed on Linux */ +#define CATCH_MISSED_LINUX_EXCEPTION(THREW, EXCEPTION) \ + /* only needed on Linux */ #else // LL_LINUX -#define CATCH_MISSED_LINUX_EXCEPTION(THREW, EXCEPTION) \ -catch (const std::runtime_error& ex) \ -{ \ - /* This clause is needed on Linux, on the viewer side, because */ \ - /* the exception isn't caught by catch (const EXCEPTION&). */ \ - /* But if the expected exception was thrown, allow the test to */ \ - /* succeed anyway. Not sure how else to handle this odd case. */ \ - if (std::string(typeid(ex).name()) == typeid(EXCEPTION).name()) \ - { \ - /* std::cerr << "Caught " << typeid(ex).name() */ \ - /* << " with Linux workaround" << std::endl; */ \ - (THREW) = ex.what(); \ - /*std::cout << ex.what() << std::endl;*/ \ - } \ - else \ - { \ - /* We don't even recognize this exception. Let it propagate */ \ - /* out to TUT to fail the test. */ \ - throw; \ - } \ -} \ -catch (...) \ -{ \ - std::cerr << "Failed to catch expected exception " \ - << #EXCEPTION << "!" << std::endl; \ - /* This indicates a problem in the test that should be addressed. */ \ - throw; \ +#define CATCH_MISSED_LINUX_EXCEPTION(THREW, EXCEPTION) \ +catch (const std::runtime_error& ex) \ +{ \ + /* This clause is needed on Linux, on the viewer side, because */ \ + /* the exception isn't caught by catch (const EXCEPTION&). */ \ + /* But if the expected exception was thrown, allow the test to */ \ + /* succeed anyway. Not sure how else to handle this odd case. */ \ + if (std::string(typeid(ex).name()) == typeid(EXCEPTION).name()) \ + { \ + /* std::cerr << "Caught " << typeid(ex).name() */ \ + /* << " with Linux workaround" << std::endl; */ \ + (THREW) = ex.what(); \ + /*std::cout << ex.what() << std::endl;*/ \ + } \ + else \ + { \ + /* We don't even recognize this exception. Let it propagate */ \ + /* out to TUT to fail the test. */ \ + throw; \ + } \ +} \ +catch (...) \ +{ \ + std::cerr << "Failed to catch expected exception " \ + << #EXCEPTION << "!" << std::endl; \ + /* This indicates a problem in the test that should be addressed. */ \ + throw; \ } #endif // LL_LINUX |