]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Use dg-additional-files in some I/O tests
authorJonathan Wakely <jwakely@redhat.com>
Mon, 22 Jul 2024 13:01:43 +0000 (14:01 +0100)
committerJonathan Wakely <redi@gcc.gnu.org>
Wed, 24 Jul 2024 11:25:25 +0000 (12:25 +0100)
Use the dg-additional-files directive to declare files that need to be
copied into the test's working directory. This is currently redundant
(as all .tst and .txt files are copied for all tests) but is a step
towards not copying all files.

libstdc++-v3/ChangeLog:

* testsuite/27_io/basic_filebuf/imbue/char/2.cc: Use
dg-additional-files.
* testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc: Likewise.
* testsuite/27_io/basic_filebuf/open/char/path.cc: Likewise.
* testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc:
Likewise.
* testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc: Likewise.
* testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc: Likewise.
* testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc: Likewise.
* testsuite/27_io/basic_filebuf/setbuf/char/1.cc: Likewise.
* testsuite/27_io/basic_filebuf/sgetn/char/3.cc: Likewise.
* testsuite/27_io/basic_filebuf/underflow/10096.cc: Likewise.
* testsuite/27_io/basic_fstream/cons/char/path.cc: Likewise.
* testsuite/27_io/basic_fstream/open/char/path.cc: Likewise.
* testsuite/27_io/basic_ifstream/assign/1.cc: Likewise.
* testsuite/27_io/basic_ifstream/cons/move.cc: Likewise.
* testsuite/27_io/basic_ifstream/cons/char/path.cc: Likewise.
* testsuite/27_io/basic_ifstream/open/char/path.cc: Likewise.
* testsuite/27_io/basic_ifstream/open/wchar_t/1.cc: Likewise.
* testsuite/27_io/objects/char/10.cc: Likewise.
* testsuite/27_io/objects/char/12048-1.cc: Likewise.
* testsuite/27_io/objects/char/12048-2.cc: Likewise.
* testsuite/27_io/objects/char/12048-3.cc: Likewise.
* testsuite/27_io/objects/char/12048-4.cc: Likewise.
* testsuite/27_io/objects/char/12048-5.cc: Likewise.
* testsuite/27_io/objects/wchar_t/12048-1.cc: Likewise.
* testsuite/27_io/objects/wchar_t/12048-2.cc: Likewise.
* testsuite/27_io/objects/wchar_t/12048-3.cc: Likewise.
* testsuite/27_io/objects/wchar_t/12048-4.cc: Likewise.
* testsuite/27_io/objects/wchar_t/12048-5.cc: Likewise.
* testsuite/ext/stdio_sync_filebuf/char/12048-1.cc: Likewise.
* testsuite/ext/stdio_sync_filebuf/char/12048-2.cc: Likewise.
* testsuite/ext/stdio_sync_filebuf/char/12048-3.cc: Likewise.
* testsuite/ext/stdio_sync_filebuf/char/12048-4.cc: Likewise.
* testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc: Likewise.
* testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc: Likewise.
* testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc: Likewise.
* testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc: Likewise.

37 files changed:
libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/path.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/3.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/10096.cc
libstdc++-v3/testsuite/27_io/basic_fstream/cons/char/path.cc
libstdc++-v3/testsuite/27_io/basic_fstream/open/char/path.cc
libstdc++-v3/testsuite/27_io/basic_ifstream/assign/1.cc
libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/path.cc
libstdc++-v3/testsuite/27_io/basic_ifstream/cons/move.cc
libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/path.cc
libstdc++-v3/testsuite/27_io/basic_ifstream/open/wchar_t/1.cc
libstdc++-v3/testsuite/27_io/objects/char/10.cc
libstdc++-v3/testsuite/27_io/objects/char/12048-1.cc
libstdc++-v3/testsuite/27_io/objects/char/12048-2.cc
libstdc++-v3/testsuite/27_io/objects/char/12048-3.cc
libstdc++-v3/testsuite/27_io/objects/char/12048-4.cc
libstdc++-v3/testsuite/27_io/objects/char/12048-5.cc
libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-1.cc
libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-2.cc
libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-3.cc
libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc
libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-5.cc
libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-1.cc
libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-2.cc
libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-3.cc
libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-4.cc
libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc
libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc
libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc
libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc

