LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[libcxx] [test] Change ifstream constructor tests to handle read-only files.

Browse Source 
Certain source control systems like to set the read-only bit on their files,
which interferes with opening "test.dat" for both input and output.
Fortunately, we can work around this without losing test coverage.
Now, the ifstream.cons tests have comments referring to the ofstream.cons tests.
There, we're creating writable files (not checked into source control),
where the ifstream constructor tests will succeed.

Fixes D26814.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@289463 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Stephan T. Lavavej
2016-12-12 19:50:22 +00:00
parent fbbec294b0
commit b988a6fb41
4 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/std/input.output/file.streams/fstreams/ifstream.cons/pointer.pass.cpp
View File

@@ -25,22 +25,16 @@ int main()
fs >> x;
assert(x == 3.25);
}
{
std::ifstream fs("test.dat", std::ios_base::out);
double x = 0;
fs >> x;
assert(x == 3.25);
}
// std::ifstream(const char*, std::ios_base::openmode) is tested in
// test/std/input.output/file.streams/fstreams/ofstream.cons/pointer.pass.cpp
// which creates writable files.
{
std::wifstream fs("test.dat");
double x = 0;
fs >> x;
assert(x == 3.25);
}
{
std::wifstream fs("test.dat", std::ios_base::out);
double x = 0;
fs >> x;
assert(x == 3.25);
}
// std::wifstream(const char*, std::ios_base::openmode) is tested in
// test/std/input.output/file.streams/fstreams/ofstream.cons/pointer.pass.cpp
// which creates writable files.
}

18
test/std/input.output/file.streams/fstreams/ifstream.cons/string.pass.cpp
View File

@@ -25,22 +25,16 @@ int main()
fs >> x;
assert(x == 3.25);
}
{
std::ifstream fs(std::string("test.dat"), std::ios_base::out);
double x = 0;
fs >> x;
assert(x == 3.25);
}
// std::ifstream(const std::string&, std::ios_base::openmode) is tested in
// test/std/input.output/file.streams/fstreams/ofstream.cons/string.pass.cpp
// which creates writable files.
{
std::wifstream fs(std::string("test.dat"));
double x = 0;
fs >> x;
assert(x == 3.25);
}
{
std::wifstream fs(std::string("test.dat"), std::ios_base::out);
double x = 0;
fs >> x;
assert(x == 3.25);
}
// std::wifstream(const std::string&, std::ios_base::openmode) is tested in
// test/std/input.output/file.streams/fstreams/ofstream.cons/string.pass.cpp
// which creates writable files.
}

12
test/std/input.output/file.streams/fstreams/ofstream.cons/pointer.pass.cpp
View File

@@ -31,6 +31,12 @@ int main()
fs >> x;
assert(x == 3.25);
}
{
std::ifstream fs(temp.c_str(), std::ios_base::out);
double x = 0;
fs >> x;
assert(x == 3.25);
}
std::remove(temp.c_str());
{
std::wofstream fs(temp.c_str());
@@ -42,5 +48,11 @@ int main()
fs >> x;
assert(x == 3.25);
}
{
std::wifstream fs(temp.c_str(), std::ios_base::out);
double x = 0;
fs >> x;
assert(x == 3.25);
}
std::remove(temp.c_str());
}

12
test/std/input.output/file.streams/fstreams/ofstream.cons/string.pass.cpp
View File

@@ -31,6 +31,12 @@ int main()
fs >> x;
assert(x == 3.25);
}
{
std::ifstream fs(temp, std::ios_base::out);
double x = 0;
fs >> x;
assert(x == 3.25);
}
std::remove(temp.c_str());
{
std::wofstream fs(temp);
@@ -42,5 +48,11 @@ int main()
fs >> x;
assert(x == 3.25);
}
{
std::wifstream fs(temp, std::ios_base::out);
double x = 0;
fs >> x;
assert(x == 3.25);
}
std::remove(temp.c_str());
}