Update throw_exception_test4.cpp. Refs boostorg/assert#34.

This commit is contained in:
Peter Dimov
2023-11-29 02:49:09 +02:00
parent 78947332e1
commit 152b36e86f

View File

@ -28,6 +28,20 @@ char const* translate_function( char const * fn, char const * cfn )
return fn[0] == 0 || std::strcmp( fn, "main" ) == 0? cfn: fn; return fn[0] == 0 || std::strcmp( fn, "main" ) == 0? cfn: fn;
} }
static char const* adjust_filename( char const* file )
{
#if defined(__INTEL_LLVM_COMPILER) && __INTEL_LLVM_COMPILER >= 20210300
char const* fn = std::strrchr( file, '/' );
return fn? fn + 1: file;
#else
return file;
#endif
}
int main() int main()
{ {
try try
@ -40,14 +54,14 @@ int main()
char const * const * file = boost::get_error_info<boost::throw_file>( x ); char const * const * file = boost::get_error_info<boost::throw_file>( x );
BOOST_TEST( file != 0 ); BOOST_TEST( file != 0 );
BOOST_TEST_CSTR_EQ( *file, __FILE__ ); BOOST_TEST_CSTR_EQ( *file, adjust_filename(__FILE__) );
} }
{ {
int const * line = boost::get_error_info<boost::throw_line>( x ); int const * line = boost::get_error_info<boost::throw_line>( x );
BOOST_TEST( line != 0 ); BOOST_TEST( line != 0 );
BOOST_TEST_EQ( *line, 35 ); BOOST_TEST_EQ( *line, 49 );
} }
{ {
@ -68,14 +82,14 @@ int main()
char const * const * file = boost::get_error_info<boost::throw_file>( x ); char const * const * file = boost::get_error_info<boost::throw_file>( x );
BOOST_TEST( file != 0 ); BOOST_TEST( file != 0 );
BOOST_TEST_CSTR_EQ( *file, __FILE__ ); BOOST_TEST_CSTR_EQ( *file, adjust_filename(__FILE__) );
} }
{ {
int const * line = boost::get_error_info<boost::throw_line>( x ); int const * line = boost::get_error_info<boost::throw_line>( x );
BOOST_TEST( line != 0 ); BOOST_TEST( line != 0 );
BOOST_TEST_EQ( *line, 63 ); BOOST_TEST_EQ( *line, 77 );
} }
{ {
@ -96,14 +110,14 @@ int main()
char const * const * file = boost::get_error_info<boost::throw_file>( x ); char const * const * file = boost::get_error_info<boost::throw_file>( x );
BOOST_TEST( file != 0 ); BOOST_TEST( file != 0 );
BOOST_TEST_CSTR_EQ( *file, __FILE__ ); BOOST_TEST_CSTR_EQ( *file, adjust_filename(__FILE__) );
} }
{ {
int const * line = boost::get_error_info<boost::throw_line>( x ); int const * line = boost::get_error_info<boost::throw_line>( x );
BOOST_TEST( line != 0 ); BOOST_TEST( line != 0 );
BOOST_TEST_EQ( *line, 91 ); BOOST_TEST_EQ( *line, 105 );
} }
{ {