index aa2e15601786fcc621a86ca0aa31cba7e8d7d590..c76631666f4fde201c4bbdde4f9ec83b11c16916 100644 (file)
@@ -19,7 +19,9 @@
 // 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 <locale>
index 92faee0766d064d1d4769c31956f2ddc9fdd1af5..ad119deb33ff8536abb7a76efe1397122f4edb3c 100644 (file)
@@ -1,4 +1,5 @@
 // { dg-require-namedlocale "de_DE.ISO8859-15" }
+// { dg-additional-files "filebuf_virtuals-1.txt" }
 
 // 2003-05-13 Benjamin Kosnik  <bkoz@redhat.com>
 
index 0df22f2a47e9110af321b561a28451ed556d58aa..81e15e289b470a9daeb6bd577a1525c85e234de5 100644 (file)
@@ -19,6 +19,7 @@
 // { dg-do run { target c++17 } }
 // { dg-require-fileio "" }
 // { dg-require-filesystem-ts "" }
+// { dg-additional-files "filebuf_members-1.tst" }
 
 #include <fstream>
 #include <filesystem>
index e074bd8899b7f6486e85adf06e10b4df7be6bfe6..e02a004a5067eeb7e424874889deaa39e9868ccc 100644 (file)
@@ -20,6 +20,7 @@
 // 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "filebuf_virtuals-1.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
index 6ca42a2dbdf2167788708eb6ad663eb70edf0787..6403a8e643cb92858ffaf482fc88e604ddefb89f 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.7.1.3 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "filebuf_virtuals-1.tst filebuf_members-1.tst" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
index 853eec405da49c744753a7fcd37bb07f2f698e54..2cea0145d1ae0c1262d7cf6da3552ddab8f1c0c0 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 27.7.1.3 Overridden virtual functions
+// C++98 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "filebuf_virtuals-1.tst filebuf_members-1.tst" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
index 4124dd84fc58d82824c0878de546a835ddeac67d..b91845476a8fb28bceaa587f0168324abed4c97c 100644 (file)
@@ -20,6 +20,7 @@
 // 27.7.1.3 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "filebuf_virtuals-1.tst filebuf_members-1.tst" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
index f4bf73f46e4cb7ba16567ab6394fad8e72346e4d..c89f9bccec1885230389df2e2ead1a0aed8deea2 100644 (file)
@@ -20,6 +20,7 @@
 // 27.7.1.3 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "filebuf_virtuals-1.tst filebuf_members-1.tst" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
index 7b77394cfafa9cc5ba6ad0b178cbbafb8b4bac2f..ca60379ef1f6fda15a4c156349613ca83e2be695 100644 (file)
@@ -20,6 +20,7 @@
 // 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "filebuf_virtuals-1.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
index 699875c5dd973097958deddc8f265a13e0503165..cf5c7c8bd4d9235c297e404b2a3086e41a4f2404 100644 (file)
@@ -20,6 +20,7 @@
 // 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "sgetn.txt" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
index b7a9d4d644a4bcf10c3e6b7e5c8b8cb594af1a5a..02b4ab655904c707a24474d58642aba3c4ae53c8 100644 (file)
@@ -20,6 +20,7 @@
 // 27.8.1.4 Overridden virtual functions
 
 // { dg-require-fileio "" }
+// { dg-additional-files "filebuf_virtuals-1.txt" }
 
 #include <fstream>
 #include <string>
index 7fdcd2b4461e100c95ad35cedff57c630b65c5ed..9f2865ff572f44a0b30a6ef8f2213ee937302571 100644 (file)
@@ -19,6 +19,7 @@
 // { dg-do run { target c++17 } }
 // { dg-require-fileio "" }
 // { dg-require-filesystem-ts "" }
+// { dg-additional-files "ofstream_members-1.tst" }
 
 #include <fstream>
 #include <filesystem>
index 141e614d8d179dd57681ecf9fbf3d0f07a74cf90..01b149418b4a8214420cfea0beff1af957b77e3e 100644 (file)
@@ -19,6 +19,7 @@
 // { dg-do run { target c++17 } }
 // { dg-require-fileio "" }
 // { dg-require-filesystem-ts "" }
