diff options
author | Marshall Clow <mclow@qualcomm.com> | 2011-06-13 17:57:10 +0000 |
---|---|---|
committer | Marshall Clow <mclow@qualcomm.com> | 2011-06-13 17:57:10 +0000 |
commit | 3050a5b3864fb7299e847feb7e691ee94a8e860c (patch) | |
tree | 53b69db7b4c41ce4782414ab37a6fbc84ba99a41 | |
parent | e52bde43f8528bfb81501eeffc4a17b44fdf3bfc (diff) |
Clean up the vector tests
git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@132921 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | test/test_vector1.cpp | 51 | ||||
-rw-r--r-- | test/test_vector2.cpp | 42 |
2 files changed, 50 insertions, 43 deletions
diff --git a/test/test_vector1.cpp b/test/test_vector1.cpp index 2a539d4..f2c9e18 100644 --- a/test/test_vector1.cpp +++ b/test/test_vector1.cpp @@ -196,12 +196,61 @@ int test_exception_in_constructor ( ) { return retVal; } -void my_terminate () { exit ( 0 ); } +// Make sure the constructors and destructors are matched +int test_exception_in_destructor ( ) { + int retVal = 0; + void *one, *two, *three; + +// Throw from within a destructor + gConstructorCounter = gDestructorCounter = 0; + gConstructorThrowTarget = -1; + gDestructorThrowTarget = 15; + try { + one = two = three = NULL; + one = __cxxabiv1::__cxa_vec_new ( 10, 40, 8, throw_construct, throw_destruct ); + two = __cxxabiv1::__cxa_vec_new2( 10, 40, 8, throw_construct, throw_destruct, my_alloc2, my_dealloc2 ); + three = __cxxabiv1::__cxa_vec_new3( 10, 40, 8, throw_construct, throw_destruct, my_alloc2, my_dealloc3 ); + } + catch ( int i ) {} + + try { + __cxxabiv1::__cxa_vec_delete ( one, 40, 8, throw_destruct ); + __cxxabiv1::__cxa_vec_delete2( two, 40, 8, throw_destruct, my_dealloc2 ); + __cxxabiv1::__cxa_vec_delete3( three, 40, 8, throw_destruct, my_dealloc3 ); + } + catch ( int i ) {} + +// We should have thrown in the middle of cleaning up "two", which means that +// there should be 20 calls to the destructor, and "three" was not cleaned up. + if ( gConstructorCounter != 30 || gDestructorCounter != 20 ) { + std::cerr << "Unexpected Constructor/Destructor calls (1D)" << std::endl; + std::cerr << "Expected (30, 20), but got (" << gConstructorCounter << ", " << + gDestructorCounter << ")" << std::endl; + retVal = 1; + } + +// Try throwing from a destructor - should be fine. + gConstructorCounter = gDestructorCounter = 0; + gConstructorThrowTarget = -1; + gDestructorThrowTarget = 5; + try { vec_on_stack v; } + catch ( int i ) {} + + if ( gConstructorCounter != gDestructorCounter ) { + std::cerr << "Mismatched Constructor/Destructor calls (2D)" << std::endl; + std::cerr << gConstructorCounter << " constructors, but " << + gDestructorCounter << " destructors" << std::endl; + retVal = 1; + } + + return retVal; + } int main ( int argc, char *argv [] ) { int retVal = 0; retVal += test_empty (); retVal += test_counted (); retVal += test_exception_in_constructor (); + retVal += test_exception_in_destructor (); return retVal; } diff --git a/test/test_vector2.cpp b/test/test_vector2.cpp index 85c2b0b..1cb7d9c 100644 --- a/test/test_vector2.cpp +++ b/test/test_vector2.cpp @@ -60,48 +60,6 @@ struct vec_on_stack { // Make sure the constructors and destructors are matched void test_exception_in_destructor ( ) { - void *one, *two, *three; - -// Throw from within a destructor - gConstructorCounter = gDestructorCounter = 0; - gConstructorThrowTarget = -1; - gDestructorThrowTarget = 15; - try { - one = two = three = NULL; - one = __cxxabiv1::__cxa_vec_new ( 10, 40, 8, throw_construct, throw_destruct ); - two = __cxxabiv1::__cxa_vec_new2( 10, 40, 8, throw_construct, throw_destruct, my_alloc2, my_dealloc2 ); - three = __cxxabiv1::__cxa_vec_new3( 10, 40, 8, throw_construct, throw_destruct, my_alloc2, my_dealloc3 ); - } - catch ( int i ) {} - - try { - __cxxabiv1::__cxa_vec_delete ( one, 40, 8, throw_destruct ); - __cxxabiv1::__cxa_vec_delete2( two, 40, 8, throw_destruct, my_dealloc2 ); - __cxxabiv1::__cxa_vec_delete3( three, 40, 8, throw_destruct, my_dealloc3 ); - } - catch ( int i ) {} - -// We should have thrown in the middle of cleaning up "two", which means that -// there should be 20 calls to the destructor, and "three" was not cleaned up. - if ( gConstructorCounter != 30 || gDestructorCounter != 20 ) { - std::cerr << "Unexpected Constructor/Destructor calls (1D)" << std::endl; - std::cerr << "Expected (30, 20), but got (" << gConstructorCounter << ", " << - gDestructorCounter << ")" << std::endl; - } - -// Try throwing from a destructor - should be fine. - gConstructorCounter = gDestructorCounter = 0; - gConstructorThrowTarget = -1; - gDestructorThrowTarget = 5; - try { vec_on_stack v; } - catch ( int i ) {} - -// there should be 20 calls to the destructor, and "three" was not cleaned up. - if ( gConstructorCounter != gDestructorCounter ) { - std::cerr << "Mismatched Constructor/Destructor calls (2C)" << std::endl; - std::cerr << gConstructorCounter << " constructors, but " << - gDestructorCounter << " destructors" << std::endl; - } // Try throwing from a destructor while unwinding the stack -- should abort gConstructorCounter = gDestructorCounter = 0; |