]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Replace @require@ markup in some I/O tests
authorJonathan Wakely <jwakely@redhat.com>
Wed, 17 Jul 2024 12:27:19 +0000 (13:27 +0100)
committerJonathan Wakely <redi@gcc.gnu.org>
Wed, 24 Jul 2024 11:25:25 +0000 (12:25 +0100)
We can replace the @require@ markup with { dg-additional-files ... }
directives, so that the required files are explicitly named and are
explicitly copied into place for tests that require it. This will allow
a later change to remove the "Copy all required data files" step in the
proc libstdc++_init in testsuite/lib/libstdc++.exp that is marked TODO.
This commit uses dg-additional-files for a subset of the files that
contain @require@.

Also remove the @diff@ markup where appears to be copy & pasted from
other test files, and so serves no purpose. For example, there is no
output file created by 27_io/basic_ifstream/cons/char/1.cc so there is
nothing for @diff@ to compare. Maybe the purpose was to check that
reading the .tst file with an ifstream doesn't change it, but we've
survived without doing those comparisons for many years so I think we
can remove those cases of @diff@ markup.

libstdc++-v3/ChangeLog:

* testsuite/27_io/basic_filebuf/close/char/2.cc: Remove
@require@ and @diff@ markup. Use dg-additional-files. Remove
unused variable.
* testsuite/27_io/basic_filebuf/close/char/3.cc: Remove
@require@ and @diff@ markup. Use dg-additional-files.
* testsuite/27_io/basic_filebuf/close/char/4.cc: Likewise.
* testsuite/27_io/basic_filebuf/close/char/5.cc: Likewise.
* testsuite/27_io/basic_filebuf/in_avail/char/1.cc: Likewise.
* testsuite/27_io/basic_filebuf/is_open/char/1.cc: Likewise.
* testsuite/27_io/basic_filebuf/open/char/1.cc: Likewise.
* testsuite/27_io/basic_filebuf/open/char/2.cc: Likewise.
* testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc: Likewise.
* testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc: Likewise.
* testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc: Likewise.
* testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc: Likewise.
* testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Likewise.
* testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc: Likewise.
* testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc: Likewise.
* testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc: Likewise.
* testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc: Likewise.
* testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc: Likewise.
* testsuite/27_io/basic_filebuf/snextc/char/1-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/snextc/char/1-io.cc: Likewise.
* testsuite/27_io/basic_filebuf/snextc/char/1-out.cc: Likewise.
* testsuite/27_io/basic_filebuf/snextc/char/2-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/snextc/char/2-io.cc: Likewise.
* testsuite/27_io/basic_filebuf/sputbackc/char/1-in.cc:
Likewise.
* testsuite/27_io/basic_filebuf/sputbackc/char/2-in.cc:
Likewise.
* testsuite/27_io/basic_filebuf/sputc/char/1-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/sputc/char/2-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/sputc/char/2-io.cc: Likewise.
* testsuite/27_io/basic_filebuf/sputn/char/1-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/sputn/char/1-io.cc: Likewise.
Remove unused variable.
* testsuite/27_io/basic_filebuf/sputn/char/2-in.cc: Remove
@require@ and @diff@ markup. Use dg-additional-files.
* testsuite/27_io/basic_filebuf/sungetc/char/1-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/sungetc/char/2-in.cc: Likewise.
* testsuite/27_io/basic_ifstream/cons/char/1.cc: Likewise.
* testsuite/27_io/basic_ifstream/open/char/1.cc: Likewise.
* testsuite/27_io/basic_ifstream/rdbuf/char/2832.cc: Likewise.
* testsuite/27_io/basic_istream/readsome/char/6746-2.cc:
Likewise.
* testsuite/27_io/basic_istream/readsome/wchar_t/6746-2.cc:
Likewise.
* testsuite/27_io/basic_istream/seekg/char/sstream.cc: Likewise.
* testsuite/27_io/basic_istream/seekg/wchar_t/sstream.cc:
Likewise.
* testsuite/27_io/basic_istream/tellg/char/1.cc: Likewise.
* testsuite/27_io/basic_istream/tellg/char/sstream.cc: Likewise.
* testsuite/27_io/basic_istream/tellg/wchar_t/1.cc: Likewise.
* testsuite/27_io/basic_istream/tellg/wchar_t/sstream.cc:
Likewise.
* testsuite/27_io/basic_ofstream/open/char/1.cc: Likewise.
* testsuite/lib/dg-options.exp (dg-additional-files): Append to
v3_additional_files instead of replacing.
* testsuite/lib/libstdc++.exp (v3_target_compile): Reset
v3_additional_files after copying files.

57 files changed:
libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/2.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/3.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/4.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/close/char/5.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/in_avail/char/1.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/is_open/char/1.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/1.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/2.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/1-io.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sbumpc/char/2-io.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/1-io.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sgetc/char/2-io.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/1-io.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/2-io.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-io.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/1-out.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/snextc/char/2-io.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/1-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sputbackc/char/2-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/1-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/2-io.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/1-io.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/2-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/1-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sungetc/char/2-in.cc
libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/1.cc
libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/1.cc
libstdc++-v3/testsuite/27_io/basic_ifstream/rdbuf/char/2832.cc
libstdc++-v3/testsuite/27_io/basic_istream/readsome/char/6746-2.cc
libstdc++-v3/testsuite/27_io/basic_istream/readsome/wchar_t/6746-2.cc
libstdc++-v3/testsuite/27_io/basic_istream/seekg/char/sstream.cc
libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/sstream.cc
libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/1.cc
libstdc++-v3/testsuite/27_io/basic_istream/tellg/char/sstream.cc
libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/1.cc
libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/sstream.cc
libstdc++-v3/testsuite/27_io/basic_ofstream/open/char/1.cc
libstdc++-v3/testsuite/lib/dg-options.exp
libstdc++-v3/testsuite/lib/libstdc++.exp

index c7f655d0bb7c4033cb5ce82d972cb7f11329ee22..fd71faed7349b214a71c2d4619d96a5d01f68871 100644 (file)
 // <http://www.gnu.org/licenses/>.
 
 // { dg-require-fileio "" }
+// { dg-additional-files "filebuf_virtuals-1.txt" }
 
-// 27.8.1.3 filebuf member functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
+// C++98 27.8.1.3 filebuf member functions
 
 // various tests for filebuf::open() and filebuf::close() including
 // the non-portable functionality in the libstdc++-v3 IO library
@@ -39,7 +38,6 @@
 // this bug/situation. 
 
 const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it
