From c1c691fdb1545f601afe843c5820a45a630d25fc Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Wed, 7 Sep 2016 10:40:13 -0700
Subject: [PATCH] Fix merge error
---
Makefile | 6 +++---
build.yaml | 3 +++
tools/run_tests/sources_and_headers.json | 5 ++++-
vsprojects/buildtests_c.sln | 4 ++++
.../vcxproj/test/gpr_mpscq_test/gpr_mpscq_test.vcxproj | 8 ++++++++
5 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 043e3edb57..cb3263a3d0 100644
--- a/Makefile
+++ b/Makefile
@@ -8280,14 +8280,14 @@ else
-$(BINDIR)/$(CONFIG)/gpr_mpscq_test: $(GPR_MPSCQ_TEST_OBJS)
+$(BINDIR)/$(CONFIG)/gpr_mpscq_test: $(GPR_MPSCQ_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
$(E) "[LD] Linking $@"
$(Q) mkdir -p `dirname $@`
- $(Q) $(LD) $(LDFLAGS) $(GPR_MPSCQ_TEST_OBJS) $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_mpscq_test
+ $(Q) $(LD) $(LDFLAGS) $(GPR_MPSCQ_TEST_OBJS) $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a $(LDLIBS) $(LDLIBS_SECURE) -o $(BINDIR)/$(CONFIG)/gpr_mpscq_test
endif
-$(OBJDIR)/$(CONFIG)/test/core/support/mpscq_test.o:
+$(OBJDIR)/$(CONFIG)/test/core/support/mpscq_test.o: $(LIBDIR)/$(CONFIG)/libgpr_test_util.a $(LIBDIR)/$(CONFIG)/libgpr.a
deps_gpr_mpscq_test: $(GPR_MPSCQ_TEST_OBJS:.o=.dep)
diff --git a/build.yaml b/build.yaml
index d232b118d6..2b13b01836 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1684,6 +1684,9 @@ targets:
language: c
src:
- test/core/support/mpscq_test.c
+ deps:
+ - gpr_test_util
+ - gpr
- name: gpr_percent_encoding_test
build: test
language: c
diff --git a/tools/run_tests/sources_and_headers.json b/tools/run_tests/sources_and_headers.json
index d1b5ac93e9..a555e0bc59 100644
--- a/tools/run_tests/sources_and_headers.json
+++ b/tools/run_tests/sources_and_headers.json
@@ -641,7 +641,10 @@
"type": "target"
},
{
- "deps": [],
+ "deps": [
+ "gpr",
+ "gpr_test_util"
+ ],
"headers": [],
"language": "c",
"name": "gpr_mpscq_test",
diff --git a/vsprojects/buildtests_c.sln b/vsprojects/buildtests_c.sln
index 8760901adb..04f487689c 100644
--- a/vsprojects/buildtests_c.sln
+++ b/vsprojects/buildtests_c.sln
@@ -397,6 +397,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpr_mpscq_test", "vcxproj\t
ProjectSection(myProperties) = preProject
lib = "False"
EndProjectSection
+ ProjectSection(ProjectDependencies) = postProject
+ {EAB0A629-17A9-44DB-B5FF-E91A721FE037} = {EAB0A629-17A9-44DB-B5FF-E91A721FE037}
+ {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792} = {B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpr_percent_encoding_test", "vcxproj\test\gpr_percent_encoding_test\gpr_percent_encoding_test.vcxproj", "{8313AE17-FCFA-8110-95C7-7AF2F814D188}"
ProjectSection(myProperties) = preProject
diff --git a/vsprojects/vcxproj/test/gpr_mpscq_test/gpr_mpscq_test.vcxproj b/vsprojects/vcxproj/test/gpr_mpscq_test/gpr_mpscq_test.vcxproj
index adfbaf6fad..01342868b0 100644
--- a/vsprojects/vcxproj/test/gpr_mpscq_test/gpr_mpscq_test.vcxproj
+++ b/vsprojects/vcxproj/test/gpr_mpscq_test/gpr_mpscq_test.vcxproj
@@ -161,6 +161,14 @@
<ClCompile Include="$(SolutionDir)\..\test\core\support\mpscq_test.c">
</ClCompile>
</ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\gpr_test_util\gpr_test_util.vcxproj">
+ <Project>{EAB0A629-17A9-44DB-B5FF-E91A721FE037}</Project>
+ </ProjectReference>
+ <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\gpr\gpr.vcxproj">
+ <Project>{B23D3D1A-9438-4EDA-BEB6-9A0A03D17792}</Project>
+ </ProjectReference>
+ </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
--
GitLab