* testsuite/27_io/*.cc: Remove explicit reference to 'testsuite/'

       in testcases.  Prepare for the DejaGnu based framework.
       * mkcheck.in: Adjust call to tests_flags.  Don't mmkdir testsuite
       directory -- it is now mkcheck working directory.
       * tests_flags.in: Remove reference to $(top_srcdir).  Use
       ${SRC_DIR} instead.
       * Makefile.am (check, check-install): Change mkcheck invocation
       logic.
       * Makefile.in: Regenerate.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39255 138bc75d-0d04-0410-961f-82ee72b054a4

11 files changed, 45 insertions, 28 deletions

diff --git a/libstdc++-v3/testsuite/27_io/filebuf.cc b/libstdc++-v3/testsuite/27_io/filebuf.cc
index bba2fbd6034..4cfd9277b57 100644
--- a/libstdc++-v3/testsuite/27_io/filebuf.cc
+++ b/libstdc++-v3/testsuite/27_io/filebuf.cc
@@ -22,14 +22,17 @@
 // buffer_size length of 8092, so that overflow/underflow can be
 // simulated a bit more readily.
 
+// @require@ %-*.tst %-*.txt
+// @diff@ %-*.tst %*.txt
+
 #include <fstream>
 #include <debug_assert.h>
 
 const char carray_01[] = "santa cruz or sandiego?";
 const char carray_02[] = "memphis, new orleans, and savanah";
-const char name_01[] = "testsuite/filebuf-1.txt"; // file with data in it
-const char name_02[] = "testsuite/filebuf-2.txt"; // empty file, need to create
-const char name_03[] = "testsuite/filebuf-3.txt"; // empty file, need to create
+const char name_01[] = "filebuf-1.txt"; // file with data in it
+const char name_02[] = "filebuf-2.txt"; // empty file, need to create
+const char name_03[] = "filebuf-3.txt"; // empty file, need to create
 
 class derived_filebuf: public std::filebuf
 {
diff --git a/libstdc++-v3/testsuite/27_io/filebuf_members.cc b/libstdc++-v3/testsuite/27_io/filebuf_members.cc
index beaf6da6600..3b028a5221a 100644
--- a/libstdc++-v3/testsuite/27_io/filebuf_members.cc
+++ b/libstdc++-v3/testsuite/27_io/filebuf_members.cc
@@ -17,6 +17,8 @@
 // USA.
 
 // 27.8.1.3 filebuf member functions
+// @require@ %-*.tst %-*.txt
+// @diff@ %-*.tst %-*.txt
 
 // various tests for filebuf::open() and filebuf::close() including
 // the non-portable functionality in the libstdc++-v3 IO library
@@ -37,8 +39,8 @@
 // thanks to "George T. Talbot" <george@moberg.com> for uncovering
 // this bug/situation. 
 
-const char name_01[] = "testsuite/filebuf_members-1.tst";
-const char name_02[] = "testsuite/filebuf_members-1.txt";
+const char name_01[] = "filebuf_members-1.tst";
+const char name_02[] = "filebuf_members-1.txt";
 
 int
 test_01()
diff --git a/libstdc++-v3/testsuite/27_io/ifstream_members.cc b/libstdc++-v3/testsuite/27_io/ifstream_members.cc
index e87aa76016a..3fb7a6d1156 100644
--- a/libstdc++-v3/testsuite/27_io/ifstream_members.cc
+++ b/libstdc++-v3/testsuite/27_io/ifstream_members.cc
@@ -17,13 +17,15 @@
 // USA.
 
 // 27.8.1.7 ifstream member functions
+// @require@ %-*.tst %-*.txt
+// @diff@ %-*.tst %-*.txt
 
 #include <istream>
 #include <fstream>
 #include <debug_assert.h>
 
-const char name_01[] = "testsuite/ifstream_members-1.tst";
-const char name_02[] = "testsuite/ifstream_members-1.txt";
+const char name_01[] = "ifstream_members-1.tst";
+const char name_02[] = "ifstream_members-1.txt";
 
 // http://gcc.gnu.org/ml/libstdc++/2000-06/msg00136.html
 bool test00()
diff --git a/libstdc++-v3/testsuite/27_io/ios_base_members_static.cc b/libstdc++-v3/testsuite/27_io/ios_base_members_static.cc
index 6a0e82684b4..08043449bdc 100644
--- a/libstdc++-v3/testsuite/27_io/ios_base_members_static.cc
+++ b/libstdc++-v3/testsuite/27_io/ios_base_members_static.cc
@@ -21,6 +21,8 @@
 // USA.
 
 // 27.4.2.4 ios_base static members
+// @require@ %-*.tst
+// @diff@ %-*.tst %-*.txt
 
 #include <cstdio>
 #include <sstream>
@@ -58,7 +60,7 @@ test02()
 {
   std::ios_base::sync_with_stdio();
  
-  std::freopen("testsuite/ios_base_members_static-1.txt", "w", stdout);
+  std::freopen("ios_base_members_static-1.txt", "w", stdout);
  
   for (int i = 0; i < 2; i++)
     {
diff --git a/libstdc++-v3/testsuite/27_io/istream_extractor_other.cc b/libstdc++-v3/testsuite/27_io/istream_extractor_other.cc
index 72633af6ddd..2bd878fabce 100644
--- a/libstdc++-v3/testsuite/27_io/istream_extractor_other.cc
+++ b/libstdc++-v3/testsuite/27_io/istream_extractor_other.cc
@@ -19,6 +19,8 @@
 // USA.
 
 // 27.6.1.2.3 basic_istream::operator>>
+// @require@ %-*.tst %-*.txt
+// @diff@ %-*.tst %-*.txt
 
 #include <istream>
 #include <sstream>
@@ -154,8 +156,8 @@ bool test02() {
 
   bool test = true;
   typedef std::ios::traits_type ctraits_type;
-  const char name_01[] = "testsuite/istream_extractor_other-1.txt"; //read 
-  const char name_02[] = "testsuite/istream_extractor_other-2.txt"; //write
+  const char name_01[] = "istream_extractor_other-1.txt"; //read 
+  const char name_02[] = "istream_extractor_other-2.txt"; //write
 
   std::filebuf fbin, fbout;
   fbin.open(name_01, std::ios_base::in);
diff --git a/libstdc++-v3/testsuite/27_io/istream_seeks.cc b/libstdc++-v3/testsuite/27_io/istream_seeks.cc
index cc2626dfcd1..d5fad458af0 100644
--- a/libstdc++-v3/testsuite/27_io/istream_seeks.cc
+++ b/libstdc++-v3/testsuite/27_io/istream_seeks.cc
@@ -33,7 +33,7 @@ bool test01()
   typedef ios::pos_type pos_type;
 
   bool test = true;
-  const char str_lit01[] = "testsuite/istream_unformatted-1.tst";
+  const char str_lit01[] = "istream_unformatted-1.tst";
 
   // in
   // test default ctors leave things in the same positions...
@@ -68,8 +68,8 @@ void test04(void)
   bool test = true;
   std::istream::pos_type pos01, pos02, pos03, pos04, pos05, pos06;
   std::ios_base::iostate state01, state02;
-  const char str_lit01[] = "testsuite/istream_unformatted-1.txt";
-  const char str_lit02[] = "testsuite/istream_unformatted-2.txt";
+  const char str_lit01[] = "istream_unformatted-1.txt";
+  const char str_lit02[] = "istream_unformatted-2.txt";
   std::ifstream if01(str_lit01, std::ios_base::in | std::ios_base::out);
   std::ifstream if02(str_lit01, std::ios_base::in);
   std::ifstream if03(str_lit02, std::ios_base::out | std::ios_base::trunc); 
@@ -174,7 +174,7 @@ void test05(void)
   bool test = true;
   std::istream::pos_type pos01, pos02, pos03, pos04, pos05, pos06;
   std::ios_base::iostate state01, state02;
-  const char str_lit01[] = "testsuite/istream_unformatted-1.tst";
+  const char str_lit01[] = "istream_unformatted-1.tst";
   std::ifstream if01(str_lit01);
   std::ifstream if02(str_lit01);
   std::ifstream if03(str_lit01);
diff --git a/libstdc++-v3/testsuite/27_io/istream_unformatted.cc b/libstdc++-v3/testsuite/27_io/istream_unformatted.cc
index 76464d73ffa..77560a59095 100644
--- a/libstdc++-v3/testsuite/27_io/istream_unformatted.cc
+++ b/libstdc++-v3/testsuite/27_io/istream_unformatted.cc
@@ -19,6 +19,8 @@
 // USA.
 
 // 27.6.1.3 unformatted input functions
+// @require@ %-*.tst %-*.txt
+// @diff@ %-*.tst %-*.txt
 
 #include <cstring> // for strncmp,...
 #include <istream>
@@ -459,7 +461,7 @@ int
 test07()
 {
   bool test = true;
-  const char* tfn = "testsuite/istream_unformatted-3.txt";
+  const char* tfn = "istream_unformatted-3.txt";
   std::ifstream infile;
   infile.open(tfn);
   VERIFY( !(!infile) );
diff --git a/libstdc++-v3/testsuite/27_io/ofstream_members.cc b/libstdc++-v3/testsuite/27_io/ofstream_members.cc
index 4a20d2f5751..d965b3efbfc 100644
--- a/libstdc++-v3/testsuite/27_io/ofstream_members.cc
+++ b/libstdc++-v3/testsuite/27_io/ofstream_members.cc
@@ -17,13 +17,15 @@
 // USA.
 
 // 27.8.1.10 ofstream member functions
+// @require@ %-*.tst
+// @diff@ %-*.tst %-*.txt
 
 #include <ostream>
 #include <fstream>
 #include <debug_assert.h>
 
-const char name_01[] = "testsuite/ofstream_members-1.tst";
-const char name_02[] = "testsuite/ofstream_members-1.txt";
+const char name_01[] = "ofstream_members-1.tst";
+const char name_02[] = "ofstream_members-1.txt";
 
 // http://gcc.gnu.org/ml/libstdc++/2000-06/msg00136.html
 bool test00()
diff --git a/libstdc++-v3/testsuite/27_io/ostream_inserter_char.cc b/libstdc++-v3/testsuite/27_io/ostream_inserter_char.cc
index 59a1bd27e74..0c7f18915fc 100644
--- a/libstdc++-v3/testsuite/27_io/ostream_inserter_char.cc
+++ b/libstdc++-v3/testsuite/27_io/ostream_inserter_char.cc
@@ -32,7 +32,7 @@ bool test01()
   bool test = true;
   std::string str01;
   const int size = 1000;
-  const char name_02[] = "testsuite/ostream_inserter_char-1.txt";
+  const char name_02[] = "ostream_inserter_char-1.txt";
 
   // initialize string
   for(int i=0 ; i < size; i++) {
diff --git a/libstdc++-v3/testsuite/27_io/ostream_inserter_other.cc b/libstdc++-v3/testsuite/27_io/ostream_inserter_other.cc
index 465890e2109..ec3a028e82f 100644
--- a/libstdc++-v3/testsuite/27_io/ostream_inserter_other.cc
+++ b/libstdc++-v3/testsuite/27_io/ostream_inserter_other.cc
@@ -20,6 +20,8 @@
 // USA.
 
 // 27.6.2.5.4 basic_ostream character inserters
+// @require@ %-*.tst %-*.txt
+// @diff@ %-*.tst %-*.txt
 
 #include <ostream>
 #include <sstream>
@@ -27,10 +29,10 @@
 #include <debug_assert.h>
 
 const int size = 1000;
-const char name_01[] = "testsuite/ostream_inserter_other-1.tst";
-const char name_02[] = "testsuite/ostream_inserter_other-1.txt";
-const char name_03[] = "testsuite/ostream_inserter_other-2.tst";
-const char name_04[] = "testsuite/ostream_inserter_other-2.txt";
+const char name_01[] = "ostream_inserter_other-1.tst";
+const char name_02[] = "ostream_inserter_other-1.txt";
+const char name_03[] = "ostream_inserter_other-2.tst";
+const char name_04[] = "ostream_inserter_other-2.txt";
 
 
 // stringstream
@@ -101,8 +103,8 @@ test03(void)
 
   typedef ios::pos_type 	pos_type;
 
-  const char* TEST_IN = "testsuite/ostream_inserter_other_in";
-  const char* TEST_OUT = "testsuite/ostream_inserter_other_out";
+  const char* TEST_IN = "ostream_inserter_other_in";
+  const char* TEST_OUT = "ostream_inserter_other_out";
   pos_type i_read, i_wrote, rs, ws;
   double tf_size = BUFSIZ * 2.5;
   ofstream testfile(TEST_IN);
diff --git a/libstdc++-v3/testsuite/27_io/ostream_seeks.cc b/libstdc++-v3/testsuite/27_io/ostream_seeks.cc
index 0d66754f9d2..df927562a2b 100644
--- a/libstdc++-v3/testsuite/27_io/ostream_seeks.cc
+++ b/libstdc++-v3/testsuite/27_io/ostream_seeks.cc
@@ -32,7 +32,7 @@ bool test01()
   typedef ios::pos_type pos_type;
 
   bool test = true;
-  const char str_lit01[] = "testsuite/ostream_seeks-1.txt";
+  const char str_lit01[] = "ostream_seeks-1.txt";
 
   // out
   // test default ctors leave things in the same positions...
@@ -72,8 +72,8 @@ void test04(void)
   bool test = true;
   std::istream::pos_type pos01, pos02, pos03, pos04, pos05, pos06;
   std::ios_base::iostate state01, state02;
-  const char str_lit01[] = "testsuite/istream_unformatted-1.txt";
-  const char str_lit02[] = "testsuite/istream_unformatted-2.txt";
+  const char str_lit01[] = "istream_unformatted-1.txt";
+  const char str_lit02[] = "istream_unformatted-2.txt";
   std::ifstream if01(str_lit01, std::ios_base::in | std::ios_base::out);
   std::ifstream if02(str_lit01, std::ios_base::in);
   std::ifstream if03(str_lit02, std::ios_base::out | std::ios_base::trunc); 
@@ -178,7 +178,7 @@ void test05(void)
   bool test = true;
   std::istream::pos_type pos01, pos02, pos03, pos04, pos05, pos06;
   std::ios_base::iostate state01, state02;
-  const char str_lit01[] = "testsuite/istream_unformatted-1.tst";
+  const char str_lit01[] = "istream_unformatted-1.tst";
   std::ifstream if01(str_lit01);
   std::ifstream if02(str_lit01);
   std::ifstream if03(str_lit01);