Skip to content

bazel: minor fixes for consuming projects #732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 2 commits into from
Apr 11, 2017
Merged

bazel: minor fixes for consuming projects #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
748972b
bazel: minor fixes for consuming projects
mattklein123 Apr 11, 2017
6bca01d
more debugging
mattklein123 Apr 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion bazel/envoy_build_system.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ def envoy_cc_test(name,
srcs = srcs,
data = data,
deps = deps,
repository = repository,
tags = test_lib_tags,
)
native.cc_test(
Expand All @@ -104,7 +105,7 @@ def envoy_cc_test(name,
linkopts = ["-pthread"],
linkstatic = 1,
deps = [
repository + name + "_lib",
":" + name + "_lib",
repository + "//test:main"
],
tags = tags + ["coverage_test"],
Expand Down
5 changes: 5 additions & 0 deletions test/test_common/environment.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,11 @@ std::string TestEnvironment::temporaryFileSubstitute(const std::string& path,
std::string out_json_string;
{
std::ifstream file(tmp_json_path);
if (file.fail()) {
std::cerr << "failed to open: " << tmp_json_path << std::endl;
RELEASE_ASSERT(false);
}

std::stringstream file_string_stream;
file_string_stream << file.rdbuf();
out_json_string = file_string_stream.str();
Expand Down