Commit b0883076 authored by Christopher Dykes's avatar Christopher Dykes Committed by Facebook Github Bot 8

Don't use stderr as an identifier name

Summary: Because it is defined as a macro that calls a function to get the error stream. It is also defined as a macro in musl libc.

Reviewed By: yfeldblum

Differential Revision: D3506283

fbshipit-source-id: 0652288adfe64010798017e46d962fdc18d2ff56
parent 8382636d
...@@ -141,19 +141,19 @@ TEST(PCREPatternMatch, Simple) { ...@@ -141,19 +141,19 @@ TEST(PCREPatternMatch, Simple) {
} }
TEST(CaptureFD, GlogPatterns) { TEST(CaptureFD, GlogPatterns) {
CaptureFD stderr(2); CaptureFD err(fileno(stderr));
LOG(INFO) << "All is well"; LOG(INFO) << "All is well";
EXPECT_NO_PCRE_MATCH(glogErrOrWarnPattern(), stderr.readIncremental()); EXPECT_NO_PCRE_MATCH(glogErrOrWarnPattern(), err.readIncremental());
{ {
LOG(ERROR) << "Uh-oh"; LOG(ERROR) << "Uh-oh";
auto s = stderr.readIncremental(); auto s = err.readIncremental();
EXPECT_PCRE_MATCH(glogErrorPattern(), s); EXPECT_PCRE_MATCH(glogErrorPattern(), s);
EXPECT_NO_PCRE_MATCH(glogWarningPattern(), s); EXPECT_NO_PCRE_MATCH(glogWarningPattern(), s);
EXPECT_PCRE_MATCH(glogErrOrWarnPattern(), s); EXPECT_PCRE_MATCH(glogErrOrWarnPattern(), s);
} }
{ {
LOG(WARNING) << "Oops"; LOG(WARNING) << "Oops";
auto s = stderr.readIncremental(); auto s = err.readIncremental();
EXPECT_NO_PCRE_MATCH(glogErrorPattern(), s); EXPECT_NO_PCRE_MATCH(glogErrorPattern(), s);
EXPECT_PCRE_MATCH(glogWarningPattern(), s); EXPECT_PCRE_MATCH(glogWarningPattern(), s);
EXPECT_PCRE_MATCH(glogErrOrWarnPattern(), s); EXPECT_PCRE_MATCH(glogErrOrWarnPattern(), s);
...@@ -163,7 +163,7 @@ TEST(CaptureFD, GlogPatterns) { ...@@ -163,7 +163,7 @@ TEST(CaptureFD, GlogPatterns) {
TEST(CaptureFD, ChunkCob) { TEST(CaptureFD, ChunkCob) {
std::vector<std::string> chunks; std::vector<std::string> chunks;
{ {
CaptureFD stderr(2, [&](StringPiece p) { CaptureFD err(fileno(stderr), [&](StringPiece p) {
chunks.emplace_back(p.str()); chunks.emplace_back(p.str());
switch (chunks.size()) { switch (chunks.size()) {
case 1: case 1:
...@@ -178,11 +178,11 @@ TEST(CaptureFD, ChunkCob) { ...@@ -178,11 +178,11 @@ TEST(CaptureFD, ChunkCob) {
}); });
LOG(INFO) << "foo"; LOG(INFO) << "foo";
LOG(INFO) << "bar"; LOG(INFO) << "bar";
EXPECT_PCRE_MATCH(".*foo.*bar.*", stderr.read()); EXPECT_PCRE_MATCH(".*foo.*bar.*", err.read());
auto chunk = stderr.readIncremental(); auto chunk = err.readIncremental();
EXPECT_EQ(chunks.at(0), chunk); EXPECT_EQ(chunks.at(0), chunk);
LOG(INFO) << "baz"; LOG(INFO) << "baz";
EXPECT_PCRE_MATCH(".*foo.*bar.*baz.*", stderr.read()); EXPECT_PCRE_MATCH(".*foo.*bar.*baz.*", err.read());
} }
EXPECT_EQ(2, chunks.size()); EXPECT_EQ(2, chunks.size());
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment