commit 42a5f7cecfd37c61b8c8d9d5e12114665c06cc17
author Andrew Hsieh <andrewhsieh@google.com> Mon Jan 13 05:47:52 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 13 05:47:52 2014 +0000
tree d95ac9b03994077538dd268744018bb2236895e9
parent 5d5a67d550c116bf36a6b096f5b94fa2a395e8ad
parent 9a99d0cfdb5d209a3e0e5da0a92ee82b53797e8b

Merge "Fix test "delete2.cpp" to check saved==p only once"

tests/device/test-stlport_shared-exception/jni/delete2.cpp

diff --git a/tests/device/test-stlport_shared-exception/jni/delete2.cpp b/tests/device/test-stlport_shared-exception/jni/delete2.cpp
index 8a486be..c595698 100644
--- a/tests/device/test-stlport_shared-exception/jni/delete2.cpp
+++ b/tests/device/test-stlport_shared-exception/jni/delete2.cpp
@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 // PR c++/15097
 // { dg-do run }
 
@@ -18,8 +20,20 @@
 
 void operator delete (void *p)
 {
-  if (p != saved)
-    abort ();
+// Note that since STL is built w/o -Bsymbolic a lots of other code in STL
+// may use the customized new/delete in this file.  We only save one copy of
+// poitner in variable "saved", but because this testcase new and immediately
+// delete in single thread, this single-copy serves well, provided that we only
+// check saved==p once and set saved to NULL to prevent further comparison of
+// unrelated delete from within STL
+  if (saved) {
+     if (p == saved) {
+        saved = NULL;
+     } else {
+        abort ();
+     }
+  }
+
   free (p);
 }
 

tests/device/test-stlport_static-exception/jni/delete2.cpp

diff --git a/tests/device/test-stlport_static-exception/jni/delete2.cpp b/tests/device/test-stlport_static-exception/jni/delete2.cpp
index 8a486be..c595698 100644
--- a/tests/device/test-stlport_static-exception/jni/delete2.cpp
+++ b/tests/device/test-stlport_static-exception/jni/delete2.cpp
@@ -1,3 +1,5 @@
+#include <stdio.h>
+
 // PR c++/15097
 // { dg-do run }
 
@@ -18,8 +20,20 @@
 
 void operator delete (void *p)
 {
-  if (p != saved)
-    abort ();
+// Note that since STL is built w/o -Bsymbolic a lots of other code in STL
+// may use the customized new/delete in this file.  We only save one copy of
+// poitner in variable "saved", but because this testcase new and immediately
+// delete in single thread, this single-copy serves well, provided that we only
+// check saved==p once and set saved to NULL to prevent further comparison of
+// unrelated delete from within STL
+  if (saved) {
+     if (p == saved) {
+        saved = NULL;
+     } else {
+        abort ();
+     }
+  }
+
   free (p);
 }