aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriains <iains@138bc75d-0d04-0410-961f-82ee72b054a4>2019-09-09 20:13:24 +0000
committeriains <iains@138bc75d-0d04-0410-961f-82ee72b054a4>2019-09-09 20:13:24 +0000
commita5aecaa19690b4b74fe4f91129d52284680bc58e (patch)
tree1febf08a51a73b0a52ae024ed2e1b005d7d015e5
parenta66096d09d4ba22ce533ae7c600da2657fa661d2 (diff)
[Darwin, X86, testsuite] Adjust match strings.
Some of the i386.exp tests fail on Darwin because their scan-asm match strings are too general. In some cases the strings also match instances in the .file and size directives or in comment output. This makes the match strings more specific. 2019-09-09 Iain Sandoe <iain@sandoe.co.uk> Backport from mainline. 2019-05-24 Iain Sandoe <iain@sandoe.co.uk> * gcc.target/i386/pr66819-3.c: Specifically, check that there is no call to "bar". * gcc.target/i386/pr66819-4.c: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@275545 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/testsuite/ChangeLog9
-rw-r--r--gcc/testsuite/gcc.target/i386/pr66819-3.c2
-rw-r--r--gcc/testsuite/gcc.target/i386/pr66819-4.c2
3 files changed, 11 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 833f4be56f3..e7ed816a74f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -3,6 +3,15 @@
Backport from mainline.
2019-05-24 Iain Sandoe <iain@sandoe.co.uk>
+ * gcc.target/i386/pr66819-3.c: Specifically, check that there is no
+ call to "bar".
+ * gcc.target/i386/pr66819-4.c: Likewise.
+
+2019-09-09 Iain Sandoe <iain@sandoe.co.uk>
+
+ Backport from mainline.
+ 2019-05-24 Iain Sandoe <iain@sandoe.co.uk>
+
* gcc.target/i386/pr67985-2.c: Adjust label checks for
Darwin.
* gcc.target/i386/pr77881.c: Likewise.
diff --git a/gcc/testsuite/gcc.target/i386/pr66819-3.c b/gcc/testsuite/gcc.target/i386/pr66819-3.c
index 3bc5a3471e6..76e3726b38a 100644
--- a/gcc/testsuite/gcc.target/i386/pr66819-3.c
+++ b/gcc/testsuite/gcc.target/i386/pr66819-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target ia32 } } */
/* { dg-options "-O2 -mregparm=3" } */
-/* { dg-final { scan-assembler-not "call" } } */
+/* { dg-final { scan-assembler-not {call[ \t]+_?bar} } } */
void (*bar)(int, int);
diff --git a/gcc/testsuite/gcc.target/i386/pr66819-4.c b/gcc/testsuite/gcc.target/i386/pr66819-4.c
index 18b2ccf8120..143360d0de3 100644
--- a/gcc/testsuite/gcc.target/i386/pr66819-4.c
+++ b/gcc/testsuite/gcc.target/i386/pr66819-4.c
@@ -1,6 +1,6 @@
/* { dg-do compile { target ia32 } } */
/* { dg-options "-O2 -mregparm=3" } */
-/* { dg-final { scan-assembler-not "call" } } */
+/* { dg-final { scan-assembler-not {call[ \t]+_?bar} } } */
#include <stdarg.h>