* [testsuite] Add dg-require-fileio to some libstdc++ wchar_t tests
@ 2018-08-31 1:20 Sandra Loosemore
2018-08-31 11:09 ` Jonathan Wakely
0 siblings, 1 reply; 2+ messages in thread
From: Sandra Loosemore @ 2018-08-31 1:20 UTC (permalink / raw)
To: gcc-patches, libstdc++
[-- Attachment #1: Type: text/plain, Size: 917 bytes --]
One of the simulators we use for testing nios2-elf builds doesn't
include full semihosted fileio support. (IIRC it can do I/O to the
console and open and close files, but doesn't support fseek, stat/fstat,
unlink, etc). There are a bunch of libstdc++ wchar_t/$test.cc test
cases that fail on this target where the corresponding char/$test.cc
test is skipped, because the char test case files already specify
"dg-require-fileio" and the wchar_t ones don't.
I used grep etc to find all such pairs of test cases, and then added
"dg-require-fileio" to the wchar_t files where it was missing. Note
that this patch touches more test cases than the ones that were actually
failing, and I didn't confirm that all the similarly-named char and
wchar_t files were actually testing the exact same things.
Is this OK to check in? Or is some deeper analysis required to identify
which tests are affected?
-Sandra
[-- Attachment #2: testsuite2.log --]
[-- Type: text/x-log, Size: 2894 bytes --]
2018-08-30 Sandra Loosemore <sandra@codesourcery.com>
libstdc++-v3/
* testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc:
Add dg-require-fileio.
* testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc:
Likewise.
* testsuite/21_strings/basic_string/inserters_extractors/wchar_t/5.cc:
Likewise.
* testsuite/21_strings/basic_string_view/inserters/wchar_t/2.cc:
Likewise.
* testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc:
Likewise.
* testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc:
Likewise.
* testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc: Likewise.
* testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc: Likewise.
* testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc: Likewise.
* testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc: Likewise.
* testsuite/27_io/basic_filebuf/seekoff/wchar_t/11543.cc: Likewise.
* testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc:
Likewise.
* testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc:
Likewise.
* testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc:
Likewise.
* testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc:
Likewise.
* testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc:
Likewise.
* testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc:
Likewise.
* testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc:
Likewise.
* testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc: Likewise.
* testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc: Likewise.
* testsuite/27_io/basic_ifstream/cons/wchar_t/1.cc: Likewise.
* testsuite/27_io/basic_ifstream/open/wchar_t/1.cc: Likewise.
* testsuite/27_io/basic_istream/extractors_character/wchar_t/4.cc:
Likewise.
* testsuite/27_io/basic_istream/extractors_other/wchar_t/2.cc:
Likewise.
* testsuite/27_io/basic_istream/get/wchar_t/2.cc: Likewise.
* testsuite/27_io/basic_istream/getline/wchar_t/5.cc: Likewise.
* testsuite/27_io/basic_istream/ignore/wchar_t/2.cc: Likewise.
* testsuite/27_io/basic_istream/ignore/wchar_t/3.cc: Likewise.
* testsuite/27_io/basic_istream/seekg/wchar_t/sstream.cc: Likewise.
* testsuite/27_io/basic_istream/tellg/wchar_t/sstream.cc: Likewise.
* testsuite/27_io/basic_ofstream/cons/wchar_t/1.cc: Likewise.
* testsuite/27_io/basic_ofstream/open/wchar_t/1.cc: Likewise.
* testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc:
Likewise.
* testsuite/27_io/objects/wchar_t/10.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/experimental/string_view/inserters/wchar_t/2.cc:
Likewise.
* testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc: Likewise.
[-- Attachment #3: testsuite2.patch --]
[-- Type: text/x-patch, Size: 20272 bytes --]
Index: libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc
===================================================================
--- libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc (revision 264000)
+++ libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/10.cc (working copy)
@@ -18,6 +18,7 @@
// 21.3.7.9 inserters and extractors
// { dg-options "-DMAX_SIZE=505" { target simulator } }
+// { dg-require-fileio "" }
#ifndef MAX_SIZE
#define MAX_SIZE 777
Index: libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc
===================================================================
--- libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc (revision 264000)
+++ libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/11.cc (working copy)
@@ -18,6 +18,7 @@
// 21.3.7.9 inserters and extractors
// { dg-options "-DMAX_SIZE=466" { target simulator } }
+// { dg-require-fileio "" }
#ifndef MAX_SIZE
#define MAX_SIZE 666
Index: libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/5.cc
===================================================================
--- libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/5.cc (revision 264000)
+++ libstdc++-v3/testsuite/21_strings/basic_string/inserters_extractors/wchar_t/5.cc (working copy)
@@ -23,6 +23,8 @@
// working, not to mention other major details like char_traits, and
// all of the string class.
+// { dg-require-fileio "" }
+
#include <string>
#include <fstream>
#include <iostream>
Index: libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/wchar_t/2.cc
===================================================================
--- libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/wchar_t/2.cc (revision 264000)
+++ libstdc++-v3/testsuite/21_strings/basic_string_view/inserters/wchar_t/2.cc (working copy)
@@ -1,4 +1,5 @@
// { dg-options "-std=gnu++17" }
+// { dg-require-fileio "" }
// Copyright (C) 2013-2018 Free Software Foundation, Inc.
//
Index: libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc
===================================================================
--- libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc (revision 264000)
+++ libstdc++-v3/testsuite/25_algorithms/copy/streambuf_iterators/wchar_t/4.cc (working copy)
@@ -17,6 +17,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
+// { dg-require-fileio "" }
+
#include <iterator>
#include <fstream>
#include <algorithm>
Index: libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc
===================================================================
--- libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc (revision 264000)
+++ libstdc++-v3/testsuite/25_algorithms/find/istreambuf_iterators/wchar_t/2.cc (working copy)
@@ -17,6 +17,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
+// { dg-require-fileio "" }
+
#include <iterator>
#include <fstream>
#include <algorithm>
Index: libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-1.cc (working copy)
@@ -17,6 +17,8 @@
// 27.8.1.3 filebuf member functions
+// { dg-require-fileio "" }
+
#include <locale>
#include <fstream>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-2.cc (working copy)
@@ -17,6 +17,8 @@
// 27.8.1.3 filebuf member functions
+// { dg-require-fileio "" }
+
#include <locale>
#include <fstream>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-3.cc (working copy)
@@ -17,6 +17,8 @@
// 27.8.1.3 filebuf member functions
+// { dg-require-fileio "" }
+
#include <locale>
#include <fstream>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/close/wchar_t/12790-4.cc (working copy)
@@ -17,6 +17,8 @@
// 27.8.1.3 filebuf member functions
+// { dg-require-fileio "" }
+
#include <locale>
#include <fstream>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/11543.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/11543.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/11543.cc (working copy)
@@ -17,6 +17,8 @@
// 27.8.1.4 Overridden virtual functions
+// { dg-require-fileio "" }
+
#include <fstream>
#include <locale>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-1.cc (working copy)
@@ -17,6 +17,8 @@
// 27.8.1.4 Overridden virtual functions
+// { dg-require-fileio "" }
+
#include <locale>
#include <fstream>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-2.cc (working copy)
@@ -17,6 +17,8 @@
// 27.8.1.4 Overridden virtual functions
+// { dg-require-fileio "" }
+
#include <locale>
#include <fstream>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-3.cc (working copy)
@@ -17,6 +17,8 @@
// 27.8.1.4 Overridden virtual functions
+// { dg-require-fileio "" }
+
#include <locale>
#include <fstream>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/seekoff/wchar_t/12790-4.cc (working copy)
@@ -17,6 +17,8 @@
// 27.8.1.4 Overridden virtual functions
+// { dg-require-fileio "" }
+
#include <locale>
#include <fstream>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-1.cc (working copy)
@@ -17,6 +17,8 @@
// 27.8.1.4 Overridden virtual functions
+// { dg-require-fileio "" }
+
#include <locale>
#include <fstream>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-2.cc (working copy)
@@ -17,6 +17,8 @@
// 27.8.1.4 Overridden virtual functions
+// { dg-require-fileio "" }
+
#include <locale>
#include <fstream>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/seekpos/wchar_t/12790-4.cc (working copy)
@@ -17,6 +17,8 @@
// 27.8.1.4 Overridden virtual functions
+// { dg-require-fileio "" }
+
#include <locale>
#include <fstream>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc (working copy)
@@ -1,4 +1,5 @@
// { dg-require-namedlocale "se_NO.UTF-8" }
+// { dg-require-fileio "" }
// 2003-09-04 Petur Runolfsson <peturr02@ru.is>
Index: libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc (working copy)
@@ -1,4 +1,5 @@
// { dg-require-namedlocale "se_NO.UTF-8" }
+// { dg-require-fileio "" }
// 2003-09-04 Petur Runolfsson <peturr02@ru.is>
Index: libstdc++-v3/testsuite/27_io/basic_ifstream/cons/wchar_t/1.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_ifstream/cons/wchar_t/1.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_ifstream/cons/wchar_t/1.cc (working copy)
@@ -16,6 +16,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-do run { target *-*-mingw* } }
+// { dg-require-fileio "" }
#include <fstream>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/basic_ifstream/open/wchar_t/1.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_ifstream/open/wchar_t/1.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_ifstream/open/wchar_t/1.cc (working copy)
@@ -18,6 +18,7 @@
// 30.9.3.1 basic_ifstream constructors [ifstream.cons]
// { dg-do run { target *-*-mingw* } }
+// { dg-require-fileio "" }
#include <fstream>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/4.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/4.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_istream/extractors_character/wchar_t/4.cc (working copy)
@@ -20,6 +20,7 @@
// 27.6.1.2.3 basic_istream::operator>>
// { dg-options "-DMAX_SIZE=466" { target simulator } }
+// { dg-require-fileio "" }
#ifndef MAX_SIZE
#define MAX_SIZE 666
Index: libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/2.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/2.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_istream/extractors_other/wchar_t/2.cc (working copy)
@@ -19,6 +19,8 @@
// @require@ %-*.tst %-*.txt
// @diff@ %-*.tst %-*.txt
+// { dg-require-fileio "" }
+
#include <istream>
#include <fstream>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/2.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/2.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_istream/get/wchar_t/2.cc (working copy)
@@ -19,6 +19,8 @@
// @require@ %-*.tst %-*.txt
// @diff@ %-*.tst %-*.txt
+// { dg-require-fileio "" }
+
#include <istream>
#include <sstream>
#include <fstream>
Index: libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/5.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/5.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_istream/getline/wchar_t/5.cc (working copy)
@@ -18,6 +18,7 @@
// 27.6.1.3 unformatted input functions
// { dg-options "-DMAX_LENGTH=7" { target simulator } }
+// { dg-require-fileio "" }
#ifndef MAX_LENGTH
#define MAX_LENGTH 777
Index: libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/2.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/2.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/2.cc (working copy)
@@ -18,6 +18,7 @@
// 27.6.1.3 unformatted input functions
// { dg-options "-DMAX_SIZE=355" { target simulator } }
+// { dg-require-fileio "" }
#ifndef MAX_SIZE
#define MAX_SIZE 555
Index: libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/3.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/3.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/3.cc (working copy)
@@ -19,6 +19,8 @@
// @require@ %-*.tst %-*.txt
// @diff@ %-*.tst %-*.txt
+// { dg-require-fileio "" }
+
#include <istream>
#include <fstream>
#include <limits>
Index: libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/sstream.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/sstream.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_istream/seekg/wchar_t/sstream.cc (working copy)
@@ -22,6 +22,8 @@
// @require@ %-*.tst %-*.txt
// @diff@ %-*.tst %-*.txt
+// { dg-require-fileio "" }
+
#include <istream>
#include <sstream>
#include <fstream>
Index: libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/sstream.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/sstream.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_istream/tellg/wchar_t/sstream.cc (working copy)
@@ -20,6 +20,8 @@
// @require@ %-*.tst %-*.txt
// @diff@ %-*.tst %-*.txt
+// { dg-require-fileio "" }
+
#include <istream>
#include <sstream>
#include <fstream>
Index: libstdc++-v3/testsuite/27_io/basic_ofstream/cons/wchar_t/1.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_ofstream/cons/wchar_t/1.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_ofstream/cons/wchar_t/1.cc (working copy)
@@ -16,6 +16,7 @@
// <http://www.gnu.org/licenses/>.
// { dg-do run { target *-*-mingw* } }
+// { dg-require-fileio "" }
#include <fstream>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/basic_ofstream/open/wchar_t/1.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_ofstream/open/wchar_t/1.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_ofstream/open/wchar_t/1.cc (working copy)
@@ -18,6 +18,7 @@
// 30.9.4.1 basic_ofstream constructors [ofstream.cons]
// { dg-do run { target *-*-mingw* } }
+// { dg-require-fileio "" }
#include <fstream>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/basic_ostream/inserters_other/wchar_t/1.cc (working copy)
@@ -19,6 +19,8 @@
// @require@ %-*.tst %-*.txt
// @diff@ %-*.tst %-*.txt
+// { dg-require-fileio "" }
+
#include <ostream>
#include <sstream>
#include <fstream>
Index: libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc (working copy)
@@ -1,4 +1,5 @@
// { dg-require-namedlocale "se_NO.UTF-8" }
+// { dg-require-fileio "" }
// 2003-05-01 Petur Runolfsson <peturr02@ru.is>
Index: libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-1.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-1.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-1.cc (working copy)
@@ -18,6 +18,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
+// { dg-require-fileio "" }
+
#include <iostream>
#include <cstdio>
#include <testsuite_hooks.h>
Index: libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-2.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-2.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-2.cc (working copy)
@@ -15,6 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
+// { dg-require-fileio "" }
+
#include <iostream>
#include <cstdio>
#include <cwchar>
Index: libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-3.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-3.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-3.cc (working copy)
@@ -18,6 +18,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
+// { dg-require-fileio "" }
+
#include <iostream>
#include <cwchar>
#include <cstdio>
Index: libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-4.cc (working copy)
@@ -15,6 +15,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
+// { dg-require-fileio "" }
+
#include <iostream>
#include <cstdio>
#include <cwchar>
Index: libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-5.cc
===================================================================
--- libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-5.cc (revision 264000)
+++ libstdc++-v3/testsuite/27_io/objects/wchar_t/12048-5.cc (working copy)
@@ -20,6 +20,7 @@
// only returns characters that were read with cin.rdbuf()->sbumpc()
// { dg-do run { xfail *-*-* } }
+// { dg-require-fileio "" }
#include <iostream>
#include <cstdio>
Index: libstdc++-v3/testsuite/experimental/string_view/inserters/wchar_t/2.cc
===================================================================
--- libstdc++-v3/testsuite/experimental/string_view/inserters/wchar_t/2.cc (revision 264000)
+++ libstdc++-v3/testsuite/experimental/string_view/inserters/wchar_t/2.cc (working copy)
@@ -1,4 +1,5 @@
// { dg-do run { target c++14 } }
+// { dg-require-fileio "" }
// Copyright (C) 2013-2018 Free Software Foundation, Inc.
//
Index: libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc
===================================================================
--- libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc (revision 264000)
+++ libstdc++-v3/testsuite/ext/stdio_sync_filebuf/wchar_t/1.cc (working copy)
@@ -17,6 +17,8 @@
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
+// { dg-require-fileio "" }
+
#include <ext/stdio_sync_filebuf.h>
#include <cstring>
#include <testsuite_hooks.h>
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [testsuite] Add dg-require-fileio to some libstdc++ wchar_t tests
2018-08-31 1:20 [testsuite] Add dg-require-fileio to some libstdc++ wchar_t tests Sandra Loosemore
@ 2018-08-31 11:09 ` Jonathan Wakely
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Wakely @ 2018-08-31 11:09 UTC (permalink / raw)
To: Sandra Loosemore; +Cc: gcc-patches, libstdc++
On 30/08/18 19:19 -0600, Sandra Loosemore wrote:
>One of the simulators we use for testing nios2-elf builds doesn't
>include full semihosted fileio support. (IIRC it can do I/O to the
>console and open and close files, but doesn't support fseek,
>stat/fstat, unlink, etc). There are a bunch of libstdc++
>wchar_t/$test.cc test cases that fail on this target where the
>corresponding char/$test.cc test is skipped, because the char test
>case files already specify "dg-require-fileio" and the wchar_t ones
>don't.
>
>I used grep etc to find all such pairs of test cases, and then added
>"dg-require-fileio" to the wchar_t files where it was missing. Note
>that this patch touches more test cases than the ones that were
>actually failing,
Three of them use dg-require-namedlocale to only run when localedata
for a specific locale is available, and four are restricted to only be
tested for { target *-*-mingw* }, would that explain it?
>and I didn't confirm that all the similarly-named
>char and wchar_t files were actually testing the exact same things.
These ones don't match the corresponding /char/ version:
libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/2.cc
libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/3.cc
libstdc++-v3/testsuite/27_io/basic_ifstream/cons/wchar_t/1.cc
libstdc++-v3/testsuite/27_io/basic_ofstream/cons/wchar_t/1.cc
libstdc++-v3/testsuite/27_io/basic_ofstream/open/wchar_t/1.cc
libstdc++-v3/testsuite/27_io/objects/wchar_t/10.cc
They do all use file I/O though.
>Is this OK to check in? Or is some deeper analysis required to
>identify which tests are affected?
I checked the files, most of them #include <fstream> so we can
safely assume they require file I/O. These ones don't include
<fstream> but they all use fopen and/or freopen:
libstdc++-v3/testsuite/27_io/objects/wchar_t/10.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/wchar_t/1.cc
So the patch seems fine. Thanks for keeping the test results clean.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-08-31 11:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-31 1:20 [testsuite] Add dg-require-fileio to some libstdc++ wchar_t tests Sandra Loosemore
2018-08-31 11:09 ` Jonathan Wakely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).