From 367e5f9e436b1bd74bc132292c27086a96728384 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Mon, 24 Jun 2019 19:13:01 +0000 Subject: [PATCH] [Darwin, testsuite] Fix isystem-2.c. For the test to succeed there needs to be some header that is to be found in the 'expected' place i.e. /usr/include/. It's important that it is not the name of a header for which fixincludes have been applied, since such headers will be found in the gcc include-fixed dir and, in general, reference additional headers. The dummy sysroot will prevent the additional headers from being found, resulting in a failed test. The fix is to use a header name that isn't expected to be present in a real sysroot. 2019-06-24 Iain Sandoe * gcc.dg/cpp/isysroot-1.c (main): Use as the test header. * gcc.dg/cpp/usr/include/stdio.h: Rename... * gcc.dg/cpp/usr/include/example.h: ... to this. From-SVN: r272625 --- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gcc.dg/cpp/isysroot-1.c | 11 +++++++++-- .../gcc.dg/cpp/usr/include/{stdio.h => example.h} | 0 3 files changed, 15 insertions(+), 2 deletions(-) rename gcc/testsuite/gcc.dg/cpp/usr/include/{stdio.h => example.h} (100%) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 8a58f489176..ec0566c10b5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-06-24 Iain Sandoe + + * gcc.dg/cpp/isysroot-1.c: Use as the test header. + * gcc.dg/cpp/usr/include/stdio.h: Rename... + * gcc.dg/cpp/usr/include/example.h: ... to this. + 2019-06-24 Richard Biener PR tree-optimization/90972 diff --git a/gcc/testsuite/gcc.dg/cpp/isysroot-1.c b/gcc/testsuite/gcc.dg/cpp/isysroot-1.c index 7263ce41544..4c54f9e218a 100644 --- a/gcc/testsuite/gcc.dg/cpp/isysroot-1.c +++ b/gcc/testsuite/gcc.dg/cpp/isysroot-1.c @@ -1,10 +1,17 @@ /* { dg-options "-isysroot ${srcdir}/gcc.dg/cpp" } */ /* { dg-do compile { target *-*-darwin* } } */ -#include +/* For the test to succeed there needs to be some header that is to be found + in the 'expected' place i.e. /usr/include/. It's important that + it is not the name of a header for which fixincludes have been applied, + since such headers will be found in the gcc include-fixed dir and, in + general, reference additional headers. The dummy sysroot will prevent the + additional headers from being found, resulting in a failed test. So use + a header name we don't expect to see. */ +#include int main() { - /* Special stdio.h supplies function foo. */ + /* Special example.h supplies function foo. */ void (*x)(void) = foo; return 0; } diff --git a/gcc/testsuite/gcc.dg/cpp/usr/include/stdio.h b/gcc/testsuite/gcc.dg/cpp/usr/include/example.h similarity index 100% rename from gcc/testsuite/gcc.dg/cpp/usr/include/stdio.h rename to gcc/testsuite/gcc.dg/cpp/usr/include/example.h -- 2.30.2