From a100a94530eb85991fa736ea5037cf8b83190ae6 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 22 Jun 2021 14:11:32 -0400 Subject: gdb/testsuite: restore configure script Commit f99d1d37496f ("Remove gdb/testsuite/configure") removed gdb/testsuite/configure, as anything gdb/testsuite/configure did could be done by gdb/configure. There is however one use case that popped up when this changed propagated to downstream consumers, to run the testsuite on an already built GDB. In the workflow of ROCm-GDB at AMD, a GDB package is built in a CI job. This GDB package is then tested on different machines / hardware configurations as part of other CI jobs. To achieve this, those CI jobs only configure the testsuite directory and run "make check" with an appropriate board file. In light of this use case, the way I see it is that gdb/testsuite could be considered its own project. It could be stored in a completely different repo if we want to, it just happens to be stored inside gdb/. Since the only downside of having gdb/testsuite/configure is that it takes a few more seconds to run, but on the other hand it's quite useful for some people, I propose re-adding it. In a sense, this is revert of f99d1d37496f, but it's not a direct git-revert, as some things have changed since. gdb/ChangeLog: * configure.ac: Remove things that were moved from testsuite/configure.ac. * configure: Re-generate. gdb/testsuite/ChangeLog: * configure.ac: Restore. * configure: Re-generate. * aclocal.m4: Re-generate. * Makefile.in (distclean): Add config.status. (Makefile): Adjust paths. (lib/pdtrace): Adjust paths. (config.status): Add. Change-Id: Ic38c79485e1835712d9c99649c9dfb59667254f1 --- gdb/configure | 88 ++++------------------------------------------------------- 1 file changed, 6 insertions(+), 82 deletions(-) (limited to 'gdb/configure') diff --git a/gdb/configure b/gdb/configure index de4528c..5d89635 100755 --- a/gdb/configure +++ b/gdb/configure @@ -619,14 +619,10 @@ ac_includes_default="\ # include #endif" -ac_header_list= enable_option_checking=no +ac_header_list= ac_subst_vars='LTLIBOBJS LIBOBJS -NM_TRANSFORM_NAME -GAS_TRANSFORM_NAME -READELF_TRANSFORM_NAME -STRIP_TRANSFORM_NAME GCORE_TRANSFORM_NAME GDB_TRANSFORM_NAME XSLTPROC @@ -637,7 +633,6 @@ LIBXXHASH HAVE_LIBXXHASH CTF_DEPS LIBCTF -enable_libctf LTLIBBABELTRACE LIBBABELTRACE HAVE_LIBBABELTRACE @@ -668,7 +663,6 @@ GDBTKLIBS X_LIBS X_LDFLAGS X_CFLAGS -subdirs TK_XINCLUDES TK_DEPS TK_LIBRARY @@ -776,7 +770,7 @@ PKG_CONFIG_PATH PKG_CONFIG HAVE_NATIVE_GCORE_TARGET TARGET_OBS -RPATH_ENVVAR +subdirs GDB_DATADIR DEBUGDIR MAKEINFO_EXTRA_FLAGS @@ -882,7 +876,6 @@ with_gdb_datadir with_relocated_sources with_auto_load_dir with_auto_load_safe_path -enable_shared enable_targets enable_64_bit_bfd enable_gdbmi @@ -963,7 +956,8 @@ DEBUGINFOD_LIBS YACC YFLAGS XMKMF' -ac_subdirs_all='gdbtk' +ac_subdirs_all='testsuite +gdbtk' # Initialize some variables set by options. ac_init_help= @@ -1589,7 +1583,6 @@ Optional Features: sometimes confusing) to the casual installer --enable-plugins Enable support for plugins --disable-largefile omit support for large files - --enable-shared build shared libraries [default=yes] --enable-targets=TARGETS alternative target configurations --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) @@ -6623,34 +6616,9 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_auto_load_safe_path" >&5 $as_echo "$with_auto_load_safe_path" >&6; } -# Enable shared libraries. -# Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : - enableval=$enable_shared; -else - enable_shared=yes -fi -# If we have shared libraries, try to set RPATH_ENVVAR reasonably, -# such that we can find the shared libraries in the build tree. -if test $enable_shared = no; then - # The variable `RPATH_ENVVAR' itself is not likely to be used on any - # platform. - RPATH_ENVVAR=RPATH_ENVVAR -else - # The variable `LD_LIBRARY_PATH' is used on most platforms. - RPATH_ENVVAR=LD_LIBRARY_PATH - # The following exceptions are taken from Libtool 1.4.3. - case $host_os in - aix*) - if test $host_cpu != ia64; then - RPATH_ENVVAR=LIBPATH - fi ;; - darwin* | rhapsody*) - RPATH_ENVVAR=DYLD_LIBRARY_PATH ;; - esac -fi +subdirs="$subdirs testsuite" # Check whether to support alternative target configurations @@ -18325,9 +18293,7 @@ $as_echo "${private_dir}" >&6; } CONFIG_OBS="${CONFIG_OBS} gdbres.o" fi - - -subdirs="$subdirs gdbtk" + subdirs="$subdirs gdbtk" fi fi @@ -19209,7 +19175,6 @@ fi - # If nativefile (NAT_FILE) is not set in configure.nat, we link to an # empty version. @@ -19841,44 +19806,6 @@ ac_config_files="$ac_config_files gcore" ac_config_files="$ac_config_files Makefile gdb-gdb.gdb gdb-gdb.py doc/Makefile data-directory/Makefile" -# Transform the name of some programs for the testsuite/lib/pdtrace -# test tool. - - gdb_ac_transform=`echo "$program_transform_name" | sed -e 's/\\$\\$/\\$/g'` - STRIP_TRANSFORM_NAME=`echo strip | sed -e "$gdb_ac_transform"` - if test "x$STRIP_TRANSFORM_NAME" = x; then - STRIP_TRANSFORM_NAME=strip - fi - - - - gdb_ac_transform=`echo "$program_transform_name" | sed -e 's/\\$\\$/\\$/g'` - READELF_TRANSFORM_NAME=`echo readelf | sed -e "$gdb_ac_transform"` - if test "x$READELF_TRANSFORM_NAME" = x; then - READELF_TRANSFORM_NAME=readelf - fi - - - - gdb_ac_transform=`echo "$program_transform_name" | sed -e 's/\\$\\$/\\$/g'` - GAS_TRANSFORM_NAME=`echo as | sed -e "$gdb_ac_transform"` - if test "x$GAS_TRANSFORM_NAME" = x; then - GAS_TRANSFORM_NAME=as - fi - - - - gdb_ac_transform=`echo "$program_transform_name" | sed -e 's/\\$\\$/\\$/g'` - NM_TRANSFORM_NAME=`echo nm | sed -e "$gdb_ac_transform"` - if test "x$NM_TRANSFORM_NAME" = x; then - NM_TRANSFORM_NAME=nm - fi - - -ac_config_files="$ac_config_files testsuite/lib/pdtrace" - -ac_config_files="$ac_config_files testsuite/Makefile" - cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -20608,8 +20535,6 @@ do "gdb-gdb.py") CONFIG_FILES="$CONFIG_FILES gdb-gdb.py" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "data-directory/Makefile") CONFIG_FILES="$CONFIG_FILES data-directory/Makefile" ;; - "testsuite/lib/pdtrace") CONFIG_FILES="$CONFIG_FILES testsuite/lib/pdtrace" ;; - "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -21240,7 +21165,6 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} "depdir":C) $SHELL $ac_aux_dir/mkinstalldirs $DEPDIR ;; "nm.h":L) echo > stamp-nmh ;; "gcore":F) chmod +x gcore ;; - "testsuite/lib/pdtrace":F) chmod +x testsuite/lib/pdtrace ;; esac done # for ac_tag -- cgit v1.1