+// { dg-additional-files "filebuf_members-1.tst" }
 
 #include <fstream>
 #include <filesystem>
index e6b71b919f2ab6781b00bc4423898a0e3c49fdd9..210a0870ef073a40c2667faf6d2ef2776c12ccdb 100644 (file)
@@ -17,8 +17,9 @@
 
 // { dg-do run { target c++11 } }
 // { dg-require-fileio "" }
+// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" }
 
-// 27.9.1.8 Assign and swap [ifstream.assign]
+// C++11 27.9.1.8 Assign and swap [ifstream.assign]
 
 #include <fstream>
 #include <sstream>
index bf3ebed1e077d3343ccafffd2a24a6d1f060041a..060c2c8bcf3a85889b85b1e9e0f35ddcd816a6c3 100644 (file)
@@ -19,6 +19,7 @@
 // { dg-do run { target c++17 } }
 // { dg-require-fileio "" }
 // { dg-require-filesystem-ts "" }
+// { dg-additional-files "ifstream_members-1.tst" }
 
 #include <fstream>
 #include <filesystem>
index 228965edfae6a8706627c98a3d19b58da1ebbd05..38cdb6494a300935670ec5f4ac0e4d3235100302 100644 (file)
@@ -17,8 +17,9 @@
 
 // { dg-do run { target c++11 } }
 // { dg-require-fileio "" }
+// { dg-additional-files "thirty_years_among_the_dead_preproc.txt" }
 
-// 27.9.1.7 basic_ifstream constructors [ifstream.cons]
+// C++11 27.9.1.7 basic_ifstream constructors [ifstream.cons]
 
 #include <fstream>
 #include <sstream>
index d58063e3d20040b07a724d459b49f31c8e644136..76a3a3d7fb96764693057eea00118ebd9d437258 100644 (file)
@@ -19,6 +19,7 @@
 // { dg-do run { target c++17 } }
 // { dg-require-fileio "" }
 // { dg-require-filesystem-ts "" }
+// { dg-additional-files "filebuf_members-1.tst" }
 
 #include <fstream>
 #include <filesystem>
index 243f732c859af7b61a1e1fa82a834d3a22b1950c..097d33b2a1e7cb774168d4d30cbaa1a10b811567 100644 (file)
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
-// 30.9.3.1 basic_ifstream constructors [ifstream.cons]
+// C++17 30.9.3.1 basic_ifstream constructors [ifstream.cons]
 
 // { dg-do run { target *-*-mingw* } }
 // { dg-require-fileio "" }
+// { dg-additional-files "ifstream_members-1.tst" }
 
 #include <fstream>
 #include <testsuite_hooks.h>
index 3f30c9939e854ca5a07dc601ac2db0cecae4ea90..726a933aafe9aabc2787c20124995f575e52d9a9 100644 (file)
@@ -19,6 +19,7 @@
  
 // { dg-require-fileio "" }
 // { dg-require-binary-io "" }
+// { dg-additional-files "filebuf_virtuals-1.txt" }
 
 #include <iostream>
 #include <cstdio>
index 4ee3a1942a36dda42696de41dd4164d5eb3b21fb..2d1ae04500db7e52db41a4cf4c64c10de79b9fd4 100644 (file)
@@ -19,6 +19,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
 
 #include <iostream>
 #include <cstdio>
index d6a656cbb20f57f4b3742809075eea622704de9a..c0ae079e7fcbf109802932cfe8c9e0c137671917 100644 (file)
@@ -16,6 +16,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
 
 #include <iostream>
 #include <cstdio>
index 4d2dcfa89024786eb93b2f387750f2392ceba64a..8a10428c124371eaed2315c23e0a7e8b316f3c83 100644 (file)
@@ -16,6 +16,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
 
 #include <iostream>
 #include <cstdio>
index 7cabf83d82db9dab7517c1bb1f9708edb99f8bba..4daa30fd02000277f7c7ff878f6dfc51166f6423 100644 (file)
@@ -16,6 +16,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
 
 #include <iostream>
 #include <cstdio>
index 7ddd97baef9a20930359d67c1bc2f8105e4f31fe..f579e91d3ab47ad7e73a4df9b5bcb50c9da5ca30 100644 (file)
@@ -24,6 +24,7 @@
 
 // { dg-do run { xfail *-*-* } }
 // { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
 
 #include <iostream>
 #include <cstdio>
