On Wed, Feb 11, 2026 at 04:40:01PM -0500, Pietro Monteiro wrote:
> I used Jakub's patch[1] as a starting point. After cleaning the
> variables I tested using g++ for the C++ tests and it wans't onerous
> as the comment in c++.exp implied, so I decided to just use g++.
>
> [1]
> https://inbox.sourceware.org/gcc-patches/aYxz3oGdlDLWZPbI@tucnak/T/#m2fffbd0c0853485a80c7ed5101b6892cf1179a31
>
> -- >8 --
>
> The commit r16-7202-gb129ff0880c6d1 broke running libitm’s testsuite
> using combinations of options because it didn’t clean up all the
> global variables set in c++.exp. Fix the regression by using g++ for
> the C++ tests and cleaning up the variables shared between C and C++
> tests.
>
> libitm/ChangeLog:
> PR libitm/69018
> * testsuite/lib/libitm.exp (libitm_init): Check
Just one space after :, not two.
> GXX_UNDER_TEST. Add "${blddir}/.libs" to
> always_ld_library_path if blddir is not empty. Use
> "-fdiagnostics-plain-output". Don't set compiler to GCC_UNDER_TEST.
> * testsuite/libitm.c++/c++.exp: If $blddir is not empty set
> libstdc++_library_path, shlib_ext, lang_include_flags, add
> "${blddir}/${lang_library_paths}" to ld_library_path.
> Unset libstdc++_library_path and shlib_ext if we skip C++
> tests and at the end of the test run.
> * testsuite/libitm.c/c.exp: Update the FSF address to the
> website in the license text. Unset lang_library_paths and
> lang_include_flags. Set the compiler to $GCC_UNDER_TEST.
>
> Co-authored-by: Jakub Jelinek <[email protected]>
> Signed-off-by: Pietro Monteiro <[email protected]>
LGTM.
Jakub
