From f968a87e3f54711b92d3906877b9f945d9f9a120 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 22 Jan 2016 16:07:42 -0800
Subject: [PATCH] Fix build
---
grpc.gemspec | 1 +
package.json | 1 +
tools/run_tests/tests.json | 1 +
vsprojects/vcxproj/test/tag_set_test/tag_set_test.vcxproj | 2 ++
4 files changed, 5 insertions(+)
diff --git a/grpc.gemspec b/grpc.gemspec
index 4f3a3f2dd9..47b66ae535 100755
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -412,5 +412,6 @@ Gem::Specification.new do |s|
s.files += %w( src/core/census/context.c )
s.files += %w( src/core/census/initialize.c )
s.files += %w( src/core/census/operation.c )
+ s.files += %w( src/core/census/tag_set.c )
s.files += %w( src/core/census/tracing.c )
end
diff --git a/package.json b/package.json
index e0bbb7d80f..0b87f6a59d 100644
--- a/package.json
+++ b/package.json
@@ -363,6 +363,7 @@
"src/core/census/context.c",
"src/core/census/initialize.c",
"src/core/census/operation.c",
+ "src/core/census/tag_set.c",
"src/core/census/tracing.c",
"include/grpc/support/alloc.h",
"include/grpc/support/atm.h",
diff --git a/tools/run_tests/tests.json b/tools/run_tests/tests.json
index 5124becfbe..8c76b3f134 100644
--- a/tools/run_tests/tests.json
+++ b/tools/run_tests/tests.json
@@ -1407,6 +1407,7 @@
"posix",
"windows"
],
+ "cpu_cost": 1.0,
"exclude_configs": [],
"flaky": false,
"language": "c",
diff --git a/vsprojects/vcxproj/test/tag_set_test/tag_set_test.vcxproj b/vsprojects/vcxproj/test/tag_set_test/tag_set_test.vcxproj
index 3894902672..9a468af3ad 100644
--- a/vsprojects/vcxproj/test/tag_set_test/tag_set_test.vcxproj
+++ b/vsprojects/vcxproj/test/tag_set_test/tag_set_test.vcxproj
@@ -63,12 +63,14 @@
<TargetName>tag_set_test</TargetName>
<Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib>
<Configuration-grpc_dependencies_zlib>Debug</Configuration-grpc_dependencies_zlib>
+ <Linkage-grpc_dependencies_openssl>static</Linkage-grpc_dependencies_openssl>
<Configuration-grpc_dependencies_openssl>Debug</Configuration-grpc_dependencies_openssl>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)'=='Release'">
<TargetName>tag_set_test</TargetName>
<Linkage-grpc_dependencies_zlib>static</Linkage-grpc_dependencies_zlib>
<Configuration-grpc_dependencies_zlib>Release</Configuration-grpc_dependencies_zlib>
+ <Linkage-grpc_dependencies_openssl>static</Linkage-grpc_dependencies_openssl>
<Configuration-grpc_dependencies_openssl>Release</Configuration-grpc_dependencies_openssl>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
--
GitLab