RFC: remove a bunch of testsuite/**/configure scripts

RFC: remove a bunch of testsuite/**/configure scripts

[Tom Tromey]

I plan to check this in soon.

While working on something unrelated, I ran across some weirdness in
gdb/testsuite Makefiles.  Digging a little deeper, I found a bunch of
configure scripts in subdirectories.  These scripts don't do anything
useful, so this patch removes all of them.

I also removed some of the individual rules to rebuild Makefiles.  These
rules never worked correctly.

Built and regtested on x86-64 (compile farm).

I'd like to go a few step farther and remove both testsuite/configure
and all the Makefile.in's, but the latter at least were recently updated
to make "make clean" work, so I'm a little reluctant to do this.

I omitted the removed files from the appended.

Tom

2011-02-28  Tom Tromey  <tromey@redhat.com>

	* gdb.hp/gdb.aCC/Makefile.in (Makefile): Remove.
	* gdb.hp/gdb.aCC/configure (Makefile): Remove.
	* gdb.hp/gdb.aCC/configure.ac: Remove.
	* gdb.hp/gdb.base-hp/Makefile.in (Makefile): Remove.
	* gdb.hp/gdb.base-hp/configure (Makefile): Remove.
	* gdb.hp/gdb.base-hp/configure.ac: Remove.
	* gdb.hp/gdb.compat/Makefile.in (Makefile): Remove.
	* gdb.hp/gdb.compat/configure (Makefile): Remove.
	* gdb.hp/gdb.compat/configure.ac: Remove.
	* gdb.hp/gdb.defects/Makefile.in (Makefile): Remove.
	* gdb.hp/gdb.defects/configure (Makefile): Remove.
	* gdb.hp/gdb.defects/configure.ac: Remove.
	* gdb.hp/gdb.objdbg/Makefile.in (Makefile): Remove.
	* gdb.hp/gdb.objdbg/configure (Makefile): Remove.
	* gdb.hp/gdb.objdbg/configure.ac: Remove.
	* gdb.hp/configure.ac: Remove.
	* gdb.hp/configure: Remove.
	* gdb.hp/Makefile.in (SUBDIRS): No longer a configure
	substitution.
	(Makefile): Remove rule.
	* gdb.cell/configure.ac: Remove.
	* gdb.cell/configure: Remove.
	* gdb.stabs/Makefile.in (Makefile): Remove.
	(distclean): Don't remove config.status or config.log.
	* gdb.stabs/configure (Makefile): Remove.
	* gdb.stabs/configure.ac: Remove.
	* configure: Rebuild.
	* configure.ac: Don't AC_CONFIG_HEADER in gdb.hp or gdb.stabs.
	Remove stabs-specific logic.  Test for existence of ../gdbtk
	before configuring gdb.gdbtk.  Build Makefiles in gdb.hp
	subdirectories and gdb.stabs.
	* Makefile.in (ALL_SUBDIRS): Add gdb.hp and gdb.stabs.

diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index 17d0b1a..3d6bf42 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -34,9 +34,10 @@ EXEEXT = @EXEEXT@
 SUBDIRS = @subdirs@
 RPATH_ENVVAR = @RPATH_ENVVAR@
 ALL_SUBDIRS = gdb.ada gdb.arch gdb.asm gdb.base gdb.cell gdb.cp gdb.disasm \
-	gdb.dwarf2 gdb.fortran gdb.gdb gdb.java gdb.mi gdb.modula2 gdb.multi \
+	gdb.dwarf2 gdb.fortran gdb.gdb gdb.hp \
+	gdb.java gdb.mi gdb.modula2 gdb.multi \
 	gdb.objc gdb.opencl gdb.opt gdb.pascal gdb.python gdb.server \
