2003-08-22 Michael Chastain <mec@shout.net>

	* gdb.cp: New directory.
	* gdb.cp/*: Copy from gdb.c++/*.
	* gdb.c++/*: Remove.
	* Makefile.in: Change gdb.c++ to gdb.cp.
	* configure.in:  Ditto.
	* configure: Regnerate.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 865793576ac9bd4ef016c2f1c5c8d4ad939a47ad..c32a6a5863c614f25d871e842378946fe55db860 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-22  Michael Chastain  <mec@shout.net>
+
+       * gdb.cp: New directory.
+       * gdb.cp/*: Copy from gdb.c++/*.
+       * gdb.c++/*: Remove.
+       * Makefile.in: Change gdb.c++ to gdb.cp.
+       * configure.in:  Ditto.
+       * configure: Regnerate.
+
 2003-08-18  Mark Kettenis  <kettenis@gnu.org>
 
        * gdb.arch/i386-prologue.exp: Add testcase for PR backtrace/1338.

diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index 898e6ed28b4ae105c32b0ab6805380958e41c40c..3f3b7ad2bb919f8c7b04cfb228de36af8117573b 100644 (file)
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -35,7 +35,7 @@ SHELL = @SHELL@
 EXEEXT = @EXEEXT@
 SUBDIRS = @subdirs@
 RPATH_ENVVAR = @RPATH_ENVVAR@
-ALL_SUBDIRS = gdb.arch gdb.asm gdb.base gdb.c++ gdb.disasm gdb.java gdb.mi \
+ALL_SUBDIRS = gdb.arch gdb.asm gdb.base gdb.cp gdb.disasm gdb.java gdb.mi \
        gdb.objc gdb.threads gdb.trace $(SUBDIRS)
 
 EXPECT = `if [ -f $${rootme}/../../expect/expect ] ; then \

diff --git a/gdb/testsuite/configure b/gdb/testsuite/configure
index eb505fe52cd393da3da1708ac2b594b16b1ffa91..f5cb0895a2be75b091a27b416ac89ce2df1fefc7 100755 (executable)
--- a/gdb/testsuite/configure
+++ b/gdb/testsuite/configure
@@ -1050,7 +1050,7 @@ done
 ac_given_srcdir=$srcdir
 
 trap 'rm -fr `echo "Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \
-  gdb.c++/Makefile gdb.disasm/Makefile gdb.java/Makefile gdb.mi/Makefile \
+  gdb.cp/Makefile gdb.disasm/Makefile gdb.java/Makefile gdb.mi/Makefile \
   gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
@@ -1144,7 +1144,7 @@ EOF
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \
-  gdb.c++/Makefile gdb.disasm/Makefile gdb.java/Makefile gdb.mi/Makefile \
+  gdb.cp/Makefile gdb.disasm/Makefile gdb.java/Makefile gdb.mi/Makefile \
   gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF

diff --git a/gdb/testsuite/configure.in b/gdb/testsuite/configure.in
index 14300ec0944b44ff530dc0bd99eb285cabd4edc9..c60cf576a4d1c30ac2225e437f1210eab49d094e 100644 (file)
--- a/gdb/testsuite/configure.in
+++ b/gdb/testsuite/configure.in
@@ -113,5 +113,5 @@ AC_EXEEXT
 
 AC_CONFIG_SUBDIRS($configdirs)
 AC_OUTPUT([Makefile gdb.arch/Makefile gdb.asm/Makefile gdb.base/Makefile \
-  gdb.c++/Makefile gdb.disasm/Makefile gdb.java/Makefile gdb.mi/Makefile \
+  gdb.cp/Makefile gdb.disasm/Makefile gdb.java/Makefile gdb.mi/Makefile \
   gdb.objc/Makefile gdb.threads/Makefile gdb.trace/Makefile])

diff --git a/gdb/testsuite/gdb.c++/Makefile.in b/gdb/testsuite/gdb.cp/Makefile.in
similarity index 100%
rename from gdb/testsuite/gdb.c++/Makefile.in
rename to gdb/testsuite/gdb.cp/Makefile.in

diff --git a/gdb/testsuite/gdb.c++/ambiguous.cc b/gdb/testsuite/gdb.cp/ambiguous.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/ambiguous.cc
rename to gdb/testsuite/gdb.cp/ambiguous.cc

diff --git a/gdb/testsuite/gdb.c++/ambiguous.exp b/gdb/testsuite/gdb.cp/ambiguous.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/ambiguous.exp
rename to gdb/testsuite/gdb.cp/ambiguous.exp

diff --git a/gdb/testsuite/gdb.c++/annota2.cc b/gdb/testsuite/gdb.cp/annota2.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/annota2.cc
rename to gdb/testsuite/gdb.cp/annota2.cc

diff --git a/gdb/testsuite/gdb.c++/annota2.exp b/gdb/testsuite/gdb.cp/annota2.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/annota2.exp
rename to gdb/testsuite/gdb.cp/annota2.exp

diff --git a/gdb/testsuite/gdb.c++/annota3.cc b/gdb/testsuite/gdb.cp/annota3.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/annota3.cc
rename to gdb/testsuite/gdb.cp/annota3.cc

diff --git a/gdb/testsuite/gdb.c++/annota3.exp b/gdb/testsuite/gdb.cp/annota3.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/annota3.exp
rename to gdb/testsuite/gdb.cp/annota3.exp

diff --git a/gdb/testsuite/gdb.c++/anon-union.cc b/gdb/testsuite/gdb.cp/anon-union.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/anon-union.cc
rename to gdb/testsuite/gdb.cp/anon-union.cc

diff --git a/gdb/testsuite/gdb.c++/anon-union.exp b/gdb/testsuite/gdb.cp/anon-union.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/anon-union.exp
rename to gdb/testsuite/gdb.cp/anon-union.exp

diff --git a/gdb/testsuite/gdb.c++/casts.cc b/gdb/testsuite/gdb.cp/casts.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/casts.cc
rename to gdb/testsuite/gdb.cp/casts.cc

diff --git a/gdb/testsuite/gdb.c++/casts.exp b/gdb/testsuite/gdb.cp/casts.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/casts.exp
rename to gdb/testsuite/gdb.cp/casts.exp

diff --git a/gdb/testsuite/gdb.c++/classes.exp b/gdb/testsuite/gdb.cp/classes.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/classes.exp
rename to gdb/testsuite/gdb.cp/classes.exp

diff --git a/gdb/testsuite/gdb.c++/cplusfuncs.cc b/gdb/testsuite/gdb.cp/cplusfuncs.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/cplusfuncs.cc
rename to gdb/testsuite/gdb.cp/cplusfuncs.cc

diff --git a/gdb/testsuite/gdb.c++/cplusfuncs.exp b/gdb/testsuite/gdb.cp/cplusfuncs.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/cplusfuncs.exp
rename to gdb/testsuite/gdb.cp/cplusfuncs.exp

diff --git a/gdb/testsuite/gdb.c++/ctti.exp b/gdb/testsuite/gdb.cp/ctti.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/ctti.exp
rename to gdb/testsuite/gdb.cp/ctti.exp

diff --git a/gdb/testsuite/gdb.c++/cttiadd.cc b/gdb/testsuite/gdb.cp/cttiadd.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/cttiadd.cc
rename to gdb/testsuite/gdb.cp/cttiadd.cc

diff --git a/gdb/testsuite/gdb.c++/cttiadd1.cc b/gdb/testsuite/gdb.cp/cttiadd1.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/cttiadd1.cc
rename to gdb/testsuite/gdb.cp/cttiadd1.cc

diff --git a/gdb/testsuite/gdb.c++/cttiadd2.cc b/gdb/testsuite/gdb.cp/cttiadd2.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/cttiadd2.cc
rename to gdb/testsuite/gdb.cp/cttiadd2.cc

diff --git a/gdb/testsuite/gdb.c++/cttiadd3.cc b/gdb/testsuite/gdb.cp/cttiadd3.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/cttiadd3.cc
rename to gdb/testsuite/gdb.cp/cttiadd3.cc

diff --git a/gdb/testsuite/gdb.c++/demangle.exp b/gdb/testsuite/gdb.cp/demangle.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/demangle.exp
rename to gdb/testsuite/gdb.cp/demangle.exp

diff --git a/gdb/testsuite/gdb.c++/derivation.cc b/gdb/testsuite/gdb.cp/derivation.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/derivation.cc
rename to gdb/testsuite/gdb.cp/derivation.cc

diff --git a/gdb/testsuite/gdb.c++/derivation.exp b/gdb/testsuite/gdb.cp/derivation.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/derivation.exp
rename to gdb/testsuite/gdb.cp/derivation.exp

diff --git a/gdb/testsuite/gdb.c++/hang.H b/gdb/testsuite/gdb.cp/hang.H
similarity index 100%
rename from gdb/testsuite/gdb.c++/hang.H
rename to gdb/testsuite/gdb.cp/hang.H

diff --git a/gdb/testsuite/gdb.c++/hang.exp b/gdb/testsuite/gdb.cp/hang.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/hang.exp
rename to gdb/testsuite/gdb.cp/hang.exp

diff --git a/gdb/testsuite/gdb.c++/hang1.C b/gdb/testsuite/gdb.cp/hang1.C
similarity index 100%
rename from gdb/testsuite/gdb.c++/hang1.C
rename to gdb/testsuite/gdb.cp/hang1.C

diff --git a/gdb/testsuite/gdb.c++/hang2.C b/gdb/testsuite/gdb.cp/hang2.C
similarity index 100%
rename from gdb/testsuite/gdb.c++/hang2.C
rename to gdb/testsuite/gdb.cp/hang2.C

diff --git a/gdb/testsuite/gdb.c++/hang3.C b/gdb/testsuite/gdb.cp/hang3.C
similarity index 100%
rename from gdb/testsuite/gdb.c++/hang3.C
rename to gdb/testsuite/gdb.cp/hang3.C

diff --git a/gdb/testsuite/gdb.c++/inherit.exp b/gdb/testsuite/gdb.cp/inherit.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/inherit.exp
rename to gdb/testsuite/gdb.cp/inherit.exp

diff --git a/gdb/testsuite/gdb.c++/local.cc b/gdb/testsuite/gdb.cp/local.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/local.cc
rename to gdb/testsuite/gdb.cp/local.cc

diff --git a/gdb/testsuite/gdb.c++/local.exp b/gdb/testsuite/gdb.cp/local.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/local.exp
rename to gdb/testsuite/gdb.cp/local.exp

diff --git a/gdb/testsuite/gdb.c++/m-data.cc b/gdb/testsuite/gdb.cp/m-data.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/m-data.cc
rename to gdb/testsuite/gdb.cp/m-data.cc

diff --git a/gdb/testsuite/gdb.c++/m-data.exp b/gdb/testsuite/gdb.cp/m-data.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/m-data.exp
rename to gdb/testsuite/gdb.cp/m-data.exp

diff --git a/gdb/testsuite/gdb.c++/m-static.cc b/gdb/testsuite/gdb.cp/m-static.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/m-static.cc
rename to gdb/testsuite/gdb.cp/m-static.cc

diff --git a/gdb/testsuite/gdb.c++/m-static.exp b/gdb/testsuite/gdb.cp/m-static.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/m-static.exp
rename to gdb/testsuite/gdb.cp/m-static.exp

diff --git a/gdb/testsuite/gdb.c++/m-static.h b/gdb/testsuite/gdb.cp/m-static.h
similarity index 100%
rename from gdb/testsuite/gdb.c++/m-static.h
rename to gdb/testsuite/gdb.cp/m-static.h

diff --git a/gdb/testsuite/gdb.c++/m-static1.cc b/gdb/testsuite/gdb.cp/m-static1.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/m-static1.cc
rename to gdb/testsuite/gdb.cp/m-static1.cc

diff --git a/gdb/testsuite/gdb.c++/maint.exp b/gdb/testsuite/gdb.cp/maint.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/maint.exp
rename to gdb/testsuite/gdb.cp/maint.exp

diff --git a/gdb/testsuite/gdb.c++/member-ptr.cc b/gdb/testsuite/gdb.cp/member-ptr.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/member-ptr.cc
rename to gdb/testsuite/gdb.cp/member-ptr.cc

diff --git a/gdb/testsuite/gdb.c++/member-ptr.exp b/gdb/testsuite/gdb.cp/member-ptr.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/member-ptr.exp
rename to gdb/testsuite/gdb.cp/member-ptr.exp

diff --git a/gdb/testsuite/gdb.c++/method.cc b/gdb/testsuite/gdb.cp/method.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/method.cc
rename to gdb/testsuite/gdb.cp/method.cc

diff --git a/gdb/testsuite/gdb.c++/method.exp b/gdb/testsuite/gdb.cp/method.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/method.exp
rename to gdb/testsuite/gdb.cp/method.exp

diff --git a/gdb/testsuite/gdb.c++/misc.cc b/gdb/testsuite/gdb.cp/misc.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/misc.cc
rename to gdb/testsuite/gdb.cp/misc.cc

diff --git a/gdb/testsuite/gdb.c++/misc.exp b/gdb/testsuite/gdb.cp/misc.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/misc.exp
rename to gdb/testsuite/gdb.cp/misc.exp

diff --git a/gdb/testsuite/gdb.c++/namespace.cc b/gdb/testsuite/gdb.cp/namespace.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/namespace.cc
rename to gdb/testsuite/gdb.cp/namespace.cc

diff --git a/gdb/testsuite/gdb.c++/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/namespace.exp
rename to gdb/testsuite/gdb.cp/namespace.exp

diff --git a/gdb/testsuite/gdb.c++/namespace1.cc b/gdb/testsuite/gdb.cp/namespace1.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/namespace1.cc
rename to gdb/testsuite/gdb.cp/namespace1.cc

diff --git a/gdb/testsuite/gdb.c++/overload.cc b/gdb/testsuite/gdb.cp/overload.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/overload.cc
rename to gdb/testsuite/gdb.cp/overload.cc

diff --git a/gdb/testsuite/gdb.c++/overload.exp b/gdb/testsuite/gdb.cp/overload.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/overload.exp
rename to gdb/testsuite/gdb.cp/overload.exp

diff --git a/gdb/testsuite/gdb.c++/ovldbreak.cc b/gdb/testsuite/gdb.cp/ovldbreak.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/ovldbreak.cc
rename to gdb/testsuite/gdb.cp/ovldbreak.cc

diff --git a/gdb/testsuite/gdb.c++/ovldbreak.exp b/gdb/testsuite/gdb.cp/ovldbreak.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/ovldbreak.exp
rename to gdb/testsuite/gdb.cp/ovldbreak.exp

diff --git a/gdb/testsuite/gdb.c++/pr-1023.cc b/gdb/testsuite/gdb.cp/pr-1023.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/pr-1023.cc
rename to gdb/testsuite/gdb.cp/pr-1023.cc

diff --git a/gdb/testsuite/gdb.c++/pr-1023.exp b/gdb/testsuite/gdb.cp/pr-1023.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/pr-1023.exp
rename to gdb/testsuite/gdb.cp/pr-1023.exp

diff --git a/gdb/testsuite/gdb.c++/pr-1210.cc b/gdb/testsuite/gdb.cp/pr-1210.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/pr-1210.cc
rename to gdb/testsuite/gdb.cp/pr-1210.cc

diff --git a/gdb/testsuite/gdb.c++/pr-1210.exp b/gdb/testsuite/gdb.cp/pr-1210.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/pr-1210.exp
rename to gdb/testsuite/gdb.cp/pr-1210.exp

diff --git a/gdb/testsuite/gdb.c++/pr-574.cc b/gdb/testsuite/gdb.cp/pr-574.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/pr-574.cc
rename to gdb/testsuite/gdb.cp/pr-574.cc

diff --git a/gdb/testsuite/gdb.c++/pr-574.exp b/gdb/testsuite/gdb.cp/pr-574.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/pr-574.exp
rename to gdb/testsuite/gdb.cp/pr-574.exp

diff --git a/gdb/testsuite/gdb.c++/printmethod.cc b/gdb/testsuite/gdb.cp/printmethod.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/printmethod.cc
rename to gdb/testsuite/gdb.cp/printmethod.cc

diff --git a/gdb/testsuite/gdb.c++/printmethod.exp b/gdb/testsuite/gdb.cp/printmethod.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/printmethod.exp
rename to gdb/testsuite/gdb.cp/printmethod.exp

diff --git a/gdb/testsuite/gdb.c++/psmang.exp b/gdb/testsuite/gdb.cp/psmang.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/psmang.exp
rename to gdb/testsuite/gdb.cp/psmang.exp

diff --git a/gdb/testsuite/gdb.c++/psmang1.cc b/gdb/testsuite/gdb.cp/psmang1.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/psmang1.cc
rename to gdb/testsuite/gdb.cp/psmang1.cc

diff --git a/gdb/testsuite/gdb.c++/psmang2.cc b/gdb/testsuite/gdb.cp/psmang2.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/psmang2.cc
rename to gdb/testsuite/gdb.cp/psmang2.cc

diff --git a/gdb/testsuite/gdb.c++/ref-types.cc b/gdb/testsuite/gdb.cp/ref-types.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/ref-types.cc
rename to gdb/testsuite/gdb.cp/ref-types.cc

diff --git a/gdb/testsuite/gdb.c++/ref-types.exp b/gdb/testsuite/gdb.cp/ref-types.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/ref-types.exp
rename to gdb/testsuite/gdb.cp/ref-types.exp

diff --git a/gdb/testsuite/gdb.c++/rtti.exp b/gdb/testsuite/gdb.cp/rtti.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/rtti.exp
rename to gdb/testsuite/gdb.cp/rtti.exp

diff --git a/gdb/testsuite/gdb.c++/rtti.h b/gdb/testsuite/gdb.cp/rtti.h
similarity index 100%
rename from gdb/testsuite/gdb.c++/rtti.h
rename to gdb/testsuite/gdb.cp/rtti.h

diff --git a/gdb/testsuite/gdb.c++/rtti1.cc b/gdb/testsuite/gdb.cp/rtti1.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/rtti1.cc
rename to gdb/testsuite/gdb.cp/rtti1.cc

diff --git a/gdb/testsuite/gdb.c++/rtti2.cc b/gdb/testsuite/gdb.cp/rtti2.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/rtti2.cc
rename to gdb/testsuite/gdb.cp/rtti2.cc

diff --git a/gdb/testsuite/gdb.c++/templates.cc b/gdb/testsuite/gdb.cp/templates.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/templates.cc
rename to gdb/testsuite/gdb.cp/templates.cc

diff --git a/gdb/testsuite/gdb.c++/templates.exp b/gdb/testsuite/gdb.cp/templates.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/templates.exp
rename to gdb/testsuite/gdb.cp/templates.exp

diff --git a/gdb/testsuite/gdb.c++/try_catch.cc b/gdb/testsuite/gdb.cp/try_catch.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/try_catch.cc
rename to gdb/testsuite/gdb.cp/try_catch.cc

diff --git a/gdb/testsuite/gdb.c++/try_catch.exp b/gdb/testsuite/gdb.cp/try_catch.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/try_catch.exp
rename to gdb/testsuite/gdb.cp/try_catch.exp

diff --git a/gdb/testsuite/gdb.c++/userdef.cc b/gdb/testsuite/gdb.cp/userdef.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/userdef.cc
rename to gdb/testsuite/gdb.cp/userdef.cc

diff --git a/gdb/testsuite/gdb.c++/userdef.exp b/gdb/testsuite/gdb.cp/userdef.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/userdef.exp
rename to gdb/testsuite/gdb.cp/userdef.exp

diff --git a/gdb/testsuite/gdb.c++/virtfunc.cc b/gdb/testsuite/gdb.cp/virtfunc.cc
similarity index 100%
rename from gdb/testsuite/gdb.c++/virtfunc.cc
rename to gdb/testsuite/gdb.cp/virtfunc.cc

diff --git a/gdb/testsuite/gdb.c++/virtfunc.exp b/gdb/testsuite/gdb.cp/virtfunc.exp
similarity index 100%
rename from gdb/testsuite/gdb.c++/virtfunc.exp
rename to gdb/testsuite/gdb.cp/virtfunc.exp