From c1ec62f1fb21fd7dd4f83fb6724d9b210b2e59f2 Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Fri, 5 Oct 2018 19:19:42 +0000 Subject: [PATCH] string_merge1.adb: Fix test expectations. 2018-10-05 Bernd Edlinger * gnat.dg/string_merge1.adb: Fix test expectations. * gnat.dg/string_merge2.adb: Likewise. From-SVN: r264888 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gnat.dg/string_merge1.adb | 2 -- gcc/testsuite/gnat.dg/string_merge2.adb | 2 -- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 37a035a9ed8..818f6ea250a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-10-05 Bernd Edlinger + + * gnat.dg/string_merge1.adb: Fix test expectations. + * gnat.dg/string_merge2.adb: Likewise. + 2018-10-05 David Malcolm PR c++/56856 diff --git a/gcc/testsuite/gnat.dg/string_merge1.adb b/gcc/testsuite/gnat.dg/string_merge1.adb index f67c7c15601..52b9f3c5783 100644 --- a/gcc/testsuite/gnat.dg/string_merge1.adb +++ b/gcc/testsuite/gnat.dg/string_merge1.adb @@ -15,5 +15,3 @@ end; -- .string "ABCD" -- { dg-final { scan-assembler-times "\\.rodata\\.str" 1 } } --- { dg-final { scan-assembler-times "\\.string" 1 } } --- { dg-final { scan-assembler-times "\"ABCD\"" 1 } } diff --git a/gcc/testsuite/gnat.dg/string_merge2.adb b/gcc/testsuite/gnat.dg/string_merge2.adb index bbec00501c0..a2d37bde93a 100644 --- a/gcc/testsuite/gnat.dg/string_merge2.adb +++ b/gcc/testsuite/gnat.dg/string_merge2.adb @@ -15,5 +15,3 @@ end; -- .string "ABCD" -- { dg-final { scan-assembler-times "\\.rodata\\.str" 1 } } --- { dg-final { scan-assembler-times "\\.string" 1 } } --- { dg-final { scan-assembler-times "\"ABCD\"" 1 } } -- 2.30.2