22 files changed, 44 insertions, 12 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 43405002096..3c7a84b24d5 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,33 @@
+2006-06-06  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* testsuite/util: New directory.
+	* testsuite/testsuite_hooks.cc: Move to util sub-directory.
+	* testsuite/testsuite_abi_check.cc: Same.
+	* testsuite/testsuite_abi.cc: Same.
+	* testsuite/testsuite_tr1.h: Same.
+	* testsuite/testsuite_io.h: Same.
+	* testsuite/testsuite_iterators.h: Same.
+	* testsuite/testsuite_allocator.cc: Same.
+	* testsuite/testsuite_allocator.h: Same.
+	* testsuite/testsuite_hooks.h: Same.
+	* testsuite/testsuite_character.cc: Same.
+	* testsuite/testsuite_abi.h: Same.
+	* testsuite/testsuite_character.h: Same.
+	* testsuite/testsuite_visualization.h: Same.
+	* testsuite/testsuite_performance.h: Same.
+	* testsuite/testsuite_shared.cc: Same.
+	* testsuite/testsuite_common_types.h: Same.
+
+	* testsuite/lib/libstdc++.exp (v3-build_support): Adjust paths.
+	* testsuite/libstdc++-abi/abi.exp: Same.
+	* testsuite/libstdc++-dg/conformance.exp: Remove any files in the
+	utilities subdirectory from the list of test cases.
+	
+	* scripts/testsuite_flags.in (build-includes): Adjust path for
+	testsuite includes.
+	* scripts/create_testsuite_files (dlist): Don't let utility files
+	creep into the testsuite_files list.
+	
 2006-06-06  Paolo Carlini  <pcarlini@suse.de>
 
 	* include/tr1/random (mersenne_twister<>::operator==,
diff --git a/libstdc++-v3/scripts/create_testsuite_files b/libstdc++-v3/scripts/create_testsuite_files
index d5305236140..74b2455d061 100755
--- a/libstdc++-v3/scripts/create_testsuite_files
+++ b/libstdc++-v3/scripts/create_testsuite_files
@@ -32,9 +32,7 @@ cd $srcdir
 # This is the ugly version of "everything but the current directory".  It's
 # what has to happen when find(1) doesn't support -mindepth, or -xtype.
 dlist=`echo [0-9][0-9]*`
-for d in [a-z]*; do
-  test -d $d && dlist="$dlist $d"
-done
+dlist="$dlist backward demangle ext performance thread tr1"
 find $dlist "(" -type f -o -type l ")" -name "*.cc" -print > $tmp.01
 find $dlist "(" -type f -o -type l ")" -name "*.c" -print > $tmp.02
 cat  $tmp.01 $tmp.02 | sort > $tmp.1
diff --git a/libstdc++-v3/scripts/testsuite_flags.in b/libstdc++-v3/scripts/testsuite_flags.in
index 15a4d8599e6..aa4466a5326 100755
--- a/libstdc++-v3/scripts/testsuite_flags.in
+++ b/libstdc++-v3/scripts/testsuite_flags.in
@@ -35,7 +35,7 @@ case ${query} in
       ;;
     --build-includes)
       INCLUDES="-nostdinc++ @GLIBCXX_INCLUDES@ 