index 156bb01163be63a0ad5ece8088e1570f040a141e..434a85ded7580e9639002eb4d0bc61a4f384d0e8 100644 (file)
@@ -19,6 +19,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
 
 #include <iostream>
 #include <cstdio>
index d7ef6577db5da2af2c3a09a179cd89d9970ce048..6d1033c4054ad17496f718cff5af0ad3f6f91e32 100644 (file)
@@ -16,6 +16,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
 
 #include <iostream>
 #include <cstdio>
index 5a97b2e43589acac1398293093e6d21a4223d0b5..f38457be7bcb9bbdb05e6fc1e3b0f939cfc89242 100644 (file)
@@ -19,6 +19,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
 
 #include <iostream>
 #include <cwchar>
index 7b9a99be95332eafdfa91089426fb310adcd06fc..58e163558872ea5b118b8cc7d43d43a6b4956794 100644 (file)
@@ -16,6 +16,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
 
 #include <iostream>
 #include <cstdio>
index 13cd1061ef934a20ee0f2dc2cf151711c3e7a6c6..7efe4a2c6ef42631baf464ef83677c83b9b2b577 100644 (file)
@@ -21,6 +21,7 @@
 
 // { dg-do run { xfail *-*-* } }
 // { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
 
 #include <iostream>
 #include <cstdio>
index abef61fa11bf366b3b58fecf340ea1e61b80cf42..ec57eaf8a8cf44423260c198f92534b2a405a270 100644 (file)
@@ -18,6 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
 
 #include <ext/stdio_sync_filebuf.h>
 #include <testsuite_hooks.h>
index 058b393814e46bc4d36465d7330a069adae49f6b..91db50b8ed5c384f65a4516aa6f1db84f4a896d0 100644 (file)
@@ -18,6 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
 
 #include <ext/stdio_sync_filebuf.h>
 #include <testsuite_hooks.h>
index d3b89185bb0e172047e1da8a8d51b6881ab038a7..e2f3100a22ab03a28d3207be3250029eca92572a 100644 (file)
@@ -18,6 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
 
 #include <ext/stdio_sync_filebuf.h>
 #include <testsuite_hooks.h>
index e6076a93af2c5ef5ddbcb60beb8e0dce769f6f72..72889fbd9b5a89ecc22c55649e29d3a86b4aae66 100644 (file)
@@ -18,6 +18,7 @@
 // <http://www.gnu.org/licenses/>.
 
 // { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
 
 #include <ext/stdio_sync_filebuf.h>
 #include <testsuite_hooks.h>
index 78248942c72d8adbca947f3706b9c53c614fde3b..e71aee29cf2ab1ec9073b9cac8126b893cf17d44 100644 (file)
@@ -17,6 +17,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
+// { dg-additional-files "cin_unget-1.txt" }
+
 #include <ext/stdio_sync_filebuf.h>
 #include <testsuite_hooks.h>
 
index 1be110eec6bdafa49970dc4d9eb09154ec8e95cc..529353787e97658335515f1ad756c8c7d2048d35 100644 (file)
@@ -20,6 +20,8 @@
 #include <ext/stdio_sync_filebuf.h>
 #include <testsuite_hooks.h>
 
+// { dg-additional-files "cin_unget-1.txt" }
+
 // libstdc++/12048
 void test03()
 {
index 51639d313c10d1d85dbea1a312c78eda55b04db4..8274350b0e07fe34a613e436f9bff4114fe8a3d0 100644 (file)
@@ -17,6 +17,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
+// { dg-additional-files "cin_unget-1.txt" }
+
 #include <ext/stdio_sync_filebuf.h>
 #include <testsuite_hooks.h>
 
index 2362251eeaf45f32c8c1366eb38bd237a34c5e0e..7989edc0c3f7f0be0688a9a2054c34600372ac5b 100644 (file)
@@ -17,6 +17,8 @@
 // with this library; see the file COPYING3.  If not see
 // <http://www.gnu.org/licenses/>.
 
+// { dg-additional-files "cin_unget-1.txt" }
+
 #include <ext/stdio_sync_filebuf.h>
 #include <testsuite_hooks.h>