mkcheck.in: Construct file names that match $objdir structure.

2001-01-17  Loren J. Rittle  <ljrittle@acm.org>

        * mkcheck.in: Construct file names that match $objdir structure.
        * testsuite/27_io/filebuf_members-1.txt: New file.
        * testsuite/27_io/ifstream_members-1.txt: New file.
        * testsuite/27_io/ostream_inserter_char-1.txt: New file.

	* testsuite/27_io/ios_base_members_static.cc (test02): Add test.
	* testsuite/27_io/ios_base_members_static-1.tst: Add expected output.

From-SVN: r39110

libstdc++-v3/ChangeLog

@@ -2,11 +2,21 @@
 
 	* testsuite/libstdc++.tests, testsuite/lib: New directories.
 
+2001-01-17  Loren J. Rittle  <ljrittle@acm.org>
+
+        * mkcheck.in: Construct file names that match $objdir structure.
+        * testsuite/27_io/filebuf_members-1.txt: New file.
+        * testsuite/27_io/ifstream_members-1.txt: New file.
+        * testsuite/27_io/ostream_inserter_char-1.txt: New file.
+
+	* testsuite/27_io/ios_base_members_static.cc (test02): Add test.
+	* testsuite/27_io/ios_base_members_static-1.tst: Add expected output.
+
 2001-01-17  Peter Schmid  <schmid@snake.iap.physik.tu-darmstadt.de>
 
 	* testsuite/27_io/istream_sentry.cc (test02): Fix.
 
-2001-01-16  Benjamin Kosnik  <bkoz@redhat.com>
+2001-01-17  Benjamin Kosnik  <bkoz@redhat.com>
 
 	libstdc++/1605
 	* include/bits/ios_base.h (ios_base::failure): Tighten up throw specs.

libstdc++-v3/mkcheck.in

@@ -261,9 +261,9 @@ test_for_output()
     # this is the name of the resulting diff file, if any
     DIFF_FILE="`echo $TEST_NAME | sed 's/cc$/diff/'`"
     # construct wildcard names, ie for $NAME=filebuf.cc, makes "filebuf*.tst"
-    DATA_FILES="`echo $NAME | sed 's/\.cc/\*\.tst/g'`"
+    DATA_FILES="`echo $TEST_NAME | sed 's/\.cc/\*\.tst/g'`"
     # make sure there is at least one, then go
-    ST_E="`echo $NAME | sed 's/\.cc/\-1\.tst/g'`"
+    ST_E="`echo $TEST_NAME | sed 's/\.cc/\-1\.tst/g'`"
     if [ -f $ST_E ]; then
         # list of actual files that match the wildcard above, ie
         # "filebuf-1.tst"
@@ -275,7 +275,6 @@ test_for_output()
             diff $ST_OUT_FILE $i > $DIFF_FILE
             if [ -s $DIFF_FILE ]; then
                 RESULT="-r"
-                echo "$ST_OUT_FILE has some problems, dude"
             else
                 RESULT="+"
             fi

libstdc++-v3/testsuite/27_io/ios_base_members_static-1.tst

@@ -0,0 +1,2 @@
+1234567890
+1234567890

libstdc++-v3/testsuite/27_io/ios_base_members_static.cc

@@ -1,7 +1,8 @@
 // 1999-05-21 bkoz
-// 2000-05-21 bkoz
+// 2000-05-21 Benjamin Kosnik  <bkoz@redhat.com>
+// 2001-01-17 Loren J. Rittle  <ljrittle@acm.org>
 
-// Copyright (C) 1999, 2000 Free Software Foundation
+// Copyright (C) 1999, 2000, 2001 Free Software Foundation
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -21,6 +22,7 @@
 
 // 27.4.2.4 ios_base static members
 
+#include <cstdio>
 #include <sstream>
 #include <iostream>
 
@@ -51,11 +53,34 @@ bool test01()
   return test;
 }
 
+void
+test02()
+{
+  std::ios_base::sync_with_stdio();
+ 
+  std::freopen("testsuite/ios_base_members_static-1.txt", "w", stdout);
+ 
+  for (int i = 0; i < 2; i++)
+    {
+      std::printf("1");
+      std::cout << "2";
+      std::putc('3', stdout); // std::stdout doesn't work here
+      std::cout << '4';
+      std::fputs("5", stdout);
+      std::cout << 6;
+      std::putchar('7');
+      std::cout << 8 << '9';
+      if (i)
+	std::printf ("0\n");
+      else
+	std::cout << "0" << std::endl;
+    }
+}
 
 int main(void)
 {
   test01();
-
+  test02();
   return 0;
 }