[Bug testsuite/108899] New: [13 Regression] ERROR: can't rename to "saved-unsupported": command already exists on i386

[Bug testsuite/108899] New: [13 Regression] ERROR: can't rename to "saved-unsupported": command already exists on i386

[haochen.jiang at intel dot com]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108899

            Bug ID: 108899
           Summary: [13 Regression] ERROR: can't rename to
                    "saved-unsupported": command already exists on i386
           Product: gcc
           Version: 13.0
            Status: UNCONFIRMED
          Severity: normal
          Priority: P3
         Component: testsuite
          Assignee: unassigned at gcc dot gnu.org
          Reporter: haochen.jiang at intel dot com
  Target Milestone: ---

We currently got these errors on i386 when running tests.

ERROR: can't rename to "saved-unsupported": command already exists
ERROR: in testcase
/export/gnu/import/git/gcc-test-master-intel64-native/src-master/gcc/testsuite/g++.dg/modules/modules.exp

I checked the trunk and I suppose it is probably caused by
r13-6288-g5344482c4d3ae0618fa8f5ed38f8309db43fdb82.

This commit changed modules.exp and rename unsupported to saved-unsupported.

Feel free to correct me if I am wrong.

[Bug testsuite/108899] [13 Regression] ERROR: can't rename to "saved-unsupported": command already exists on i386

[rguenth at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108899

Richard Biener <rguenth at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
   Target Milestone|---                         |13.0

[Bug testsuite/108899] [13 Regression] ERROR: can't rename to "saved-unsupported": command already exists on i386

[rguenth at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108899

--- Comment #1 from Richard Biener <rguenth at gcc dot gnu.org> ---
I don't see saved-unsupported used anywhere else, please double-check it's not
in your target board?

[Bug testsuite/108899] [13 Regression] ERROR: can't rename to "saved-unsupported": command already exists on i386

[jakub at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108899

Jakub Jelinek <jakub at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |jakub at gcc dot gnu.org

--- Comment #2 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
I think we usually do renames only conditionally, so perhaps:
2023-02-23  Jakub Jelinek  <jakub@redhat.com>

        PR testsuite/108899
        * g++.dg/modules/modules.exp: Only override unsupported if it
        exists and saved-unsupported doesn't.

--- gcc/testsuite/g++.dg/modules/modules.exp.jj 2023-02-22 20:50:34.208421799
+0100
+++ gcc/testsuite/g++.dg/modules/modules.exp    2023-02-23 13:07:40.207320104
+0100
@@ -319,11 +319,15 @@ cleanup_module_files [find $DEFAULT_REPO
 # so that, after an unsupported result in dg-test, we can skip rather
 # than fail subsequent related tests.
 set module_do {"compile" "P"}
-rename unsupported saved-unsupported
-proc unsupported { args } {
-    global module_do
-    lset module_do 1 "N"
-    return [saved-unsupported $args]
+if { [info procs unsupported] != [list] \
+      && [info procs saved-unsupported] == [list] } {
+    rename unsupported saved-unsupported
+
+    proc unsupported { args } {
+       global module_do
+       lset module_do 1 "N"
+       return [saved-unsupported $args]
+    }
 }

 # not grouped tests, sadly tcl doesn't have negated glob

Though, I don't see such an error in my make check logs, so can't test if it
fixes for you.

[Bug testsuite/108899] [13 Regression] ERROR: can't rename to "saved-unsupported": command already exists on i386

[rguenth at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108899

Richard Biener <rguenth at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Target|                            |i?86-*-*
             Status|UNCONFIRMED                 |NEW
     Ever confirmed|0                           |1
   Last reconfirmed|                            |2023-02-23

--- Comment #3 from Richard Biener <rguenth at gcc dot gnu.org> ---
Btw, I also see the errors when testing with -m32.  Might be related to the
dejagnu/tcl versions installed?

I have dejagnu 1.6.3 and tcl 8.6.13

[Bug testsuite/108899] [13 Regression] ERROR: can't rename to "saved-unsupported": command already exists on i386

[jakub at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108899

--- Comment #4 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
(In reply to Richard Biener from comment #3)
> Btw, I also see the errors when testing with -m32.  Might be related to the
> dejagnu/tcl versions installed?
> 
> I have dejagnu 1.6.3 and tcl 8.6.13

Were you testing with --target_board=unix\{-m32,-m64\} or something similar?
My bootstraps were separate x86_64-linux and i686-linux bootstraps with no
RUNTESTFLAGS specified and don't see it in either of the logs.

[Bug testsuite/108899] [13 Regression] ERROR: can't rename to "saved-unsupported": command already exists on i386

[jakub at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108899

--- Comment #5 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
I bet yes, because I've just reproduced it with
make check-g++ RUNTESTFLAGS='--target_board=unix\{-m32,-m64\} modules.exp'
Retrying now with my patch.

[Bug testsuite/108899] [13 Regression] ERROR: can't rename to "saved-unsupported": command already exists on i386

[rguenther at suse dot de]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108899

--- Comment #6 from rguenther at suse dot de <rguenther at suse dot de> ---
On Thu, 23 Feb 2023, jakub at gcc dot gnu.org wrote:

> https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108899
> 
> --- Comment #4 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
> (In reply to Richard Biener from comment #3)
> > Btw, I also see the errors when testing with -m32.  Might be related to the
> > dejagnu/tcl versions installed?
> > 
> > I have dejagnu 1.6.3 and tcl 8.6.13
> 
> Were you testing with --target_board=unix\{-m32,-m64\} or something similar?
> My bootstraps were separate x86_64-linux and i686-linux bootstraps with no
> RUNTESTFLAGS specified and don't see it in either of the logs.

Yes, --target_board=unix/\{,-m32\}

[Bug testsuite/108899] [13 Regression] ERROR: can't rename to "saved-unsupported": command already exists on i386

[cvs-commit at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108899

--- Comment #7 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Jakub Jelinek <jakub@gcc.gnu.org>:

https://gcc.gnu.org/g:5592679df783547049efc6d73727c5ff809ec302

commit r13-6306-g5592679df783547049efc6d73727c5ff809ec302
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Thu Feb 23 17:17:05 2023 +0100

    testsuite: Fix up modules.exp [PR108899]

    On Wed, Feb 22, 2023 at 02:33:42PM -0300, Alexandre Oliva via Gcc-patches
wrote:
    > When a multi-source module is found to be unsupported, we fail
    > module_cmi_p and subsequent sources.  Override proc unsupported to
    > mark the result in module_do, and test it to skip module_cmp_p and
    > subsequent related tests.
    >
    > for  gcc/testsuite/ChangeLog
    >
    >       * g++.dg/modules/modules.exp: Override unsupported to update
    >       module_do, and test it after dg-test.

    This patch breaks testing with more than one set of options in
    target board, like
    make check-g++ RUNTESTFLAGS='--target_board=unix\{-m32,-m64\} modules.exp'
    yields:
    ...
                     === g++ Summary for unix/-m32 ===

     # of expected passes            7217
     # of unexpected failures        1
     # of expected failures          18
     # of unsupported tests          2
     Running target unix/-m64
    ...
     ERROR: tcl error sourcing
/home/jakub/src/gcc/gcc/testsuite/g++.dg/modules/modules.exp.
     ERROR: tcl error code TCL OPERATION RENAME TARGET_EXISTS
     ERROR: can't rename to "saved-unsupported": command already exists
         while executing
     "rename unsupported saved-unsupported"
         (file "/home/jakub/src/gcc/gcc/testsuite/g++.dg/modules/modules.exp"
line 322)
         invoked from within
     "source /home/jakub/src/gcc/gcc/testsuite/g++.dg/modules/modules.exp"
         ("uplevel" body line 1)
         invoked from within
     "uplevel #0 source
/home/jakub/src/gcc/gcc/testsuite/g++.dg/modules/modules.exp"
         invoked from within
     "catch "uplevel #0 source $test_file_name" msg"

    In other spots where we in *.exp files rename some routine, we guard that
    and the following patch does that for modules.exp too.

    Tested with running
    make check-g++ RUNTESTFLAGS='--target_board=unix\{-m32,-m64\} modules.exp'
    again which now works properly again.

    2023-02-23  Jakub Jelinek  <jakub@redhat.com>

            PR testsuite/108899
            * g++.dg/modules/modules.exp: Only override unsupported if it
            exists and saved-unsupported doesn't.

[Bug testsuite/108899] [13 Regression] ERROR: can't rename to "saved-unsupported": command already exists on i386

[jakub at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108899

Jakub Jelinek <jakub at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
         Resolution|---                         |FIXED

--- Comment #8 from Jakub Jelinek <jakub at gcc dot gnu.org> ---
Should be fixed now.

[Bug testsuite/108899] [13 Regression] ERROR: can't rename to "saved-unsupported": command already exists on i386

[haochen.jiang at intel dot com]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108899

--- Comment #9 from Haochen Jiang <haochen.jiang at intel dot com> ---
(In reply to Jakub Jelinek from comment #8)
> Should be fixed now.

Sorry for the late reply.

Yes, it fixed for me now. Thx a lot!

[Bug testsuite/108899] [13 Regression] ERROR: can't rename to "saved-unsupported": command already exists on i386

[cvs-commit at gcc dot gnu.org]

https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108899

--- Comment #10 from CVS Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Alexandre Oliva <aoliva@gcc.gnu.org>:

https://gcc.gnu.org/g:673a2a6445a79bcce5ba433d6bbec4b99a1bc7c6

commit r13-7021-g673a2a6445a79bcce5ba433d6bbec4b99a1bc7c6
Author: Alexandre Oliva <oliva@adacore.com>
Date:   Wed Apr 5 11:27:28 2023 -0300

    testsuite: fix proc unsupported overriding in modules.exp [PR108899]

    The overrider of proc unsupported in modules.exp had two problems
    reported by Thomas Schwinge, even after Jakub Jelínek's fix:

    - it remained in effect while running other dejagnu testsets

    - it didn't quote correctly the argument list passed to it, which
      caused test names to be surrounded by curly braces, as in:

    UNSUPPORTED: {...}

    This patch fixes both issues, obsoleting and reverting Jakub's change,
    by dropping the overrider and renaming the saved proc back, and by
    using uplevel's argument list splicing.


    Co-authored-by: Thomas Schwinge <thomas@codesourcery.com>

    for  gcc/testsuite/ChangeLog

            PR testsuite/108899
            * g++.dg/modules/modules.exp (unsupported): Drop renaming.
            Fix quoting.