diff options
| author | Nick Alcock <nick.alcock@oracle.com> | 2022-11-14 14:17:55 +0000 |
|---|---|---|
| committer | Nick Alcock <nick.alcock@oracle.com> | 2023-01-12 14:40:47 +0000 |
| commit | e2dc08c6f0642ca2c94e91997a8d4e971bea9971 (patch) | |
| tree | af771a6eab4dba0169074df0a0479d6d43498c57 /libctf/configure | |
| parent | 5e8b4bbcc8593e1f1f81c4fd3562d637a07ee0cc (diff) | |
| download | binutils-gdb-e2dc08c6f0642ca2c94e91997a8d4e971bea9971.tar.gz | |
libctf: skip the testsuite from inside dejagnu
The libctf testsuite uses Tcl try/catch to trap run_output errors. This
is only supported in reasonably recent Tcls, so we detect the lack of
try/catch and suppress the testsuite via an Automake conditional in its
absence.
But this turns out not to work: Automake produces a check-DEJAGNU target
regardless of the value of this conditional and sticks it in an
unconditionally-executed part of the makefile, so the testsuite gets
executed anyway, and fails with a nasty-looking syntax error. We can't
disable it by taking "dejagnu" out of AUTOMAKE_OPTIONS, because if you
do that Automake stops you using RUNTEST, RUNTESTFLAGS and other
variables users would expect to work.
So move to disabling the testsuite from inside the testsuite itself,
importing the value of the former Automake conditional as a Tcl variable
and exiting very early in default.exp if it's false.
* configure.ac (TCL_TRY): No longer an Automake conditional.
Rename to...
(HAVE_TCL_TRY): ... this.
* Makefile.am: Drop TCL_TRY.
(development.exp): Set have_tcl_try.
* testsuite/config/default.exp: Exit if have_tcl_try is false.
* configure: Regenerated.
* Makefile.in: Likewise.
Diffstat (limited to 'libctf/configure')
| -rwxr-xr-x | libctf/configure | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/libctf/configure b/libctf/configure index 17463a74cca..c22f7dffd2c 100755 --- a/libctf/configure +++ b/libctf/configure @@ -637,8 +637,7 @@ LTLIBOBJS LIBOBJS VERSION_FLAGS_NOBFD VERSION_FLAGS -TCL_TRY_FALSE -TCL_TRY_TRUE +HAVE_TCL_TRY EXPECT CTF_LIBADD SHARED_LDFLAGS @@ -11632,7 +11631,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11635 "configure" +#line 11634 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11738,7 +11737,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11741 "configure" +#line 11740 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14975,12 +14974,10 @@ fi` fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libctf_tcl_try" >&5 $as_echo "$ac_cv_libctf_tcl_try" >&6; } - if test "${ac_cv_libctf_tcl_try}" = yes; then - TCL_TRY_TRUE= - TCL_TRY_FALSE='#' -else - TCL_TRY_TRUE='#' - TCL_TRY_FALSE= + +HAVE_TCL_TRY=false +if test "${ac_cv_libctf_tcl_try}" = "yes"; then + HAVE_TCL_TRY=true fi @@ -15208,10 +15205,6 @@ if test -z "${BUILD_INFO_TRUE}" && test -z "${BUILD_INFO_FALSE}"; then as_fn_error $? "conditional \"BUILD_INFO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${TCL_TRY_TRUE}" && test -z "${TCL_TRY_FALSE}"; then - as_fn_error $? "conditional \"TCL_TRY\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 |