Skip to content

Commit

Permalink
manifest_parser: remove multi-output depslog restriction
Browse files Browse the repository at this point in the history
It seems to work as intended.
  • Loading branch information
mathstuf committed Mar 1, 2019
1 parent a683551 commit 4ca37bd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
8 changes: 0 additions & 8 deletions src/manifest_parser.cc
Original file line number Diff line number Diff line change
Expand Up @@ -402,14 +402,6 @@ bool ManifestParser::ParseEdge(string* err) {
}
}

// Multiple outputs aren't (yet?) supported with depslog.
string deps_type = edge->GetBinding("deps");
if (!deps_type.empty() && edge->outputs_.size() > 1) {
return lexer_.Error("multiple outputs aren't (yet?) supported by depslog; "
"bring this up on the mailing list if it affects you",
err);
}

return true;
}

Expand Down
5 changes: 2 additions & 3 deletions src/manifest_parser_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -858,11 +858,10 @@ TEST_F(ParserTest, MultipleOutputsWithDeps) {
State local_state;
ManifestParser parser(&local_state, NULL);
string err;
EXPECT_FALSE(parser.ParseTest("rule cc\n command = foo\n deps = gcc\n"
EXPECT_TRUE(parser.ParseTest("rule cc\n command = foo\n deps = gcc\n"
"build a.o b.o: cc c.cc\n",
&err));
EXPECT_EQ("input:5: multiple outputs aren't (yet?) supported by depslog; "
"bring this up on the mailing list if it affects you\n", err);
EXPECT_EQ("", err);
}

TEST_F(ParserTest, SubNinja) {
Expand Down

0 comments on commit 4ca37bd

Please sign in to comment.