diff mbox series

[testsuite,ppc] skip ppc-fortran if fortran is disabled

Message ID orv8i98rdn.fsf@lxoliva.fsfla.org
State New
Headers
Series [testsuite,ppc] skip ppc-fortran if fortran is disabled |

Commit Message

Alexandre Oliva April 6, 2023, 6:19 a.m. UTC 
  Skip ppc-fortran.exp if a trivial fortran program cannot be compiled.

Regstrapped on x86_64-linux-gnu and ppc64-linux-gnu.  Also tested on
ppc64-vx7r2 with gcc-12, with the Fortran language disabled.  Ok to
install?


for  gcc/testsuite/ChangeLog

	* gcc.target/powerpc/ppc-fortran/ppc-fortran.exp: Test for
	fortran compiler, skip if missing.
---
 .../gcc.target/powerpc/ppc-fortran/ppc-fortran.exp |    9 +++++++++
 1 file changed, 9 insertions(+)

Comments

Kewen.Lin April 6, 2023, 8:32 a.m. UTC | #1 
Hi Alexandre,

on 2023/4/6 14:19, Alexandre Oliva wrote:
> 
> Skip ppc-fortran.exp if a trivial fortran program cannot be compiled.
> 

IIUC, without this patch and under the configuration disabling fortran,
all the cases in this sub-testsuite would fail?  Thanks for fixing!

> Regstrapped on x86_64-linux-gnu and ppc64-linux-gnu.  Also tested on
> ppc64-vx7r2 with gcc-12, with the Fortran language disabled.  Ok to
> install?
> 
> 
> for  gcc/testsuite/ChangeLog
> 
> 	* gcc.target/powerpc/ppc-fortran/ppc-fortran.exp: Test for
> 	fortran compiler, skip if missing.
> ---
>  .../gcc.target/powerpc/ppc-fortran/ppc-fortran.exp |    9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-fortran/ppc-fortran.exp b/gcc/testsuite/gcc.target/powerpc/ppc-fortran/ppc-fortran.exp
> index f7e99ac848753..d05c27ab589a7 100644
> --- a/gcc/testsuite/gcc.target/powerpc/ppc-fortran/ppc-fortran.exp
> +++ b/gcc/testsuite/gcc.target/powerpc/ppc-fortran/ppc-fortran.exp
> @@ -33,6 +33,15 @@ if ![info exists DEFAULT_FFLAGS] then {
>  # Initialize `dg'.
>  dg-init
> 
> +if { ![check_no_compiler_messages fortran_available assembly {
> +! Fortran
> +program P
> +  stop
> +end program P
> +} ""] } {
> +    return
> +}
> +

super nit: this check only needs proc check_no_compiler_messages,
can it be moved a bit upward just after line "load_lib gfortran-dg.exp"
then it can skip more unnecessary codes?

OK with this nit fixed (if you agree).  Thanks!

BR,
Kewen
Alexandre Oliva April 7, 2023, 3:41 a.m. UTC | #2 
Hello, Kewen,

On Apr  6, 2023, "Kewen.Lin" <linkw@linux.ibm.com> wrote:

> on 2023/4/6 14:19, Alexandre Oliva wrote:

>> Skip ppc-fortran.exp if a trivial fortran program cannot be compiled.

> IIUC, without this patch and under the configuration disabling fortran,
> all the cases in this sub-testsuite would fail?  Thanks for fixing!

Yup

> super nit: this check only needs proc check_no_compiler_messages,
> can it be moved a bit upward just after line "load_lib gfortran-dg.exp"
> then it can skip more unnecessary codes?

I wasn't sure, so I'd put it after supporting code.  Turns out it can.
Here's what I've just finished retesting, and am thus checking in.
Thanks,

> OK with this nit fixed (if you agree).  Thanks!


[testsuite] [ppc] skip ppc-fortran if fortran is disabled

Skip ppc-fortran.exp if a trivial fortran program cannot be compiled.


for  gcc/testsuite/ChangeLog

	* gcc.target/powerpc/ppc-fortran/ppc-fortran.exp: Test for
	fortran compiler, skip if missing.
---
 .../gcc.target/powerpc/ppc-fortran/ppc-fortran.exp |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-fortran/ppc-fortran.exp b/gcc/testsuite/gcc.target/powerpc/ppc-fortran/ppc-fortran.exp
index f7e99ac848753..f7b7c05487cda 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-fortran/ppc-fortran.exp
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-fortran/ppc-fortran.exp
@@ -21,6 +21,16 @@ if { ![istarget powerpc*-*-*] && ![istarget rs6000-*-*] } then {
   return
 }
 
+# Make sure there is a fortran compiler to test.
+if { ![check_no_compiler_messages fortran_available assembly {
+! Fortran
+program P
+  stop
+end program P
+} ""] } {
+    return
+}
+
 # Load support procs.
 load_lib gfortran-dg.exp
diff mbox series

Patch

diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-fortran/ppc-fortran.exp b/gcc/testsuite/gcc.target/powerpc/ppc-fortran/ppc-fortran.exp
index f7e99ac848753..d05c27ab589a7 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-fortran/ppc-fortran.exp
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-fortran/ppc-fortran.exp
@@ -33,6 +33,15 @@  if ![info exists DEFAULT_FFLAGS] then {
 # Initialize `dg'.
 dg-init
 
+if { ![check_no_compiler_messages fortran_available assembly {
+! Fortran
+program P
+  stop
+end program P
+} ""] } {
+    return
+}
+
 global gfortran_test_path
 global gfortran_aux_module_flags
 set gfortran_test_path $srcdir/$subdir