aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2024-07-22 14:01:43 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2024-07-24 12:25:25 +0100
commit687dc787d7523c46a9b5e1e9ac1062e44693dd3a (patch)
tree76f5478819b86ed6401060de84b44e9f227b3e66
parentdfd07532693c7df9e15920b7607672382122b38c (diff)
downloadgcc-687dc787d7523c46a9b5e1e9ac1062e44693dd3a.zip
gcc-687dc787d7523c46a9b5e1e9ac1062e44693dd3a.tar.gz
gcc-687dc787d7523c46a9b5e1e9ac1062e44693dd3a.tar.bz2
libstdc++: Use dg-additional-files in some I/O tests
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.
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc4
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/path.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc3
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc3
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/3.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/10096.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_fstream/cons/char/path.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_fstream/open/char/path.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_ifstream/assign/1.cc3
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/path.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_ifstream/cons/move.cc3
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/path.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/basic_ifstream/open/wchar_t/1.cc3
-rw-r--r--libstdc++-v3/testsuite/27_io/objects/char/10.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/objects/char/12048-1.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/objects/char/12048-2.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/objects/char/12048-3.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/objects/char/12048-4.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/objects/char/12048-5.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-1.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-2.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-3.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc1
-rw-r--r--libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-5.cc1
-rw-r--r--libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-1.cc1
-rw-r--r--libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-2.cc1
-rw-r--r--libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-3.cc1
-rw-r--r--libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-4.cc1
-rw-r--r--libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc2
-rw-r--r--libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc2
-rw-r--r--libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc2
-rw-r--r--libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc2
37 files changed, 48 insertions, 6 deletions
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc
index aa2e156..c766316 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/char/2.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc
index 92faee0..ad119de 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/imbue/wchar_t/2.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/path.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/path.cc
index 0df22f2..81e15e2 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/path.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/open/char/path.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc
index e074bd8..e02a004 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/pbackfail/char/9761.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc
index 6ca42a2..6403a8e 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-in.cc
@@ -17,9 +17,10 @@
// 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>
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc
index 853eec4..2cea014 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/char/3-io.cc
@@ -17,9 +17,10 @@
// 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>
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc
index 4124dd8..b918454 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-in.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc
index f4bf73f..c89f9bc 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/char/3-io.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc
index 7b77394..ca60379 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/setbuf/char/1.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/3.cc
index 699875c..cf5c7c8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/3.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/sgetn/char/3.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/10096.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/10096.cc
index b7a9d4d..02b4ab6 100644
--- a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/10096.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/10096.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/27_io/basic_fstream/cons/char/path.cc b/libstdc++-v3/testsuite/27_io/basic_fstream/cons/char/path.cc
index 7fdcd2b..9f2865f 100644
--- a/libstdc++-v3/testsuite/27_io/basic_fstream/cons/char/path.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_fstream/cons/char/path.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/27_io/basic_fstream/open/char/path.cc b/libstdc++-v3/testsuite/27_io/basic_fstream/open/char/path.cc
index 141e614..01b1494 100644
--- a/libstdc++-v3/testsuite/27_io/basic_fstream/open/char/path.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_fstream/open/char/path.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/assign/1.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/assign/1.cc
index e6b71b91..210a087 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ifstream/assign/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/assign/1.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/path.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/path.cc
index bf3ebed..060c2c8 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/path.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/char/path.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/move.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/move.cc
index 228965e..38cdb64 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/move.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/cons/move.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/path.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/path.cc
index d58063e..76a3a3d 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/path.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/open/char/path.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/27_io/basic_ifstream/open/wchar_t/1.cc b/libstdc++-v3/testsuite/27_io/basic_ifstream/open/wchar_t/1.cc
index 243f732..097d33b 100644
--- a/libstdc++-v3/testsuite/27_io/basic_ifstream/open/wchar_t/1.cc
+++ b/libstdc++-v3/testsuite/27_io/basic_ifstream/open/wchar_t/1.cc
@@ -15,10 +15,11 @@
// 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>
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/10.cc b/libstdc++-v3/testsuite/27_io/objects/char/10.cc
index 3f30c99..726a933 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/10.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/10.cc
@@ -19,6 +19,7 @@
// { dg-require-fileio "" }
// { dg-require-binary-io "" }
+// { dg-additional-files "filebuf_virtuals-1.txt" }
#include <iostream>
#include <cstdio>
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/12048-1.cc b/libstdc++-v3/testsuite/27_io/objects/char/12048-1.cc
index 4ee3a19..2d1ae04 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/12048-1.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/12048-1.cc
@@ -19,6 +19,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
#include <iostream>
#include <cstdio>
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/12048-2.cc b/libstdc++-v3/testsuite/27_io/objects/char/12048-2.cc
index d6a656c..c0ae079 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/12048-2.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/12048-2.cc
@@ -16,6 +16,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
#include <iostream>
#include <cstdio>
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/12048-3.cc b/libstdc++-v3/testsuite/27_io/objects/char/12048-3.cc
index 4d2dcfa..8a10428 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/12048-3.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/12048-3.cc
@@ -16,6 +16,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
#include <iostream>
#include <cstdio>
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/12048-4.cc b/libstdc++-v3/testsuite/27_io/objects/char/12048-4.cc
index 7cabf83..4daa30f 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/12048-4.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/12048-4.cc
@@ -16,6 +16,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
#include <iostream>
#include <cstdio>
diff --git a/libstdc++-v3/testsuite/27_io/objects/char/12048-5.cc b/libstdc++-v3/testsuite/27_io/objects/char/12048-5.cc
index 7ddd97b..f579e91 100644
--- a/libstdc++-v3/testsuite/27_io/objects/char/12048-5.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/char/12048-5.cc
@@ -24,6 +24,7 @@
// { dg-do run { xfail *-*-* } }
// { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
#include <iostream>
#include <cstdio>
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-1.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-1.cc
index 156bb011..434a85d 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-1.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-1.cc
@@ -19,6 +19,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
#include <iostream>
#include <cstdio>
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-2.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-2.cc
index d7ef657..6d1033c 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-2.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-2.cc
@@ -16,6 +16,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
#include <iostream>
#include <cstdio>
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-3.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-3.cc
index 5a97b2e..f38457b 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-3.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-3.cc
@@ -19,6 +19,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
#include <iostream>
#include <cwchar>
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc
index 7b9a99b..58e1635 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc
@@ -16,6 +16,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
#include <iostream>
#include <cstdio>
diff --git a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-5.cc b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-5.cc
index 13cd106..7efe4a2 100644
--- a/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-5.cc
+++ b/libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-5.cc
@@ -21,6 +21,7 @@
// { dg-do run { xfail *-*-* } }
// { dg-require-fileio "" }
+// { dg-additional-files "cin_unget-1.txt" }
#include <iostream>
#include <cstdio>
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-1.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-1.cc
index abef61f..ec57eaf 100644
--- a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-1.cc
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-1.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-2.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-2.cc
index 058b393..91db50b 100644
--- a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-2.cc
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-2.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-3.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-3.cc
index d3b8918..e2f3100 100644
--- a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-3.cc
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-3.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-4.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-4.cc
index e6076a9..72889fb 100644
--- a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-4.cc
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/char/12048-4.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc
index 7824894..e71aee2 100644
--- a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-1.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc
index 1be110e..5293537 100644
--- a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-2.cc
@@ -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()
{
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc
index 51639d3..8274350 100644
--- a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-3.cc
@@ -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>
diff --git a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc
index 2362251..7989edc 100644
--- a/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc
+++ b/libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/12948-4.cc
@@ -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>