[cfe-commits] [libcxxabi] r132921 - in /libcxxabi/trunk/test: test_vector1.cpp test_vector2.cpp
Marshall Clow
mclow at qualcomm.com
Mon Jun 13 10:57:10 PDT 2011
Author: marshall
Date: Mon Jun 13 12:57:10 2011
New Revision: 132921
URL: http://llvm.org/viewvc/llvm-project?rev=132921&view=rev
Log:
Clean up the vector tests
Modified:
libcxxabi/trunk/test/test_vector1.cpp
libcxxabi/trunk/test/test_vector2.cpp
Modified: libcxxabi/trunk/test/test_vector1.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/test_vector1.cpp?rev=132921&r1=132920&r2=132921&view=diff
==============================================================================
--- libcxxabi/trunk/test/test_vector1.cpp (original)
+++ libcxxabi/trunk/test/test_vector1.cpp Mon Jun 13 12:57:10 2011
@@ -196,12 +196,61 @@
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;
}
Modified: libcxxabi/trunk/test/test_vector2.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/test_vector2.cpp?rev=132921&r1=132920&r2=132921&view=diff
==============================================================================
--- libcxxabi/trunk/test/test_vector2.cpp (original)
+++ libcxxabi/trunk/test/test_vector2.cpp Mon Jun 13 12:57:10 2011
@@ -60,48 +60,6 @@
// 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;
More information about the cfe-commits
mailing list