[PATCH] Fix PR testsuite/64605

[PATCH] Fix PR testsuite/64605

[Ilya Verbin]

Hi!

This patch fixes 'make check-target-libatomic'.

The problem is that gcc-dg.exp calls check_effective_target_lto, which calls
libatomic_target_compile.  Therefore gcc-dg.exp should be loaded only after the
definition of libatomic_target_compile.

However, a similar exp file in other tree (libitm/testsuite/lib/libitm.exp)
doesn't contain any explicit 'load_gcc_lib gcc-dg.exp' at all, but it loads
gcc-dg.exp implicitly.  So I'm not sure whether this patch is correct.

Could someone familiar with DejaGnu please review it?


diff --git a/libatomic/testsuite/lib/libatomic.exp b/libatomic/testsuite/lib/libatomic.exp
index 28cbaa8..b95032a 100644
--- a/libatomic/testsuite/lib/libatomic.exp
+++ b/libatomic/testsuite/lib/libatomic.exp
@@ -23,6 +23,11 @@ proc load_gcc_lib { filename } {
 }
 
 load_lib dg.exp
+
+# Required to use gcc-dg.exp - however, the latter should NOT be
+# loaded until ${tool}_target_compile is defined since it uses that
+# to determine default LTO options.
+
 load_gcc_lib file-format.exp
 load_gcc_lib target-supports.exp
 load_gcc_lib target-utils.exp
@@ -40,7 +45,6 @@ load_gcc_lib torture-options.exp
 load_gcc_lib timeout.exp
 load_gcc_lib timeout-dg.exp
 load_gcc_lib fortran-modules.exp
-load_gcc_lib gcc-dg.exp
 
 set dg-do-what-default run
 
@@ -219,3 +223,5 @@ proc libatomic_option_proc { option } {
 	return 0
     }
 }
+
+load_gcc_lib gcc-dg.exp


Thanks,
  -- Ilya

Re: [PATCH] Fix PR testsuite/64605

[Mike Stump]

On Jan 15, 2015, at 8:14 AM, Ilya Verbin <iverbin@gmail.com> wrote:
> The problem is that gcc-dg.exp calls check_effective_target_lto, which calls
> libatomic_target_compile.  Therefore gcc-dg.exp should be loaded only after the
> definition of libatomic_target_compile.

> However, a similar exp file in other tree (libitm/testsuite/lib/libitm.exp)
> doesn't contain any explicit 'load_gcc_lib gcc-dg.exp' at all, but it loads
> gcc-dg.exp implicitly.  So I'm not sure whether this patch is correct.

So, can you try the itm version of this?  If that works, Ok.

Re: [PATCH] Fix PR testsuite/64605

[Ilya Verbin]

On 15 Jan 09:40, Mike Stump wrote:
> On Jan 15, 2015, at 8:14 AM, Ilya Verbin <iverbin@gmail.com> wrote:
> > The problem is that gcc-dg.exp calls check_effective_target_lto, which calls
> > libatomic_target_compile.  Therefore gcc-dg.exp should be loaded only after the
> > definition of libatomic_target_compile.
> 
> > However, a similar exp file in other tree (libitm/testsuite/lib/libitm.exp)
> > doesn't contain any explicit 'load_gcc_lib gcc-dg.exp' at all, but it loads
> > gcc-dg.exp implicitly.  So I'm not sure whether this patch is correct.
> 
> So, can you try the itm version of this?  If that works, Ok.

If I just remove 'load_gcc_lib gcc-dg.exp' from libatomic.exp, like this is done
in libitm.exp, it will not work:

$ make check-target-libatomic
...
ERROR: (DejaGnu) proc "gcc-dg-test-1 libatomic_target_compile ../../../../gcc/libatomic/testsuite/libatomic.c/atomic-compare-exchange-1.c run { -g}" does not exist.

Note that gcc-dg-test-1 is defined in gcc-dg.exp, so it's somehow automatically
loaded for libitm and other libs, but non loaded for libatomic.

  -- Ilya

Re: [PATCH] Fix PR testsuite/64605

[Mike Stump]

On Jan 15, 2015, at 9:53 AM, Ilya Verbin <iverbin@gmail.com> wrote:
> If I just remove 'load_gcc_lib gcc-dg.exp' from libatomic.exp, like this is done
> in libitm.exp, it will not work:

Ok, original patch is fine.

Re: [PATCH] Fix PR testsuite/64605

[Ilya Verbin]

On 15 Jan 11:20, Mike Stump wrote:
> On Jan 15, 2015, at 9:53 AM, Ilya Verbin <iverbin@gmail.com> wrote:
> > If I just remove 'load_gcc_lib gcc-dg.exp' from libatomic.exp, like this is done
> > in libitm.exp, it will not work:
> 
> Ok, original patch is fine.

