svn merge -r144476:145289 svn+ssh://gcc.gnu.org/svn/gcc/trunkc-4_5-branch

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/c-4_5-branch@145306 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 8 insertions, 2 deletions

diff --git a/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc b/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc
index ee04793e66e..b2c3cb566b6 100644
--- a/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/heap/moveable.cc
@@ -1,6 +1,6 @@
 // { dg-options "-std=gnu++0x" }
 
-// Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+// Copyright (C) 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -18,6 +18,8 @@
 // Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 // USA.
 
+// { dg-options "-std=gnu++0x -DITERATIONS=5" { target simulator } }
+
 // 25.3.6 Heap operations [lib.alg.heap.operations]
 
 #undef _GLIBCXX_CONCEPT_CHECKS
@@ -28,6 +30,10 @@
 #include <testsuite_iterators.h>
 #include <testsuite_rvalref.h>
 
+#ifndef ITERATIONS
+#define ITERATIONS 9
+#endif
+
 using __gnu_test::test_container;
 using __gnu_test::random_access_iterator_wrapper;
 using __gnu_test::rvalstruct;
@@ -115,7 +121,7 @@ void
 test01()
 {
   int array[9];
-  for (int i = 1; i < 9; ++i)
+  for (int i = 1; i < ITERATIONS; ++i)
     {
       for(int z = 0; z < i; ++z)
 	array[z] = z;