util: New directory.

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.

From-SVN: r114466

libstdc++-v3/ChangeLog

+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==,

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

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)

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"

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"
 }

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.