-	gdb.reverse gdb.threads gdb.trace gdb.xml \
+	gdb.stabs gdb.reverse gdb.threads gdb.trace gdb.xml \
 	$(SUBDIRS)
 
 EXPECT = `if [ -f $${rootme}/../../expect/expect ] ; then \
diff --git a/gdb/testsuite/gdb.hp/Makefile.in b/gdb/testsuite/gdb.hp/Makefile.in
index 3bcceaf..a2b1b8f 100644
--- a/gdb/testsuite/gdb.hp/Makefile.in
+++ b/gdb/testsuite/gdb.hp/Makefile.in
@@ -1,7 +1,7 @@
 VPATH = @srcdir@
 srcdir = @srcdir@
 
-SUBDIRS = @subdirs@
+SUBDIRS = gdb.aCC gdb.base-hp gdb.compat gdb.defects gdb.objdbg
 
 all:
 	@echo "Nothing to be done for all..."
@@ -39,6 +39,3 @@ distclean maintainer-clean realclean: clean
 		    fi; \
 	    done ; \
 	else true; fi
-
-Makefile: $(srcdir)/Makefile.in $(srcdir)/configure.in
-	$(SHELL) ./config.status --recheck
diff --git a/gdb/testsuite/gdb.hp/gdb.aCC/Makefile.in b/gdb/testsuite/gdb.hp/gdb.aCC/Makefile.in
index 1295c1e..dbfca95 100644
--- a/gdb/testsuite/gdb.hp/gdb.aCC/Makefile.in
+++ b/gdb/testsuite/gdb.hp/gdb.aCC/Makefile.in
@@ -22,6 +22,3 @@ distclean maintainer-clean realclean: clean
 	-rm -f Makefile config.status config.log
 	-rm -f *-init.exp
 	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
-
-Makefile : $(srcdir)/Makefile.in $(srcdir)/configure.in
-	$(SHELL) ./config.status --recheck
diff --git a/gdb/testsuite/gdb.hp/gdb.base-hp/Makefile.in b/gdb/testsuite/gdb.hp/gdb.base-hp/Makefile.in
index adbde9d..2254ab4 100644
--- a/gdb/testsuite/gdb.hp/gdb.base-hp/Makefile.in
+++ b/gdb/testsuite/gdb.hp/gdb.base-hp/Makefile.in
@@ -27,6 +27,3 @@ distclean maintainer-clean realclean: clean
 	-rm -f Makefile config.status config.log
 	-rm -f *-init.exp
 	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
-
-Makefile : $(srcdir)/Makefile.in $(srcdir)/configure.in
-	$(SHELL) ./config.status --recheck
diff --git a/gdb/testsuite/gdb.hp/gdb.compat/Makefile.in b/gdb/testsuite/gdb.hp/gdb.compat/Makefile.in
index ada0f1a..b74fa65 100644
--- a/gdb/testsuite/gdb.hp/gdb.compat/Makefile.in
+++ b/gdb/testsuite/gdb.hp/gdb.compat/Makefile.in
@@ -22,6 +22,3 @@ distclean maintainer-clean realclean: clean
 	-rm -f Makefile config.status config.log
 	-rm -f *-init.exp
 	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
-
-Makefile : $(srcdir)/Makefile.in $(srcdir)/configure.in
-	$(SHELL) ./config.status --recheck
diff --git a/gdb/testsuite/gdb.hp/gdb.defects/Makefile.in b/gdb/testsuite/gdb.hp/gdb.defects/Makefile.in
index f0a7858..b1a9284 100644
--- a/gdb/testsuite/gdb.hp/gdb.defects/Makefile.in
+++ b/gdb/testsuite/gdb.hp/gdb.defects/Makefile.in
@@ -22,6 +22,3 @@ distclean maintainer-clean realclean: clean
 	-rm -f Makefile config.status config.log
 	-rm -f *-init.exp
 	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
-
-Makefile : $(srcdir)/Makefile.in $(srcdir)/configure.in
-	$(SHELL) ./config.status --recheck
diff --git a/gdb/testsuite/gdb.hp/gdb.objdbg/Makefile.in b/gdb/testsuite/gdb.hp/gdb.objdbg/Makefile.in
index 5411c46..229f3ae 100644
--- a/gdb/testsuite/gdb.hp/gdb.objdbg/Makefile.in
+++ b/gdb/testsuite/gdb.hp/gdb.objdbg/Makefile.in
@@ -23,6 +23,3 @@ distclean maintainer-clean realclean: clean
 	-rm -f Makefile config.status config.log
 	-rm -f *-init.exp
 	-rm -fr *.log summary detail *.plog *.sum *.psum site.*
-
-Makefile : $(srcdir)/Makefile.in $(srcdir)/configure.in
-	$(SHELL) ./config.status --recheck
diff --git a/gdb/testsuite/gdb.stabs/Makefile.in b/gdb/testsuite/gdb.stabs/Makefile.in
index ff470ed..7d5755c 100644
--- a/gdb/testsuite/gdb.stabs/Makefile.in
+++ b/gdb/testsuite/gdb.stabs/Makefile.in
@@ -10,7 +10,4 @@ clean mostlyclean:
 	-rm -f *.o *~ core tmp.c tmp.s weird.s errs exclfwd gdb11479
 
 distclean maintainer-clean realclean: clean
-	-rm -f Makefile config.status config.log gdb.log gdb.sum
-
-Makefile: $(srcdir)/Makefile.in $(srcdir)/configure.ac
-	$(SHELL) ./config.status --recheck
+	-rm -f Makefile gdb.log gdb.sum

Re: RFC: remove a bunch of testsuite/**/configure scripts

[Andreas Schwab]

Tom Tromey <tromey@redhat.com> writes:

> I omitted the removed files from the appended.

You omitted the change to configure.ac as well.

> 	* configure.ac: Don't AC_CONFIG_HEADER in gdb.hp or gdb.stabs.

s/AC_CONFIG_HEADER/AC_CONFIG_SUBDIRS/

> 	Remove stabs-specific logic.  Test for existence of ../gdbtk
> 	before configuring gdb.gdbtk.  Build Makefiles in gdb.hp
> 	subdirectories and gdb.stabs.

+ gdb.cell?

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: RFC: remove a bunch of testsuite/**/configure scripts

[Joel Brobecker]

> I'd like to go a few step farther and remove both testsuite/configure
> and all the Makefile.in's, but the latter at least were recently updated
> to make "make clean" work, so I'm a little reluctant to do this.

I'm in favor of at least removing the configure script.  For
the Makefiles (would we keep the master one in gdb/testsuite/?,
I'd say yes, at least as a first step), it's a tougher one. I think
it depends on what the consequences in terms of funtionality would
be. I don't mind losing "make clean" capability in the testsuite
area, but that might be problems for those who build in-tree
(sacrilege! :-).

-- 
Joel

Re: RFC: remove a bunch of testsuite/**/configure scripts

[Tom Tromey]

Tom> I omitted the removed files from the appended.

Andreas> You omitted the change to configure.ac as well.

Whoops.  I've appended that part.

Tom> * configure.ac: Don't AC_CONFIG_HEADER in gdb.hp or gdb.stabs.

Andreas> s/AC_CONFIG_HEADER/AC_CONFIG_SUBDIRS/

Tom> Remove stabs-specific logic.  Test for existence of ../gdbtk
Tom> before configuring gdb.gdbtk.  Build Makefiles in gdb.hp
Tom> subdirectories and gdb.stabs.

Andreas> + gdb.cell?

Thanks, I updated this part of the entry to read:

	* configure.ac: Don't AC_CONFIG_SUBDIRS in gdb.hp or gdb.stabs.
	Remove stabs- and cell-specific logic.  Test for existence of
	../gdbtk before configuring gdb.gdbtk.  Build Makefiles in gdb.hp
	subdirectories, gdb.cell, and and gdb.stabs.

Tom

diff --git a/gdb/testsuite/configure.ac b/gdb/testsuite/configure.ac
index 9f96f95..8631442 100644
--- a/gdb/testsuite/configure.ac
+++ b/gdb/testsuite/configure.ac
@@ -37,60 +37,10 @@ esac
 AM_CONDITIONAL(GMAKE, test "$MAKE_IS_GNU" = yes)
 AC_PROG_MAKE_SET
 
-# Add HP-specific tests when appropriate.
-case $target in
-  hppa*-*-hpux*)
-    AC_CONFIG_SUBDIRS(gdb.hp) ;;
-esac
-
-# Add Cell/B.E. specific tests when appropriate.
-# We need support for both PowerPC and SPU targets configured in.
-case $target in
-  powerpc*-*-linux*)
-    have_spu_target=no
-    for targ in `echo $enable_targets | sed 's/,/ /g'`
-      do
-        case "${targ}" in
-          spu*|all) have_spu_target=yes ;;
-        esac
-      done
-    if test x$have_spu_target = xyes; then
-      AC_CONFIG_SUBDIRS(gdb.cell)
-    fi
-    ;;
-esac
-
-# With stabs.
-AC_ARG_WITH(stabs,
-[  --with-stabs            arrange to use stabs instead of host debug format],,
-[# We enable stabs tests by default on selected targets.
-case $target in
-   powerpc-*-aix* \
- | rs6000-*-aix*  \
- | *-*-*bsd*      \
- | *-*-go32*      \
- | *-*-linux*     \
- | *-*-lynxos*    \
- | *-sun-*        \
- | hppa*-*-*      \
- | *-*-elf*       \
- | *-*-cygwin*    \
- | *-*-mingw*     \
- )
-    with_stabs=yes ;;
- *)
-    with_stabs=no ;;
-esac])
-
-# Add stabs tests when appropriate.
-if test $with_stabs = yes; then
-   AC_CONFIG_SUBDIRS(gdb.stabs)
-fi
-
 # Enable gdbtk.
 AC_ARG_ENABLE(gdbtk,
 [  --enable-gtk            enable gdbtk graphical user interface (GUI)],,
-  [if test -d $srcdir/gdb.gdbtk; then
+  [if test -d $srcdir/../gdbtk && test -d $srcdir/gdb.gdbtk; then
     enable_gdbtk=yes
   else
     enable_gdbtk=no
@@ -141,9 +91,12 @@ AC_EXEEXT
 AC_OUTPUT([Makefile \
   gdb.ada/Makefile \
   gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \
-  gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile \
+  gdb.cell/Makefile gdb.cp/Makefile gdb.disasm/Makefile gdb.dwarf2/Makefile \
   gdb.fortran/Makefile gdb.server/Makefile gdb.java/Makefile \
+  gdb.hp/Makefile gdb.hp/gdb.objdbg/Makefile gdb.hp/gdb.base-hp/Makefile \
+  gdb.hp/gdb.aCC/Makefile gdb.hp/gdb.compat/Makefile \
+  gdb.hp/gdb.defects/Makefile \
   gdb.mi/Makefile gdb.modula2/Makefile gdb.multi/Makefile \
   gdb.objc/Makefile gdb.opencl/Makefile gdb.opt/Makefile gdb.pascal/Makefile \
-  gdb.python/Makefile gdb.reverse/Makefile \
+  gdb.python/Makefile gdb.reverse/Makefile gdb.stabs/Makefile \
   gdb.threads/Makefile gdb.trace/Makefile gdb.xml/Makefile])

Re: RFC: remove a bunch of testsuite/**/configure scripts

[Tom Tromey]

>>>>> "Joel" == Joel Brobecker <brobecker@adacore.com> writes:

Joel> I'm in favor of at least removing the configure script.  For
Joel> the Makefiles (would we keep the master one in gdb/testsuite/?,

Either way is ok.

I think there is probably enough code in testsuite/Makefile.in to
warrant keeping it around.  Ordinarily I think it is better, for
parallelism, to have as few Makefiles as possible, but that doesn't seem
like a real consideration in this case.

Joel> I'd say yes, at least as a first step), it's a tougher one. I think
Joel> it depends on what the consequences in terms of funtionality would
Joel> be. I don't mind losing "make clean" capability in the testsuite
Joel> area, but that might be problems for those who build in-tree
Joel> (sacrilege! :-).

All these Makefiles exist only for "make clean".
Until Michael's patch last week, they didn't even successfully do that :-)
In fact, depending on the target, that may still be the case; I don't
know for certain but I suspect so.

I wonder whether we could arrange to invoke runtest in a subdirectory.
Then "make clean" would be "rm -rf testdir".
This would break "clean" for those people invoking runtest by hand though.

Personally I never run "make clean" for the testsuite and I really
couldn't care less if it stopped working.  Is there anybody who does
care and rely on this?  If you do use it -- why?  I would rather not go
through a bunch of gyrations for a feature that no developer uses.

Tom

Re: RFC: remove a bunch of testsuite/**/configure scripts

[Tom Tromey]

>>>>> "Tom" == Tom Tromey <tromey@redhat.com> writes:

Tom> I plan to check this in soon.
Tom> While working on something unrelated, I ran across some weirdness in
Tom> gdb/testsuite Makefiles.  Digging a little deeper, I found a bunch of
Tom> configure scripts in subdirectories.  These scripts don't do anything
Tom> useful, so this patch removes all of them.

I'm checking this in now.

Tom