diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog | 10 | ||||
| -rwxr-xr-x | contrib/check_GNU_style_lib.py | 3 | ||||
| -rwxr-xr-x | contrib/test_installed | 19 |
3 files changed, 32 insertions, 0 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index ea2d807..6683ddc 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,13 @@ +2025-12-08 Joseph Myers <josmyers@redhat.com> + + * test_installed (--with-alt-cc=, --with-alt-cxx=) + (--with-compat-options=, --with-libiconv=): New options. + +2025-12-08 Jonathan Wakely <jwakely@redhat.com> + + * check_GNU_style_lib.py (check_GNU_style_file): Do not check + libstdc++ files. + 2025-12-06 Mark Zhuang <mark.zhuang@spacemit.com> * prepare-commit-msg: check --default-prefix diff --git a/contrib/check_GNU_style_lib.py b/contrib/check_GNU_style_lib.py index faf30c4..fccb3d6 100755 --- a/contrib/check_GNU_style_lib.py +++ b/contrib/check_GNU_style_lib.py @@ -285,6 +285,9 @@ def check_GNU_style_file(file, format): # Skip testsuite files if 'testsuite' in t or t.endswith('.py'): continue + # Libstdc++ does not use GNU style + if t.startswith('libstdc++-v3/'): + continue for hunk in pfile: delta = 0 diff --git a/contrib/test_installed b/contrib/test_installed index 77492ca..42c3f12 100755 --- a/contrib/test_installed +++ b/contrib/test_installed @@ -42,6 +42,7 @@ if test -f site.exp; then exit 1 fi +libiconv=-liconv while true; do case "$1" in --with-testsuite=*) testsuite=`echo "$1" | sed 's/[^=]*=//'`; shift;; @@ -51,6 +52,10 @@ while true; do --with-gcc=*) GCC_UNDER_TEST=`echo "$1" | sed 's/[^=]*=//'`; shift;; --with-g++=*) GXX_UNDER_TEST=`echo "$1" | sed 's/[^=]*=//'`; shift;; --with-gfortran=*) GFORTRAN_UNDER_TEST=`echo "$1" | sed 's/[^=]*=//'`; shift;; + --with-alt-cc=*) ALT_CC_UNDER_TEST=`echo "$1" | sed 's/[^=]*=//'`; shift;; + --with-alt-cxx=*) ALT_CXX_UNDER_TEST=`echo "$1" | sed 's/[^=]*=//'`; shift;; + --with-compat-options=*) COMPAT_OPTIONS=`echo "$1" | sed 's/[^=]*=//'`; shift;; + --with-libiconv=*) libiconv=`echo "$1" | sed 's/[^=]*=//'`; shift;; --without-gcc) GCC_UNDER_TEST=no; shift;; --without-g++) GXX_UNDER_TEST=no; shift;; --without-gfortran) GFORTRAN_UNDER_TEST=no; shift;; @@ -78,6 +83,10 @@ Supported arguments: --with-gcc=/some/dir/bin/gcc use specified gcc program [gcc] --with-g++=/some/dir/bin/g++ use specified g++ program [g++] --with-gfortran=/some/dir/bin/gfortran use specified gfortran program [gfortran] +--with-alt-cc=/some/compiler use specified alternative compiler in compat tests +--with-alt-cxx=/some/compiler use specified alternative compiler in compat tests +--with-compat-options=opts use specified COMPAT_OPTIONS in compat tests +--with-libiconv=linker-args use given arguments to link with iconv [-liconv] --without-gcc do not run gcc testsuite --without-g++ do not run g++ testsuite --without-gfortran do not run gfortran testsuite @@ -108,6 +117,7 @@ cat >site.exp <<EOF set rootme "." set tmpdir "${tmpdir-`${PWDCMD-pwd}`}" set srcdir "${testsuite-${srcdir}/gcc/testsuite}" +set libiconv "$libiconv" set CFLAGS "" set CXXFLAGS "" set GCC_UNDER_TEST "${GCC_UNDER_TEST-${prefix}${prefix+/bin/}gcc}" @@ -123,6 +133,15 @@ if test x${target} != x; then echo "set target_triplet $target" >> site.exp echo "set target_alias $target" >> site.exp fi +if test x"$ALT_CC_UNDER_TEST" != x; then + echo "set ALT_CC_UNDER_TEST \"${ALT_CC_UNDER_TEST}\"" >> site.exp +fi +if test x"$ALT_CXX_UNDER_TEST" != x; then + echo "set ALT_CXX_UNDER_TEST \"${ALT_CXX_UNDER_TEST}\"" >> site.exp +fi +if test x"$COMPAT_OPTIONS" != x; then + echo "set COMPAT_OPTIONS \"${COMPAT_OPTIONS}\"" >> site.exp +fi test x"${GCC_UNDER_TEST}" = x"no" || runtest --tool gcc ${1+"$@"} test x"${GXX_UNDER_TEST}" = x"no" || runtest --tool g++ ${1+"$@"} |