summaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2016-12-09 15:46:33 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2016-12-09 15:46:33 +0000
commitc70c6e954062325ca5359c03f81bdddb7921a984 (patch)
tree233c1508f5b1e4d9eeef83b9659e92f47e257bc5 /libstdc++-v3
parent27538d4794ecbee94dd36dc9aecf22b58a60a743 (diff)
downloadgcc-c70c6e954062325ca5359c03f81bdddb7921a984.tar.gz
Fix failing test due to order of dg-directives
Backport from mainline 2016-12-08 David Edelsohn <dje.gcc@gmail.com> * testsuite/25_algorithms/headers/algorithm/ parallel_algorithm_assert2.cc: Move dg-do run first. From-SVN: r243491
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog8
-rw-r--r--libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm_assert2.cc2
2 files changed, 9 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 68411c79ec1..da3ffd16ad9 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2016-12-09 Jonathan Wakely <jwakely@redhat.com>
+
+ Backport from mainline
+ 2016-12-08 David Edelsohn <dje.gcc@gmail.com>
+
+ * testsuite/25_algorithms/headers/algorithm/
+ parallel_algorithm_assert2.cc: Move dg-do run first.
+
2016-12-08 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/71856
diff --git a/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm_assert2.cc b/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm_assert2.cc
index c40985e6377..952e97a3fa5 100644
--- a/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm_assert2.cc
+++ b/libstdc++-v3/testsuite/25_algorithms/headers/algorithm/parallel_algorithm_assert2.cc
@@ -1,6 +1,6 @@
+// { dg-do run }
// { dg-require-parallel-mode "" }
// { dg-options "-fopenmp -D_GLIBCXX_PARALLEL" { target *-*-* } }
-// { dg-do run }
// Copyright (C) 2016 Free Software Foundation, Inc.
//