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 --git a/gcc/testsuite/ChangeLog.omp b/gcc/testsuite/ChangeLog.omp
index a31536276a21648397f6c9b6539792d04caaa3d3..7310ea537024e8dfadea6c713667ab6291464ab5 100644 (file)
--- 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 a5714593c5221a802b622be39c7c5230ab113f62..9da5d8588061658c60d39df102a549095a7395fd 100644 (file)
--- 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 9f06e2dd7794d150e12ed088563ea9a94ba4041f..c3954e4e782c7db81a477bf3e4197047cc4660e3 100644 (file)
--- 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 ac176901bf271ce7ac004a39c7cc1771e2284a6d..c2d4e11c9d32dacf5b0b563e30aad295e7546e41 100644 (file)
--- 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 279d9f6d0506fe6800be62e21c8899167f804e7a..078c5de87d001a0efc567f145e38b04f91df95f4 100644 (file)
--- 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 f5c83c74024f1364c87630e4541f0dc7685da70b..622f2de6ff3e4817c5b9e2c1f41529ffbb33e12e 100644 (file)
--- 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 cdee0b89efe28feceffce7a105c3e8fba2184721..50b92ec069c931fbbcdce54451660832c5e1dffe 100644 (file)
--- 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 14dfcc90c4e62e5f31cc371ceae94a416d29eb1f..b0893cc15e8490ddbc70ea1912d08ac4b0fee2d3 100644 (file)
--- 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 eef5cc632c93c1e99167c5d318051592b8dfde79..ef40134fa3c27ef6552241920837925fd6705095 100644 (file)
--- 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 a9f64cd5cf106b3746a06627a2f773516c929fc2..9f35b0dcb800fd756b566c98b6812a9377eb91a6 100644 (file)
--- 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 f8bdb2716cd40ddc6c2056d7c55f8c389c60f664..116f548ad99e311b9911317dfc5e9e68a7ba7adb 100644 (file)
--- 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 9ef46cea14f0194c3d61cad98f010a37ed4d7bef..704b27cb28a41eb3dbcf38b3d642d814b76076dd 100644 (file)
--- 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 d68428fce137ce25d6b1e80cb27906b79638848c..26b4ab5a015a1045d7c601363ba22857b8a33906 100644 (file)
--- 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 dc80cd332a18649585d0bbc313012164ea913efa..a0d1bdc8e83efe5e53c7678e5ae4d02898ea481e 100644 (file)
--- 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 cb5b91dc79b42a84f4e5141b8d4036dba9198264..632604f5ee81db4dd4643b549efe02461c72653c 100644 (file)
--- 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 6791c37354619b746be3c502718f03fd4359061f..4ce408dbc39d3563385b936052bb8245e003083c 100644 (file)
--- 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 4e130515455dc39239c91eaff1b8089c9cfb47a6..2fbfe0e714406889e65846dfaa299673466f43f3 100644 (file)
--- 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 07d1a033c5a0c59cfbd4bb1e776e5159e5d3be05..5176d8b5741094bf69aff308b76789fb8fde2810 100644 (file)
--- 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 79b8a14cacd2ffe55599fd4089f78189f5adba15..bfd567bba95fa3c1f1ee8f89cf78bd8abb057ccc 100644 (file)
--- 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 24e5e094631f97fa75feeaddec60258719029b99..ba40d007bfb16a8cc5c1b462a5a8ea7eade3d064 100644 (file)
--- 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);