From b2794066f3691f020a0fa096c4bab76fe94d7957 Mon Sep 17 00:00:00 2001
From: Martin Sebor <msebor@redhat.com>
Date: Wed, 16 Mar 2016 17:42:41 +0000
Subject: [PATCH] g++.dg/cpp1y/constexpr-instantiate.C: Correct DejaGnu
 directives.

From-SVN: r234264
---
 gcc/testsuite/ChangeLog                            | 4 ++++
 gcc/testsuite/g++.dg/cpp1y/constexpr-instantiate.C | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 451e65365fc..76b57ea4880 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2016-03-16  Martin Sebor  <msebor@redhat.com>
+
+	* g++.dg/cpp1y/constexpr-instantiate.C: Correct DejaGnu directives.
+
 2016-03-16  Richard Henderson  <rth@redhat.com>
 
 	PR middle-end/70199
diff --git a/gcc/testsuite/g++.dg/cpp1y/constexpr-instantiate.C b/gcc/testsuite/g++.dg/cpp1y/constexpr-instantiate.C
index 73d0508476b..ab2021b91bd 100644
--- a/gcc/testsuite/g++.dg/cpp1y/constexpr-instantiate.C
+++ b/gcc/testsuite/g++.dg/cpp1y/constexpr-instantiate.C
@@ -1,7 +1,7 @@
 // PR c++/58281 - Problem with explicitly instantiated constexpr template
 //     functions 
 // { dg-do compile { target c++11 } }
-// { do-additional-options "-fdump-tree-optimized" }
+// { dg-options "-fdump-tree-optimized" }
 
 
 template <typename T>
@@ -17,4 +17,5 @@ bool g (int x) { return f (x); }
 template bool f<int>(int);
 
 // Verify that the defintions of both f() and g() are emitted.
-// { dg-final { scan-tree-dump "bool \[fg\](" "optimized" } }
+// { dg-final { scan-tree-dump-times "\nconstexpr bool f\\\(" 1 "optimized" } }
+// { dg-final { scan-tree-dump-times "\nbool g\\\(" 1 "optimized" } }
-- 
2.30.2