Oh, I see, it's loaded by libitm/testsuite/libitm.c/c.exp, so I changed the
patch for consistency.  Here is the final version, OK to commit?


	PR testsuite/64605
	* testsuite/lib/libatomic.exp: Do not load gcc-dg.exp.
	* testsuite/libatomic.c/c.exp: Load gcc-dg.exp.


diff --git a/libatomic/testsuite/lib/libatomic.exp b/libatomic/testsuite/lib/libatomic.exp
index 28cbaa8..0491c18 100644
--- a/libatomic/testsuite/lib/libatomic.exp
+++ b/libatomic/testsuite/lib/libatomic.exp
@@ -23,6 +23,11 @@ proc load_gcc_lib { filename } {
 }
 
 load_lib dg.exp
+
+# Required to use gcc-dg.exp - however, the latter should NOT be
+# loaded until ${tool}_target_compile is defined since it uses that
+# to determine default LTO options.
+
 load_gcc_lib file-format.exp
 load_gcc_lib target-supports.exp
 load_gcc_lib target-utils.exp
@@ -40,7 +45,6 @@ load_gcc_lib torture-options.exp
 load_gcc_lib timeout.exp
 load_gcc_lib timeout-dg.exp
 load_gcc_lib fortran-modules.exp
-load_gcc_lib gcc-dg.exp
 
 set dg-do-what-default run
 
diff --git a/libatomic/testsuite/libatomic.c/c.exp b/libatomic/testsuite/libatomic.c/c.exp
index 1da3cb1..dbdb5eb 100644
--- a/libatomic/testsuite/libatomic.c/c.exp
+++ b/libatomic/testsuite/libatomic.c/c.exp
@@ -21,6 +21,7 @@ if [info exists lang_test_file] then {
 }
 
 load_lib libatomic-dg.exp
+load_gcc_lib gcc-dg.exp
 
 # If a testcase doesn't have special options, use these.
 if ![info exists DEFAULT_CFLAGS] then {


  -- Ilya

Re: [PATCH] Fix PR testsuite/64605

[Mike Stump]

On Jan 15, 2015, at 11:54 AM, Ilya Verbin <iverbin@gmail.com> wrote:
> On 15 Jan 11:20, Mike Stump wrote:
>> On Jan 15, 2015, at 9:53 AM, Ilya Verbin <iverbin@gmail.com> wrote:
>>> If I just remove 'load_gcc_lib gcc-dg.exp' from libatomic.exp, like this is done
>>> in libitm.exp, it will not work:
>> 
>> Ok, original patch is fine.
> 
> Oh, I see, it's loaded by libitm/testsuite/libitm.c/c.exp, so I changed the
> patch for consistency.  Here is the final version, OK to commit?

Ok.  That version looks better.  Thanks for finding that bit.

Re: [PATCH] Fix PR testsuite/64605

[Gerald Pfeifer]

On Thursday 2015-01-15 20:53, Ilya Verbin wrote:
> $ make check-target-libatomic
> ...
> ERROR: (DejaGnu) proc "gcc-dg-test-1 libatomic_target_compile 
> ../../../../gcc/libatomic/testsuite/libatomic.c/atomic-compare-exchange-1.c 
> run { -g}" does not exist.

For a few days now I see the following in my daily test runs:

  The error code is NONE
  The info on the error is:
  invalid command name "libatomic_target_compile"
      while executing
  "::tcl_unknown libatomic_target_compile lto67385.c lto67385.o object
  additional_flags=-flto"
      ("uplevel" body line 1)
      invoked from within
  "uplevel 1 ::tcl_unknown $args"
  gmake[4]: *** [check-DEJAGNU] Error 1

Does your patch aim to address this, or is this something else
I should report?

Gerald

Re: [PATCH] Fix PR testsuite/64605

[Ilya Verbin]

On 16 Jan 11:57, Gerald Pfeifer wrote:
> For a few days now I see the following in my daily test runs:
> 
>   The error code is NONE
>   The info on the error is:
>   invalid command name "libatomic_target_compile"
>       while executing
>   "::tcl_unknown libatomic_target_compile lto67385.c lto67385.o object
>   additional_flags=-flto"
>       ("uplevel" body line 1)
>       invoked from within
>   "uplevel 1 ::tcl_unknown $args"
>   gmake[4]: *** [check-DEJAGNU] Error 1
> 
> Does your patch aim to address this, or is this something else
> I should report?

Yes, my patch fixes exactly this issue.  I've committed it as r219722.

  -- Ilya