-const char name_02[] = "filebuf_virtuals-2.txt"; // empty file, need to create
 
 void test_02()
 {
index ff0b9a5fb7eabb024f359be73cd838928b48dc78..cd7550f5677f85bd434e24d3bc4af027005239ad 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.3 filebuf member functions
 
 #include <fstream>
 #include <testsuite_hooks.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
+// { dg-additional-files "filebuf_virtuals-1.txt" }
 
 // NB: This test assumes that _M_buf_size == 40, and not the usual
 // buffer_size length of BUFSIZ (8192), so that overflow/underflow can be
index 0e0949d79e900b2b64d2a3b433dcc74541be4659..931da8652471d30d3d5091328568959723c30619 100644 (file)
 // <http://www.gnu.org/licenses/>.
 
 // { dg-require-fileio "" }
+// { dg-additional-files "filebuf_virtuals-1.txt" }
 
-// 27.8.1.3 filebuf member functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
+// C++98 27.8.1.3 filebuf member functions
 
 // Test that upon filebuf::close() 27.8.1.1,3 is enforced.
 
index 6402c77b44acf381063754a2dc5ec9705fe9ada4..29804fb501421b35ae2baf7d2b3152c291993792 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.3 filebuf member functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
+// C++98 27.8.1.3 filebuf member functions
 
-// Test that upon filebuf::close() 27.8.1.1,3 is enforced.
+// { dg-additional-files "filebuf_virtuals-1.txt" }
+
+// Test that upon filebuf::close() 27.8.1.1 p3 is enforced.
 
 #include <fstream>
 #include <testsuite_hooks.h>
index 505293021ea0beb42c952d3ab97159d2c81784e2..40b15317d694b52c42b68bf6152327f651741193 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "filebuf_virtuals-1.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 // NB: This test assumes that _M_buf_size == 40, and not the usual
 // buffer_size length of BUFSIZ (8192), so that overflow/underflow can be
 // simulated a bit more readily.
index 54fb0094567dda592926a53db0ff7a2a0ba23b3d..d8e23e534f6a9bf18a85298a276308557b4b8753 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.3 filebuf member functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
+// C++98 27.8.1.3 filebuf member functions
 
 // various tests for filebuf::open() and filebuf::close() including
 // the non-portable functionality in the libstdc++-v3 IO library
 
 // { dg-require-fileio "" }
+// { dg-additional-files "filebuf_members-1.tst filebuf_members-1.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
index 7a5321bd80c1f54ce0d12344a5b87215e17733b7..4ca94cf4879bd746952292566ee9bfb9e6917e5f 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.3 filebuf member functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
+// C++98 27.8.1.3 filebuf member functions
 
 // various tests for filebuf::open() and filebuf::close() including
 // the non-portable functionality in the libstdc++-v3 IO library
 
 // { dg-require-fileio "" }
+// { dg-additional-files "filebuf_members-1.tst filebuf_members-1.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
index 5801b2ad37907d4a267caad7ca3bb6a926795ace..cdd06d38c35ecf9826df2272b3c5f5d380fbab6c 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.3 filebuf member functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
+// C++98 27.8.1.3 filebuf member functions
 
 // various tests for filebuf::open() and filebuf::close() including
 // the non-portable functionality in the libstdc++-v3 IO library
 
 // { dg-require-fileio "" }
+// { dg-additional-files "filebuf_virtuals-1.txt" }
 
 #include <fstream>
 #include <unistd.h>
index 0f419c1df6d14aed46670c7bdd746478149bbc42..b3733cc69169261f2fc982ac292911d9ba810825 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "sgetc.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetc.txt"; // file with data in it
 
 void test05() 
index eceae02f5b35482a4e67f3059d9a47482c9f2ebb..439f8de29c690ea7ab9234172662059c4cabc377 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "sgetc.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetc.txt"; // file with data in it
 const char name_03[] = "tmp_sbumpc_1io.tst"; // empty file, need to create
 
index 8c4230c7091f416fd8595f63575a14422f570933..d5b60e488b099794717300fef558d8a16d3fe25e 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "sgetc.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetc.txt"; // file with data in it
 
 void test05() 
index b8a152ad82af1ccc3698fb5a7574508ec5158043..b265cd55db46426404ce420885aea3e0c43af6eb 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "sgetc.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetc.txt"; // file with data in it
 const char name_03[] = "tmp_sbumpc_2io.tst"; // empty file, need to create
 
index c8584c2f18ba35d0fac896de1af31d94de116519..47d1b8979636a8d228ab8cdfbb244811bed50874 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "seekoff.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "seekoff.txt";
 
 void test05() 
index f78612cae8809bfd3b9f7d897c2dd0873cf1b7d9..7220b22c24cfb37b58c45a675eb4126792a1a287 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "seekoff-1out.tst" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "seekoff-1out.tst";
 
 void test05() 
index 7c3784f84ddac7f9022012e63c45e57c4da44be3..d69f290777316b69f66d509444b67b1dc9355365 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "seekoff.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "seekoff.txt";
 
 void test05() 
index c4b0d4b72bce015c4acdfb19efa735e3a9992dff..e07b2097916acbebde971e9acaa5339b72a15d02 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "seekoff-2out.tst" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "seekoff-2out.tst";
 
 void test05() 
index 88c6c7eee871d499ae2814485a2c8d4161f4f469..4e7d98716c1bf16de60e931e2c6b86aecc19e354 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "seekpos.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "seekpos.txt"; // file with data in it
 
 void test05() 
index a6cfbfc3e6ef9b11db647a9e28e0a25db2f6833e..7c0486ef8ca1ae585bb4fe335152f088eaaadf5d 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "seekpos-1out.tst" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "seekpos-1out.tst"; // file with data in it
 
 void test05() 
index 05eed15af24adca61b46bad968aae89faaf0a1a5..3f80ec9207918328ac8bc33bc28e49c57f1b18e4 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "seekpos.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "seekpos.txt"; // file with data in it
 
 void test05() 
index c1d7bf754ce1c1f09b71c38cda981898b8161872..d0b34c23a4ceea2a2bd7f03af86e6a717d6272cd 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "seekpos-2out.tst" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "seekpos-2out.tst"; // file with data in it
 
 void test05() 
index 1e6dfd2bda3471db20e7428a68300a58d74c1f56..27b8c5cc2e45477bbef45ad599cddff7a81950a3 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "filebuf_virtuals-1.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it
 
 // Test overloaded virtual functions.
index 8f1f36c15cbe427327d43d701820fccd3209fe8c..f9d68f6be0a2752cab93b040454a0ed4492c677c 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "sgetc.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetc.txt"; // file with data in it
 const char name_03[] = "tmp_sgetc_1io.tst"; // empty file, need to create
 
index aca1593d5b51d3d557c6b609f53961d2c87877a5..955af5b68484db7056c62ccc714293c163d0774c 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "sgetc.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetc.txt"; // file with data in it
 
 // Test overloaded virtual functions.
index b233df872d0ce5ff27033feb1f2f9d0075c8b888..4fea4585ba7f8fcd53e6735e959cc24378193114 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "sgetc.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetc.txt"; // file with data in it
 const char name_03[] = "tmp_sgetc_2io.tst"; // empty file, need to create
 
index 9791706a99f0b79743f575138db107844cad74e9..2af5cb4493c3930bc7c48f0a9d0b548538a68274 100644 (file)
 // causes "in_avail" to return an incorrect value.
 // { dg-do run { xfail arm*-*-elf arm*-*-eabi } }
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
 // { dg-require-binary-io "" }
+// { dg-additional-files "sgetn.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetn.txt"; // file with data in it
 
 // Test overloaded virtual functions.
index 506d0676bd51b0ab6d2ebcfe74460f92de4ae73d..6ad69300323a945cf1a3f84444fc878e55500ab4 100644 (file)
 // causes "in_avail" to return an incorrect value.
 // { dg-do run { xfail arm*-*-elf arm*-*-eabi } }
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
 // { dg-require-binary-io "" }
+// { dg-additional-files "sgetn.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetn.txt"; // file with data in it
 const char name_03[] = "tmp_sgetn_1io.tst"; // empty file, need to create
 
index 1b16f5d0b49ba2d90ecdac45949f297c0d874cfd..570748320620f7e636d2644b307eac76e5fccfde 100644 (file)
 // causes "in_avail" to return an incorrect value.
 // { dg-do run { xfail arm*-*-elf arm*-*-eabi } }
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
 // { dg-require-binary-io "" }
+// { dg-additional-files "sgetn.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetn.txt"; // file with data in it
 
 // Test overloaded virtual functions.
index c185a4adb1ed11de77c46bcb5db6e1d9434e759b..c3112f718a8b4074f0ca00ddd83703ddb5c77f99 100644 (file)
 // causes "in_avail" to return an incorrect value.
 // { dg-do run { xfail arm*-*-elf arm*-*-eabi } }
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
 // { dg-require-binary-io "" }
+// { dg-additional-files "sgetn.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetn.txt"; // file with data in it
 const char name_03[] = "tmp_sgetn_2io.tst"; // empty file, need to create
 
index e79972af7b2d95dba55a2449be3502ea39eee218..0e5078c5a13b652415269dd5795d0e0d70c83a68 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "sgetc.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetc.txt"; // file with data in it
 const char name_02[] = "tmp_snextc_1out.tst"; // empty file, need to create
 const char name_03[] = "tmp_snextc_1io.tst"; // empty file, need to create
index a02aef40ccf7e082e76d8a9b9f23a1b65558fceb..974c661c4abb3fc51c6a6b2ebc874e3ff3202312 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "sgetc.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetc.txt"; // file with data in it
 const char name_02[] = "tmp_snextc_1out.tst"; // empty file, need to create
 const char name_03[] = "tmp_snextc_1io.tst"; // empty file, need to create
index b724f13c73b57a7d7869897a7df6fa0cd167e562..a61a77b96c2e339e1f6f0b13fd37d69e34e36be7 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
+
+// { dg-additional-files "sgetc.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetc.txt"; // file with data in it
 const char name_02[] = "tmp_snextc_1out.tst"; // empty file, need to create
 const char name_03[] = "tmp_snextc_1io.tst"; // empty file, need to create
index fa681efc83e170b0e8b193ac9c68e7db74c071cd..b2c754e5de3723c39594ed74eaa6333887a301fd 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "sgetc.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetc.txt"; // file with data in it
 
 void test05() 
index c264412c10399ed6266e58df3718337462d77433..0f62d465d4c34e38a701753d231d45fd3e982558 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "sgetc.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetc.txt"; // file with data in it
 const char name_03[] = "tmp_snextc_2io.tst"; // empty file, need to create
 
index c9e54caba81cd03c2b8d0c122c58df6792d2f514..642ed9e52f56ed701415f546cfb732a288ee6749 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "sgetc.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetc.txt"; // file with data in it
 
 // Test overloaded virtual functions.
index 684685dde741e05443d22f6e7e669e2483ca81ba..1e4325e79b7103b24bfeb079eb4bff5895d3c43a 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "sgetc.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetc.txt"; // file with data in it
 
 // Test overloaded virtual functions.
index bbd25a5e85e8c37463949628c8cc34889a1e364a..e76064dd592599c354f6cf194031bb495354624a 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
+
+// { dg-additional-files "filebuf_virtuals-1.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it
 
 void test05() 
index 7505076f97ce6c17520009e3d6d822909c6cf059..c0d423bf063bee4d8a9c13b2881fa2109e730cf0 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
+
+// { dg-additional-files "filebuf_virtuals-1.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it
 
 void test05() 
index 3125d52b42c584f2bcc0a49accdb8366a2cda71d..f182064ca1908bb9c451c79c59a0cb9cf47255cf 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "filebuf_virtuals-1.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it
 const char name_03[] = "tmp_sputc_2io.tst";
 
index dd951b040b4ad93f0a48a387cec02392a50b496e..fb9b181ad6c571387fc76b211ed7bd603bf9d0f9 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
+
+// { dg-additional-files "filebuf_virtuals-1.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it
 
 void test05() 
index c01aed976640b1d81bc87615ca542fe03f1b3928..125cde14fdb26c73db3b764234f1e2c4f04d7b28 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "filebuf_virtuals-1.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
-const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it
 const char name_03[] = "tmp_sputn_1io.tst"; // empty file, need to create
 
 void test05() 
index 6a008646fb35142bcb80112e6da620598f3deea5..da96056c2ce7040edad643a6a977dc60458be2e1 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.4 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
+
+// { dg-additional-files "filebuf_virtuals-1.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "filebuf_virtuals-1.txt"; // file with data in it
 
 void test05() 
index ff2f0fd742f76e99b11b741c1aa6b1778c747eb8..12bd7da3282d070b376c7176c624d3dbf93abba8 100644 (file)
@@ -25,8 +25,7 @@
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
+// { dg-additional-files "sgetc.txt" }
 
 const char name_01[] = "sgetc.txt"; // file with data in it
 
index af3ad03ef8a19dda4321ba58dd51012082831b00..9f34255b8ad910ecc34214f8bd19366177283c34 100644 (file)
 // 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "sgetc.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
 #include <testsuite_io.h>
 
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %*.txt
-
 const char name_01[] = "sgetc.txt"; // file with data in it
 
 // Test overloaded virtual functions.
index 2611caf54f99e516fd0d12643c896fb2cb0b385a..f2658aed8861acc7c60aee3b8fd6856ef1fb3f84 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.7 ifstream member functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
+// C++98 27.8.1.7 ifstream member functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "ifstream_members-1.tst" }
 
 #include <istream>
 #include <fstream>
index dcd16eddf608dc8f32190cd9d3240242c26d3eb9..c22de5305a73d7a11a4dcd9e8a18f6af7967d514 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.7 ifstream member functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
+// C++98 27.8.1.7 ifstream member functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "ifstream_members-1.tst" }
 
 #include <istream>
 #include <fstream>
index fac3275da67d824bdff257efe36142b0c34d14d2..3623da66dc20c62e17318f988211716c5e85f146 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.7 ifstream member functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
+// C++98 27.8.1.7 ifstream member functions
 
 #include <istream>
 #include <fstream>
 #include <testsuite_hooks.h>
 
-const char name_01[] = "ifstream_members-1.tst";
-const char name_02[] = "ifstream_members-1.txt";
-
 void 
 redirect_buffer(std::ios& stream, std::streambuf* new_buf) 
 { stream.rdbuf(new_buf); }
@@ -37,10 +32,6 @@ active_buffer(std::ios& stream)
 // libstdc++/2832
 void test03()
 {
-  const char* strlit01 = "fuck war";
-  const std::string str00;
-  const std::string str01(strlit01);
-  std::string str02;
   std::filebuf fbuf;
   std::streambuf* pbasebuf0 = &fbuf;
 
index 09cfc3aad0fb6ea79983fc9926db9a7a3acfbdd0..f18f60fa472980909b9eb637af93f1041b0b94bf 100644 (file)
 // causes "in_avail" to return an incorrect value.
 // { dg-do run { xfail arm*-*-elf arm*-*-eabi } }
 
-// 27.6.1.3 unformatted input functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
+// C++98 27.6.1.3 unformatted input functions
 
 // { dg-require-fileio "" }
 // { dg-require-binary-io "" }
+// { dg-additional-files "istream_unformatted-1.tst" }
 
 #include <istream>
 #include <fstream>
index d19cb211f4ef349648ee712287f9d493b31b463c..3acd5fe7b1bb3e0f6c542559bebdf095151609d6 100644 (file)
 
 // { dg-require-binary-io "" }
 // { dg-require-fileio "" }
+// { dg-additional-files "wistream_unformatted-1.tst" }
 
-// 27.6.1.3 unformatted input functions
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
+// C++98 27.6.1.3 unformatted input functions
 
 #include <istream>
 #include <fstream>
index 1f9967405d834370bb00f2d8b6335aecda17f6df..72379664e33dfca02bebafeb5e85caeaa23f6700 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.6.1.3 unformatted input functions
+// C++98 27.6.1.3 unformatted input functions
 // NB: ostream has a particular "seeks" category. Adopt this for istreams too.
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
 
 // { dg-require-fileio "" }
+// { dg-additional-files "istream_seeks-1.tst" }
 
 #include <istream>
 #include <sstream>
index da2e27e72a06ac603c088edef130efe72951c773..30a8a905b6e956c4043a64c377cf881c51df5232 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.6.1.3 unformatted input functions
+// C++98 27.6.1.3 unformatted input functions
 // NB: ostream has a particular "seeks" category. Adopt this for istreams too.
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
 
 // { dg-require-fileio "" }
+// { dg-additional-files "wistream_seeks-1.tst" }
 
 #include <istream>
 #include <sstream>
index e956ecf4e4a66638e105cd3945059c7e45346671..3ab92f9760ea1132cb1985c4a98553117b10b94e 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.6.1.3 unformatted input functions
+// C++98 27.6.1.3 unformatted input functions
 // NB: ostream has a particular "seeks" category. Adopt this for istreams too.
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
 
 // { dg-require-fileio "" }
+// { dg-additional-files "istream_seeks-1.tst" }
 
 #include <istream>
 #include <sstream>
index a45d0b59fb8416458bb197a81e8bc0c667a81402..6da59d0d1a15aeeb1c199d8547fafb086c115a34 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.6.1.3 unformatted input functions
+// C++98 27.6.1.3 unformatted input functions
 // NB: ostream has a particular "seeks" category. Adopt this for istreams too.
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
 
 // { dg-require-fileio "" }
+// { dg-additional-files "istream_seeks-1.tst" }
 
 #include <istream>
 #include <sstream>
index e2f076a03d119b7e9d1f9c3f432b00eab57c2c32..20b425cbbe0bc71407c894d3ca9a276f5d9006a7 100644 (file)
 // <http://www.gnu.org/licenses/>.
 
 // { dg-require-fileio "" }
+// { dg-additional-files "wistream_seeks-1.tst" }
 
-// 27.6.1.3 unformatted input functions
+// C++98 27.6.1.3 unformatted input functions
 // NB: ostream has a particular "seeks" category. Adopt this for istreams too.
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
 
 #include <istream>
 #include <sstream>
index b5d005c5342d40f676860b3ac80be364e4b94425..9118e683c358170e040a9f4b897c29b46fa4c5df 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.6.1.3 unformatted input functions
+// C++98 27.6.1.3 unformatted input functions
 // NB: ostream has a particular "seeks" category. Adopt this for istreams too.
-// @require@ %-*.tst %-*.txt
-// @diff@ %-*.tst %-*.txt
 
 // { dg-require-fileio "" }
+// { dg-additional-files "wistream_seeks-1.tst" }
 
 #include <istream>
 #include <sstream>
index b24ffe210cec85a4c83c7ca90af9f7b8932cf339..45227107cbd9c0eb0686f56ae1ec51ca25c6e79b 100644 (file)
@@ -15,8 +15,9 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.8.1.10 ofstream member functions
-// @require@ %-*.tst
+// C++98 27.8.1.10 ofstream member functions
+
+// { dg-additional-files "ofstream_members-1.tst" }
 // @diff@ %-*.tst %-*.txt
 
 // { dg-require-fileio "" }
index 0d77fb029b09b1777dd9732fd774c3bbd2da99fb..1d3160409f5a7b9fcb64c13911e07776247cefe9 100644 (file)
@@ -405,5 +405,5 @@ set v3_additional_files ""
 # Process a { dg-additional-files "filelist" } directive in the test.
 proc dg-additional-files { line filelist } {
     global v3_additional_files
-    set v3_additional_files $filelist
+    append v3_additional_files " " $filelist
 }
index 67a63f5b5f39f9003e62e9417a22a488493f1d34..8efc6f7f08997eaedad96e0d355386b3357720c8 100644 (file)
@@ -648,6 +648,7 @@ proc v3_target_compile { source dest type options } {
        global srcdir
        v3-copy-file "$srcdir/data/$file" $file
     }
+    set v3_additional_files {}
 
     set comp_output [target_compile $source $dest $type $options]
     if { $type == "executable" && $file_to_delete != "" } {