Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 13:23:51 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Improve code in response to review.

Browse Source
This commit is contained in:
Nick Thompson 2021-04-12 13:42:19 -04:00
parent 568c0b5d29
commit 94a32bf64c
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
vtkm/cont/testing/Testing.h
View File

@ -28,18 +28,14 @@
#include <vtkm/thirdparty/diy/diy.h>
#include <sstream>
#define VTKM_MATH_ASSERT(condition, message) \
{ \
if (condition) \
{ \
return; \
} \
std::stringstream ss; \
ss << "Error at " << __FILE__ << ":" << __LINE__ << ":" << __func__ << "\n"; \
ss << "\t" << message; \
this->RaiseError(ss.str().c_str()); \
#define VTKM_MATH_ASSERT(condition, message) \
{ \
if (!condition) \
{ \
VTKM_LOG_S(vtkm::cont::LogLevel::Error, \
"\n\tError at " << __FILE__ << ":" << __LINE__ << ":" << __func__ << "\n"); \
this->RaiseError(message); \
} \
}
@ -159,12 +155,13 @@ public:
catch (vtkm::testing::Testing::TestFailure const& error)
{
std::cerr << "Error at " << error.GetFile() << ":" << error.GetLine() << ":"
<< error.GetFunc() << "\n\t" << error.GetMessage() << "\n";
<< error.GetFunction() << "\n\t" << error.GetMessage() << "\n";
return 1;
}
catch (vtkm::cont::Error const& error)
{
std::cerr << error.GetMessage() << "\n";
std::cerr << "Uncaught VTKm exception thrown.\n" << error.GetMessage() << "\n";
std::cerr << "Stacktrace:\n" << error.GetStackTrace() << "\n";
return 1;
}
catch (std::exception const& error)
@ -194,12 +191,13 @@ public:
catch (vtkm::testing::Testing::TestFailure& error)
{
std::cerr << "Error at " << error.GetFile() << ":" << error.GetLine() << ":"
<< error.GetFunc() << "\n\t" << error.GetMessage() << "\n";
<< error.GetFunction() << "\n\t" << error.GetMessage() << "\n";
return 1;
}
catch (vtkm::cont::Error& error)
{
std::cerr << error.GetMessage() << "\n";
std::cerr << "Uncaught VTKm exception thrown.\n" << error.GetMessage() << "\n";
std::cerr << "Stacktrace:\n" << error.GetStackTrace() << "\n";
return 1;
}
catch (std::exception& error)

4
vtkm/testing/Testing.h
View File

@ -311,7 +311,7 @@ public:
VTKM_CONT const std::string& GetFile() const { return this->File; }
VTKM_CONT vtkm::Id GetLine() const { return this->Line; }
VTKM_CONT const char* GetFunc() const { return this->Func; }
VTKM_CONT const char* GetFunction() const { return this->Func; }
VTKM_CONT const std::string& GetMessage() const { return this->Message; }
private:
@ -450,7 +450,7 @@ public:
catch (TestFailure const& error)
{
std::cerr << "***** Test failed @ " << error.GetFile() << ":" << error.GetLine() << ":"
<< error.GetFunc() << "\n"
<< error.GetFunction() << "\n"
<< error.GetMessage() << "\n";
return 1;
}