Makefile.am (DEJATOOL,EXPECT,RUNTEST,RUNTESTFLAGS): Remove unneeded variable assignments.

2003-08-04  Phil Edwards  <pme@gcc.gnu.org>

	* testsuite/Makefile.am (DEJATOOL,EXPECT,RUNTEST,RUNTESTFLAGS):
	Remove unneeded variable assignments.  Leave them for automake.
	* testsuite/lib/libstdc++-v3.exp:  Rename...
	* testsuite/lib/libstdc++.exp:  ...to this.  Adjust function names
	accordingly.
	* testsuite/libstdc++-v3.dg/dg.exp:  Rename...
	* testsuite/libstdc++-dg/normal.exp:  ...to this.  Adjust function
	names accordingly.

From-SVN: r70165

libstdc++-v3/ChangeLog

 2003-08-04  Phil Edwards  <pme@gcc.gnu.org>
 
+	* testsuite/Makefile.am (DEJATOOL,EXPECT,RUNTEST,RUNTESTFLAGS):
+	Remove unneeded variable assignments.  Leave them for automake.
+	* testsuite/lib/libstdc++-v3.exp:  Rename...
+	* testsuite/lib/libstdc++.exp:  ...to this.  Adjust function names
+	accordingly.
+	* testsuite/libstdc++-v3.dg/dg.exp:  Rename...
+	* testsuite/libstdc++-dg/normal.exp:  ...to this.  Adjust function
+	names accordingly.
+
+2003-08-04  Phil Edwards  <pme@gcc.gnu.org>
+
 	* docs/doxygen/guide.html:  run_doxygen uses bash.
 	* docs/doxygen/mainpage.html:  We'll be shipping tag files.
 	* docs/doxygen/run_doxygen:  Tweaks and improvements.

libstdc++-v3/testsuite/Makefile.am

@@ -21,23 +21,12 @@
 ## Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ## USA.
 
-AUTOMAKE_OPTIONS =  cygnus dejagnu
+AUTOMAKE_OPTIONS = dejagnu
 
 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs
 
-DEJATOOL = libstdc++-v3
-
-EXPECT = `if [ -f @glibcxx_builddir@/../../expect/expect ] ; then \
-            echo @glibcxx_builddir@/../../expect/expect ; \
-          else echo expect ; fi`
-
-RUNTEST = `if [ -f @glibcxx_srcdir@/../dejagnu/runtest ] ; then \
-	       echo @glibcxx_srcdir@/../dejagnu/runtest ; \
-	    else echo runtest; fi`
-
 AM_MAKEFLAGS = -j1
 AM_RUNTESTFLAGS =
-RUNTESTFLAGS =
 PWD_COMMAND = $${PWDCMD-pwd}
 
 ## CXX is actually a "C" compiler. These are real C++ programs.

libstdc++-v3/testsuite/lib/libstdc++-v3.exp → libstdc++-v3/testsuite/lib/libstdc++.exp

@@ -14,14 +14,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 
-# Define libstdc++-v3 callbacks for dg.exp.
+# Define callbacks for dg.exp.  This file is loaded early.
 
 load_lib dg.exp
 load_lib libgloss.exp
 load_lib prune.exp
 
-# Called once, by libstdc++-v3-init below.  "Static" to this file.
-proc libstdc++-v3-copy-files {srcfiles dstdir} {
+# Called by v3-init below.  "Static" to this file.
+proc v3-copy-files {srcfiles dstdir} {
     foreach f $srcfiles {
         if { [catch { set symlink [file readlink $f] } x] } then {
             file copy -force $f $dstdir
@@ -36,8 +36,8 @@ proc libstdc++-v3-copy-files {srcfiles dstdir} {
     }
 }
 
-# Called once, from libstdc++-v3.dg/dg.exp.
-proc libstdc++-v3-init { args } {
+# Called once, from libstdc++/dg.exp.
+proc v3-init { args } {
     global srcdir
     global outdir
     global blddir
@@ -56,8 +56,8 @@ proc libstdc++-v3-init { args } {
     set dg-do-what-default run
 
     # Copy any required data files.
-    libstdc++-v3-copy-files [glob -nocomplain "$srcdir/data/*.tst"] $outdir
-    libstdc++-v3-copy-files [glob -nocomplain "$srcdir/data/*.txt"] $outdir
+    v3-copy-files [glob -nocomplain "$srcdir/data/*.tst"] $outdir
+    v3-copy-files [glob -nocomplain "$srcdir/data/*.txt"] $outdir
 
     # set LD_LIBRARY_PATH so that libgcc_s, libstdc++ binaries can be found.
     # locate libgcc.a so we don't need to account for different values of
@@ -137,7 +137,7 @@ proc libstdc++-v3-init { args } {
 }
 
 # Callback from system dg-test.
-proc libstdc++-v3-dg-test { prog do_what extra_tool_flags } {
+proc libstdc++-dg-test { prog do_what extra_tool_flags } {
     # Set up the compiler flags, based on what we're going to do.
 
     switch $do_what {
@@ -177,15 +177,15 @@ proc libstdc++-v3-dg-test { prog do_what extra_tool_flags } {
         lappend options "additional_flags=$extra_tool_flags"
     }
 
-    set comp_output [libstdc++-v3_target_compile "$prog" "$output_file" "$compile_type" $options];
+    set comp_output [v3_target_compile "$prog" "$output_file" "$compile_type" $options];
     set comp_output [ prune_g++_output $comp_output ];
 
     return [list $comp_output $output_file]
 }
 
-# Called from libstdc++-v3-dg-test above.  Calls back into system's
+# Called from libstdc++-dg-test above.  Calls back into system's
 # target_compile to actually do the work.
-proc libstdc++-v3_target_compile { source dest type options } {
+proc v3_target_compile { source dest type options } {
     global gluefile 
     global wrap_flags
     global cxx
@@ -215,7 +215,7 @@ proc libstdc++-v3_target_compile { source dest type options } {
 }
 
 
-# Called once, from libstdc++-v3.dg/dg.exp.
+# Called once, from libstdc++*/dg.exp.
 proc v3-list-tests { filename } {
     global srcdir
     global outdir

libstdc++-v3/testsuite/libstdc++-v3.dg/dg.exp → libstdc++-v3/testsuite/libstdc++-dg/normal.exp

@@ -24,7 +24,7 @@ if ![info exists DEFAULT_CXXFLAGS] then {
 
 # Initialization.
 dg-init
-libstdc++-v3-init
+v3-init
 
 # Main loop.
 dg-runtest [v3-list-tests testsuite_files] "" $DEFAULT_CXXFLAGS