-                -I${SRC_DIR}/include/backward -I${SRC_DIR}/testsuite"
+                -I${SRC_DIR}/include/backward -I${SRC_DIR}/testsuite/util"
       echo ${INCLUDES}
       ;;
     --install-cxx)
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 6272027bac3..e98397ba77c 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -411,7 +411,7 @@ proc v3-build_support { } {
 	set object_file [file rootname $f].o
 	# Compile with "-w" so that warnings issued by the compiler
 	# do not prevent compilation.
-	if { [v3_target_compile $srcdir/$f $object_file "object" \
+	if { [v3_target_compile $srcdir/util/$f $object_file "object" \
 		  [list "incdir=$srcdir" "additional_flags=-w"]]
 	     != "" } {
 	    error "could not compile $f"
@@ -427,7 +427,7 @@ proc v3-build_support { } {
 	    set object_file [file rootname $f].so
 	    # Compile with "-w" so that warnings issued by the compiler
 	    # do not prevent compilation.
-	    if { [v3_target_compile $srcdir/$f $object_file "sharedlib" \
+	    if { [v3_target_compile $srcdir/util/$f $object_file "sharedlib" \
 	     [list "incdir=$srcdir" "additional_flags=-w -shared -fPIC -DPIC"]]
 		 != "" } {
 		error "could not compile $f"
diff --git a/libstdc++-v3/testsuite/libstdc++-abi/abi.exp b/libstdc++-v3/testsuite/libstdc++-abi/abi.exp
index fac9ed25ee3..b3f5b3b59be 100644
--- a/libstdc++-v3/testsuite/libstdc++-abi/abi.exp
+++ b/libstdc++-v3/testsuite/libstdc++-abi/abi.exp
@@ -32,7 +32,7 @@ remote_exec "build" "$srcdir/../scripts/extract_symvers" \
     [list "../src/.libs/libstdc++.so" "current_symbols.txt"]
 
 # Build the abi_check program.
-if { [v3_target_compile "$srcdir/testsuite_abi_check.cc" "abi_check" \
+if { [v3_target_compile "$srcdir/util/testsuite_abi_check.cc" "abi_check" \
       "executable" [list "additional_flags=-w"]] != "" } {
     error "could not compile testsuite_abi_check.cc"
 }
diff --git a/libstdc++-v3/testsuite/libstdc++-dg/conformance.exp b/libstdc++-v3/testsuite/libstdc++-dg/conformance.exp
index 21bc3c1b915..a05ad3adb3f 100644
--- a/libstdc++-v3/testsuite/libstdc++-dg/conformance.exp
+++ b/libstdc++-v3/testsuite/libstdc++-dg/conformance.exp
@@ -53,11 +53,14 @@ if {[info exists tests_file] && [file exists $tests_file]} {
 } else {
     # Find directories that might have tests.
     set subdirs [glob "$srcdir/\[0-9\]\[0-9\]*"]
-    foreach d [glob "$srcdir/\[a-z\]*"] {
-	if {[file isdirectory $d]} { 
-	    lappend subdirs $d
-	}
-    }
+    lappend subdirs "$srcdir/backward"
+    lappend subdirs "$srcdir/demangle"
+    lappend subdirs "$srcdir/ext"
+    lappend subdirs "$srcdir/performance"
+    lappend subdirs "$srcdir/tr1"
+    lappend subdirs "$srcdir/thread"
+    verbose "subdirs are $subdirs"
+
     # Find all the tests.
     foreach s $subdirs {
 	set subdir_tests [find $s *.cc]
@@ -75,6 +78,7 @@ if {[info exists tests_file] && [file exists $tests_file]} {
 		continue
 	    }
 	    # Filter out:
+	    # 0. utilities, other parts of the testing infrastructure.
 	    # 1. interactive tests.
 	    # 2. performance tests.
 	    # 3. wchar_t tests, if not supported.
diff --git a/libstdc++-v3/testsuite/testsuite_abi.cc b/libstdc++-v3/testsuite/util/testsuite_abi.cc
index 6ed559f3e73..6ed559f3e73 100644
--- a/libstdc++-v3/testsuite/testsuite_abi.cc
+++ b/libstdc++-v3/testsuite/util/testsuite_abi.cc
diff --git a/libstdc++-v3/testsuite/testsuite_abi.h b/libstdc++-v3/testsuite/util/testsuite_abi.h
index 935d95bd1fe..935d95bd1fe 100644
--- a/libstdc++-v3/testsuite/testsuite_abi.h
+++ b/libstdc++-v3/testsuite/util/testsuite_abi.h
diff --git a/libstdc++-v3/testsuite/testsuite_abi_check.cc b/libstdc++-v3/testsuite/util/testsuite_abi_check.cc
index 12e882a436f..12e882a436f 100644
--- a/libstdc++-v3/testsuite/testsuite_abi_check.cc
+++ b/libstdc++-v3/testsuite/util/testsuite_abi_check.cc
diff --git a/libstdc++-v3/testsuite/testsuite_allocator.cc b/libstdc++-v3/testsuite/util/testsuite_allocator.cc
index 66968720555..66968720555 100644
--- a/libstdc++-v3/testsuite/testsuite_allocator.cc
+++ b/libstdc++-v3/testsuite/util/testsuite_allocator.cc
diff --git a/libstdc++-v3/testsuite/testsuite_allocator.h b/libstdc++-v3/testsuite/util/testsuite_allocator.h
index 0ea1215e3b4..0ea1215e3b4 100644
--- a/libstdc++-v3/testsuite/testsuite_allocator.h
+++ b/libstdc++-v3/testsuite/util/testsuite_allocator.h
diff --git a/libstdc++-v3/testsuite/testsuite_character.cc b/libstdc++-v3/testsuite/util/testsuite_character.cc
index 63a1fa35bfc..63a1fa35bfc 100644
--- a/libstdc++-v3/testsuite/testsuite_character.cc
+++ b/libstdc++-v3/testsuite/util/testsuite_character.cc
diff --git a/libstdc++-v3/testsuite/testsuite_character.h b/libstdc++-v3/testsuite/util/testsuite_character.h
index a9e4847105b..a9e4847105b 100644
--- a/libstdc++-v3/testsuite/testsuite_character.h
+++ b/libstdc++-v3/testsuite/util/testsuite_character.h
diff --git a/libstdc++-v3/testsuite/testsuite_common_types.h b/libstdc++-v3/testsuite/util/testsuite_common_types.h
index e63f5e0e590..e63f5e0e590 100644
--- a/libstdc++-v3/testsuite/testsuite_common_types.h
+++ b/libstdc++-v3/testsuite/util/testsuite_common_types.h
diff --git a/libstdc++-v3/testsuite/testsuite_hooks.cc b/libstdc++-v3/testsuite/util/testsuite_hooks.cc
index 40189fbf5d4..40189fbf5d4 100644
--- a/libstdc++-v3/testsuite/testsuite_hooks.cc
+++ b/libstdc++-v3/testsuite/util/testsuite_hooks.cc
diff --git a/libstdc++-v3/testsuite/testsuite_hooks.h b/libstdc++-v3/testsuite/util/testsuite_hooks.h
index b6c675b12e7..b6c675b12e7 100644
--- a/libstdc++-v3/testsuite/testsuite_hooks.h
+++ b/libstdc++-v3/testsuite/util/testsuite_hooks.h
diff --git a/libstdc++-v3/testsuite/testsuite_io.h b/libstdc++-v3/testsuite/util/testsuite_io.h
index e6f1c03d622..e6f1c03d622 100644
--- a/libstdc++-v3/testsuite/testsuite_io.h
+++ b/libstdc++-v3/testsuite/util/testsuite_io.h
diff --git a/libstdc++-v3/testsuite/testsuite_iterators.h b/libstdc++-v3/testsuite/util/testsuite_iterators.h
index 7119783c93b..7119783c93b 100644
--- a/libstdc++-v3/testsuite/testsuite_iterators.h
+++ b/libstdc++-v3/testsuite/util/testsuite_iterators.h
diff --git a/libstdc++-v3/testsuite/testsuite_performance.h b/libstdc++-v3/testsuite/util/testsuite_performance.h
index f902dd0c6d9..f902dd0c6d9 100644
--- a/libstdc++-v3/testsuite/testsuite_performance.h
+++ b/libstdc++-v3/testsuite/util/testsuite_performance.h
diff --git a/libstdc++-v3/testsuite/testsuite_shared.cc b/libstdc++-v3/testsuite/util/testsuite_shared.cc
index d651442ed03..d651442ed03 100644
--- a/libstdc++-v3/testsuite/testsuite_shared.cc
+++ b/libstdc++-v3/testsuite/util/testsuite_shared.cc
diff --git a/libstdc++-v3/testsuite/testsuite_tr1.h b/libstdc++-v3/testsuite/util/testsuite_tr1.h
index 439d435ee8b..439d435ee8b 100644
--- a/libstdc++-v3/testsuite/testsuite_tr1.h
+++ b/libstdc++-v3/testsuite/util/testsuite_tr1.h
diff --git a/libstdc++-v3/testsuite/testsuite_visualization.h b/libstdc++-v3/testsuite/util/testsuite_visualization.h
index 0e2757666a4..0e2757666a4 100644
--- a/libstdc++-v3/testsuite/testsuite_visualization.h
+++ b/libstdc++-v3/testsuite/util/testsuite_visualization.h