public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc/devel/omp/gcc-11] Fix ISO_Fortran_binding.h paths in gfortran testsuite
@ 2021-08-20 3:05 Sandra Loosemore
0 siblings, 0 replies; only message in thread
From: Sandra Loosemore @ 2021-08-20 3:05 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:9066930df2310a09aed84e6ddb33af570aefc6a4
commit 9066930df2310a09aed84e6ddb33af570aefc6a4
Author: Sandra Loosemore <sandra@codesourcery.com>
Date: Wed Aug 11 18:46:24 2021 -0700
Fix ISO_Fortran_binding.h paths in gfortran testsuite
ISO_Fortran_binding.h is now generated in the libgfortran build
directory where it is on the default include path. Adjust includes in
the gfortran testsuite not to include an explicit path pointing at the
source directory.
2021-07-27 Sandra Loosemore <sandra@codesourcery.com>
gcc/testsuite/
PR libfortran/101305
* gfortran.dg/ISO_Fortran_binding_1.c: Adjust include path.
* gfortran.dg/ISO_Fortran_binding_10.c: Likewise.
* gfortran.dg/ISO_Fortran_binding_11.c: Likewise.
* gfortran.dg/ISO_Fortran_binding_12.c: Likewise.
* gfortran.dg/ISO_Fortran_binding_15.c: Likewise.
* gfortran.dg/ISO_Fortran_binding_16.c: Likewise.
* gfortran.dg/ISO_Fortran_binding_17.c: Likewise.
* gfortran.dg/ISO_Fortran_binding_18.c: Likewise.
* gfortran.dg/ISO_Fortran_binding_3.c: Likewise.
* gfortran.dg/ISO_Fortran_binding_5.c: Likewise.
* gfortran.dg/ISO_Fortran_binding_6.c: Likewise.
* gfortran.dg/ISO_Fortran_binding_7.c: Likewise.
* gfortran.dg/ISO_Fortran_binding_8.c: Likewise.
* gfortran.dg/ISO_Fortran_binding_9.c: Likewise.
* gfortran.dg/PR94327.c: Likewise.
* gfortran.dg/PR94331.c: Likewise.
* gfortran.dg/bind_c_array_params_3_aux.c: Likewise.
* gfortran.dg/iso_fortran_binding_uint8_array_driver.c: Likewise.
* gfortran.dg/pr93524.c: Likewise.
(cherry picked from commit a3b350f1799a1c0f9e2ece5b817a537fe42f0d2d)
Diff:
---
gcc/testsuite/ChangeLog.omp | 27 ++++++++++++++++++++++
gcc/testsuite/gfortran.dg/ISO_Fortran_binding_1.c | 2 +-
gcc/testsuite/gfortran.dg/ISO_Fortran_binding_10.c | 2 +-
gcc/testsuite/gfortran.dg/ISO_Fortran_binding_11.c | 2 +-
gcc/testsuite/gfortran.dg/ISO_Fortran_binding_12.c | 2 +-
gcc/testsuite/gfortran.dg/ISO_Fortran_binding_15.c | 2 +-
gcc/testsuite/gfortran.dg/ISO_Fortran_binding_16.c | 2 +-
gcc/testsuite/gfortran.dg/ISO_Fortran_binding_17.c | 2 +-
gcc/testsuite/gfortran.dg/ISO_Fortran_binding_18.c | 2 +-
gcc/testsuite/gfortran.dg/ISO_Fortran_binding_3.c | 2 +-
gcc/testsuite/gfortran.dg/ISO_Fortran_binding_5.c | 2 +-
gcc/testsuite/gfortran.dg/ISO_Fortran_binding_6.c | 2 +-
gcc/testsuite/gfortran.dg/ISO_Fortran_binding_7.c | 2 +-
gcc/testsuite/gfortran.dg/ISO_Fortran_binding_8.c | 2 +-
gcc/testsuite/gfortran.dg/ISO_Fortran_binding_9.c | 2 +-
gcc/testsuite/gfortran.dg/PR94327.c | 2 +-
gcc/testsuite/gfortran.dg/PR94331.c | 2 +-
.../gfortran.dg/bind_c_array_params_3_aux.c | 2 +-
.../iso_fortran_binding_uint8_array_driver.c | 2 +-
gcc/testsuite/gfortran.dg/pr93524.c | 2 +-
20 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index a31536276a2..7310ea53702 100644
--- a/gcc/testsuite/ChangeLog.omp
+++ b/gcc/testsuite/ChangeLog.omp
@@ -1,3 +1,30 @@
+2021-08-11 Sandra Loosemore <sandra@codesourcery.com>
+
+ Backported from master:
+
+ 2021-07-27 Sandra Loosemore <sandra@codesourcery.com>
+
+ PR libfortran/101305
+ * gfortran.dg/ISO_Fortran_binding_1.c: Adjust include path.
+ * gfortran.dg/ISO_Fortran_binding_10.c: Likewise.
+ * gfortran.dg/ISO_Fortran_binding_11.c: Likewise.
+ * gfortran.dg/ISO_Fortran_binding_12.c: Likewise.
+ * gfortran.dg/ISO_Fortran_binding_15.c: Likewise.
+ * gfortran.dg/ISO_Fortran_binding_16.c: Likewise.
+ * gfortran.dg/ISO_Fortran_binding_17.c: Likewise.
+ * gfortran.dg/ISO_Fortran_binding_18.c: Likewise.
+ * gfortran.dg/ISO_Fortran_binding_3.c: Likewise.
+ * gfortran.dg/ISO_Fortran_binding_5.c: Likewise.
+ * gfortran.dg/ISO_Fortran_binding_6.c: Likewise.
+ * gfortran.dg/ISO_Fortran_binding_7.c: Likewise.
+ * gfortran.dg/ISO_Fortran_binding_8.c: Likewise.
+ * gfortran.dg/ISO_Fortran_binding_9.c: Likewise.
+ * gfortran.dg/PR94327.c: Likewise.
+ * gfortran.dg/PR94331.c: Likewise.
+ * gfortran.dg/bind_c_array_params_3_aux.c: Likewise.
+ * gfortran.dg/iso_fortran_binding_uint8_array_driver.c: Likewise.
+ * gfortran.dg/pr93524.c: Likewise.
+
2021-08-11 Sandra Loosemore <sandra@codesourcery.com>
Backported from master:
diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_1.c b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_1.c
index a5714593c52..9da5d858806 100644
--- a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_1.c
+++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_1.c
@@ -1,6 +1,6 @@
/* Test F2008 18.5: ISO_Fortran_binding.h functions. */
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_10.c b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_10.c
index 9f06e2dd779..c3954e4e782 100644
--- a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_10.c
+++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_10.c
@@ -2,7 +2,7 @@
/* Contributed by Reinhold Bader <Bader@lrz.de> */
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
#include <stdlib.h>
#include <stdio.h>
#include <stdbool.h>
diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_11.c b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_11.c
index ac176901bf2..c2d4e11c9d3 100644
--- a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_11.c
+++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_11.c
@@ -5,7 +5,7 @@ Contributed by Reinhold Bader <Bader@lrz.de>#include <stdio.h> */
#include <stdlib.h>
#include <stddef.h>
#include <stdio.h>
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
typedef struct
{
diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_12.c b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_12.c
index 279d9f6d050..078c5de87d0 100644
--- a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_12.c
+++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_12.c
@@ -2,7 +2,7 @@
#include <stdio.h>
#include <math.h>
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
/* Contributed by Reinhold Bader <Bader@lrz.de> */
diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_15.c b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_15.c
index f5c83c74024..622f2de6ff3 100644
--- a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_15.c
+++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_15.c
@@ -4,7 +4,7 @@
#include <stdlib.h>
#include <stdio.h>
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
// Prototype for Fortran functions
extern void Fsub(CFI_cdesc_t *);
diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_16.c b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_16.c
index cdee0b89efe..50b92ec069c 100644
--- a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_16.c
+++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_16.c
@@ -1,6 +1,6 @@
/* Test the fix for PR92142. */
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
#include <stdlib.h>
diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_17.c b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_17.c
index 14dfcc90c4e..b0893cc15e8 100644
--- a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_17.c
+++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_17.c
@@ -2,7 +2,7 @@
#include <stdio.h>
#include <assert.h>
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
void Csub(const CFI_cdesc_t *, size_t, CFI_index_t invalid);
diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_18.c b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_18.c
index eef5cc632c9..ef40134fa3c 100644
--- a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_18.c
+++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_18.c
@@ -1,6 +1,6 @@
#include <stdlib.h>
#include <string.h>
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
extern int do_loop(CFI_cdesc_t* array);
diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_3.c b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_3.c
index a9f64cd5cf1..9f35b0dcb80 100644
--- a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_3.c
+++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_3.c
@@ -1,4 +1,4 @@
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_5.c b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_5.c
index f8bdb2716cd..116f548ad99 100644
--- a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_5.c
+++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_5.c
@@ -4,7 +4,7 @@
#include <stdio.h>
#include <math.h>
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
typedef struct {
int i;
diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_6.c b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_6.c
index 9ef46cea14f..704b27cb28a 100644
--- a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_6.c
+++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_6.c
@@ -4,7 +4,7 @@
#include <stdio.h>
#include <math.h>
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
#define DEBUG 0
diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_7.c b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_7.c
index d68428fce13..26b4ab5a015 100644
--- a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_7.c
+++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_7.c
@@ -2,7 +2,7 @@
/* Contributed by Reinhold Bader <Bader@lrz.de> */
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_8.c b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_8.c
index dc80cd332a1..a0d1bdc8e83 100644
--- a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_8.c
+++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_8.c
@@ -2,7 +2,7 @@
/* Contributed by Reinhold Bader <Bader@lrz.de> */
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
#include <stdio.h>
float Cxgl[] = { 1.1, 2.3, 5.1, 4.2 };
diff --git a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_9.c b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_9.c
index cb5b91dc79b..632604f5ee8 100644
--- a/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_9.c
+++ b/gcc/testsuite/gfortran.dg/ISO_Fortran_binding_9.c
@@ -2,7 +2,7 @@
/* Contributed by Gilles Gouaillardet <gilles@rist.or.jp> */
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
#include <stdlib.h>
int cdesc_c(CFI_cdesc_t* x, long *expected)
diff --git a/gcc/testsuite/gfortran.dg/PR94327.c b/gcc/testsuite/gfortran.dg/PR94327.c
index 6791c373546..4ce408dbc39 100644
--- a/gcc/testsuite/gfortran.dg/PR94327.c
+++ b/gcc/testsuite/gfortran.dg/PR94327.c
@@ -4,7 +4,7 @@
#include <stdbool.h>
#include <stdlib.h>
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
bool c_vrfy (const CFI_cdesc_t *restrict);
diff --git a/gcc/testsuite/gfortran.dg/PR94331.c b/gcc/testsuite/gfortran.dg/PR94331.c
index 4e130515455..2fbfe0e7144 100644
--- a/gcc/testsuite/gfortran.dg/PR94331.c
+++ b/gcc/testsuite/gfortran.dg/PR94331.c
@@ -4,7 +4,7 @@
#include <stdbool.h>
#include <stdlib.h>
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
bool c_vrfy (const CFI_cdesc_t *restrict);
diff --git a/gcc/testsuite/gfortran.dg/bind_c_array_params_3_aux.c b/gcc/testsuite/gfortran.dg/bind_c_array_params_3_aux.c
index 07d1a033c5a..5176d8b5741 100644
--- a/gcc/testsuite/gfortran.dg/bind_c_array_params_3_aux.c
+++ b/gcc/testsuite/gfortran.dg/bind_c_array_params_3_aux.c
@@ -5,7 +5,7 @@
#include <errno.h>
#include <stdio.h>
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
void arr_set_c(CFI_cdesc_t*);
diff --git a/gcc/testsuite/gfortran.dg/iso_fortran_binding_uint8_array_driver.c b/gcc/testsuite/gfortran.dg/iso_fortran_binding_uint8_array_driver.c
index 79b8a14cacd..bfd567bba95 100644
--- a/gcc/testsuite/gfortran.dg/iso_fortran_binding_uint8_array_driver.c
+++ b/gcc/testsuite/gfortran.dg/iso_fortran_binding_uint8_array_driver.c
@@ -1,7 +1,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <inttypes.h>
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
extern void fsub(CFI_cdesc_t *);
diff --git a/gcc/testsuite/gfortran.dg/pr93524.c b/gcc/testsuite/gfortran.dg/pr93524.c
index 24e5e094631..ba40d007bfb 100644
--- a/gcc/testsuite/gfortran.dg/pr93524.c
+++ b/gcc/testsuite/gfortran.dg/pr93524.c
@@ -2,7 +2,7 @@
sm incorrectly for dimensions > 2. */
#include <stdlib.h> // For size_t
-#include "../../../libgfortran/ISO_Fortran_binding.h"
+#include "ISO_Fortran_binding.h"
void my_fortran_sub_1 (CFI_cdesc_t *dv);
void my_fortran_sub_2 (CFI_cdesc_t *dv);
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-08-20 3:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-20 3:05 [gcc/devel/omp/gcc-11] Fix ISO_Fortran_binding.h paths in gfortran testsuite Sandra Loosemore
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).