Resolve sanity failures

8 years ago · e067b6e119
parent 0d8b11fe21
commit e067b6e119
13 changed files with 28 additions and 22 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -1447,7 +1447,7 @@ add_library(grpc_test_util
  test/core/security/oauth2_utils.c
  test/core/end2end/cq_verifier.c
  test/core/end2end/fake_resolver.c
-  test/core/end2end/fixtures/http_proxy.c
+  test/core/end2end/fixtures/http_proxy_fixture.c
  test/core/end2end/fixtures/proxy.c
  test/core/iomgr/endpoint_tests.c
  test/core/util/debugger_macros.c
@ -1654,7 +1654,7 @@ if (gRPC_BUILD_TESTS)
 add_library(grpc_test_util_unsecure
  test/core/end2end/cq_verifier.c
  test/core/end2end/fake_resolver.c
-  test/core/end2end/fixtures/http_proxy.c
+  test/core/end2end/fixtures/http_proxy_fixture.c
  test/core/end2end/fixtures/proxy.c
  test/core/iomgr/endpoint_tests.c
  test/core/util/debugger_macros.c
@ -3139,6 +3139,7 @@ target_link_libraries(grpc_benchmark
  ${_gRPC_ALLTARGETS_LIBRARIES}
  benchmark
  grpc++
+  grpc_test_util
  grpc
  ${_gRPC_GFLAGS_LIBRARIES}
 )
--- a/4
+++ b/4
@ -3325,7 +3325,7 @@ LIBGRPC_TEST_UTIL_SRC = \
    test/core/security/oauth2_utils.c \
    test/core/end2end/cq_verifier.c \
    test/core/end2end/fake_resolver.c \
-    test/core/end2end/fixtures/http_proxy.c \
+    test/core/end2end/fixtures/http_proxy_fixture.c \
    test/core/end2end/fixtures/proxy.c \
    test/core/iomgr/endpoint_tests.c \
    test/core/util/debugger_macros.c \
@ -3525,7 +3525,7 @@ endif
 LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
    test/core/end2end/cq_verifier.c \
    test/core/end2end/fake_resolver.c \
-    test/core/end2end/fixtures/http_proxy.c \
+    test/core/end2end/fixtures/http_proxy_fixture.c \
    test/core/end2end/fixtures/proxy.c \
    test/core/iomgr/endpoint_tests.c \
    test/core/util/debugger_macros.c \
--- a/build.yaml
+++ b/build.yaml
@ -586,7 +586,7 @@ filegroups:
  headers:
  - test/core/end2end/cq_verifier.h
  - test/core/end2end/fake_resolver.h
-  - test/core/end2end/fixtures/http_proxy.h
+  - test/core/end2end/fixtures/http_proxy_fixture.h
  - test/core/end2end/fixtures/proxy.h
  - test/core/iomgr/endpoint_tests.h
  - test/core/util/debugger_macros.h
@ -602,7 +602,7 @@ filegroups:
  src:
  - test/core/end2end/cq_verifier.c
  - test/core/end2end/fake_resolver.c
-  - test/core/end2end/fixtures/http_proxy.c
+  - test/core/end2end/fixtures/http_proxy_fixture.c
  - test/core/end2end/fixtures/proxy.c
  - test/core/iomgr/endpoint_tests.c
  - test/core/util/debugger_macros.c
@ -1224,6 +1224,7 @@ libs:
  deps:
  - benchmark
  - grpc++
+  - grpc_test_util
  - grpc
 - name: grpc_cli_libs
  build: private
--- a/test/core/end2end/BUILD
+++ b/test/core/end2end/BUILD
@ -63,8 +63,8 @@ cc_library(

 cc_library(
  name = 'http_proxy',
-  hdrs = ['fixtures/http_proxy.h'],
-  srcs = ['fixtures/http_proxy.c'],
+  hdrs = ['fixtures/http_proxy_fixture.h'],
+  srcs = ['fixtures/http_proxy_fixture.c'],
  copts = ['-std=c99'],
  deps = ['//:gpr', '//:grpc', '//test/core/util:grpc_test_util']
 )
--- a/test/core/end2end/fixtures/h2_http_proxy.c
+++ b/test/core/end2end/fixtures/h2_http_proxy.c
@ -49,7 +49,7 @@
 #include "src/core/lib/support/env.h"
 #include "src/core/lib/surface/channel.h"
 #include "src/core/lib/surface/server.h"
-#include "test/core/end2end/fixtures/http_proxy.h"
+#include "test/core/end2end/fixtures/http_proxy_fixture.h"
 #include "test/core/util/port.h"
 #include "test/core/util/test_config.h"

--- a/test/core/end2end/fixtures/http_proxy_fixture.c
+++ b/test/core/end2end/fixtures/http_proxy_fixture.c
@ -31,7 +31,7 @@
 *
 */

-#include "test/core/end2end/fixtures/http_proxy.h"
+#include "test/core/end2end/fixtures/http_proxy_fixture.h"

 #include "src/core/lib/iomgr/sockaddr.h"

--- a/test/core/end2end/fixtures/http_proxy_fixture.h
+++ b/test/core/end2end/fixtures/http_proxy_fixture.h
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@ -5781,7 +5781,8 @@
    "deps": [
      "benchmark", 
      "grpc", 
-      "grpc++"
+      "grpc++", 
+      "grpc_test_util"
    ], 
    "headers": [
      "test/cpp/microbenchmarks/fullstack_context_mutators.h", 
@ -8004,7 +8005,7 @@
    "headers": [
      "test/core/end2end/cq_verifier.h", 
      "test/core/end2end/fake_resolver.h", 
-      "test/core/end2end/fixtures/http_proxy.h", 
+      "test/core/end2end/fixtures/http_proxy_fixture.h", 
      "test/core/end2end/fixtures/proxy.h", 
      "test/core/iomgr/endpoint_tests.h", 
      "test/core/util/debugger_macros.h", 
@ -8026,8 +8027,8 @@
      "test/core/end2end/cq_verifier.h", 
      "test/core/end2end/fake_resolver.c", 
      "test/core/end2end/fake_resolver.h", 
-      "test/core/end2end/fixtures/http_proxy.c", 
-      "test/core/end2end/fixtures/http_proxy.h", 
+      "test/core/end2end/fixtures/http_proxy_fixture.c", 
+      "test/core/end2end/fixtures/http_proxy_fixture.h", 
      "test/core/end2end/fixtures/proxy.c", 
      "test/core/end2end/fixtures/proxy.h", 
      "test/core/iomgr/endpoint_tests.c", 
--- a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj
+++ b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj
@ -182,7 +182,7 @@
    <ClInclude Include="$(SolutionDir)\..\test\core\security\oauth2_utils.h" />
    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\cq_verifier.h" />
    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\fake_resolver.h" />
-    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\fixtures\http_proxy.h" />
+    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\fixtures\http_proxy_fixture.h" />
    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\fixtures\proxy.h" />
    <ClInclude Include="$(SolutionDir)\..\test\core\iomgr\endpoint_tests.h" />
    <ClInclude Include="$(SolutionDir)\..\test\core\util\debugger_macros.h" />
@ -317,7 +317,7 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\fake_resolver.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\fixtures\http_proxy.c">
+    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\fixtures\http_proxy_fixture.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\fixtures\proxy.c">
    </ClCompile>
--- a/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_test_util/grpc_test_util.vcxproj.filters
@ -22,7 +22,7 @@
    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\fake_resolver.c">
      <Filter>test\core\end2end</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\fixtures\http_proxy.c">
+    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\fixtures\http_proxy_fixture.c">
      <Filter>test\core\end2end\fixtures</Filter>
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\fixtures\proxy.c">
@ -518,7 +518,7 @@
    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\fake_resolver.h">
      <Filter>test\core\end2end</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\fixtures\http_proxy.h">
+    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\fixtures\http_proxy_fixture.h">
      <Filter>test\core\end2end\fixtures</Filter>
    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\fixtures\proxy.h">
--- a/vsprojects/vcxproj/grpc_test_util_unsecure/grpc_test_util_unsecure.vcxproj
+++ b/vsprojects/vcxproj/grpc_test_util_unsecure/grpc_test_util_unsecure.vcxproj
@ -149,7 +149,7 @@
  <ItemGroup>
    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\cq_verifier.h" />
    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\fake_resolver.h" />
-    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\fixtures\http_proxy.h" />
+    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\fixtures\http_proxy_fixture.h" />
    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\fixtures\proxy.h" />
    <ClInclude Include="$(SolutionDir)\..\test\core\iomgr\endpoint_tests.h" />
    <ClInclude Include="$(SolutionDir)\..\test\core\util\debugger_macros.h" />
@ -168,7 +168,7 @@
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\fake_resolver.c">
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\fixtures\http_proxy.c">
+    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\fixtures\http_proxy_fixture.c">
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\fixtures\proxy.c">
    </ClCompile>
--- a/vsprojects/vcxproj/grpc_test_util_unsecure/grpc_test_util_unsecure.vcxproj.filters
+++ b/vsprojects/vcxproj/grpc_test_util_unsecure/grpc_test_util_unsecure.vcxproj.filters
@ -7,7 +7,7 @@
    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\fake_resolver.c">
      <Filter>test\core\end2end</Filter>
    </ClCompile>
-    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\fixtures\http_proxy.c">
+    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\fixtures\http_proxy_fixture.c">
      <Filter>test\core\end2end\fixtures</Filter>
    </ClCompile>
    <ClCompile Include="$(SolutionDir)\..\test\core\end2end\fixtures\proxy.c">
@ -54,7 +54,7 @@
    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\fake_resolver.h">
      <Filter>test\core\end2end</Filter>
    </ClInclude>
-    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\fixtures\http_proxy.h">
+    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\fixtures\http_proxy_fixture.h">
      <Filter>test\core\end2end\fixtures</Filter>
    </ClInclude>
    <ClInclude Include="$(SolutionDir)\..\test\core\end2end\fixtures\proxy.h">
--- a/vsprojects/vcxproj/test/grpc_benchmark/grpc_benchmark.vcxproj
+++ b/vsprojects/vcxproj/test/grpc_benchmark/grpc_benchmark.vcxproj
@ -175,6 +175,9 @@
    <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc++\grpc++.vcxproj">
      <Project>{C187A093-A0FE-489D-A40A-6E33DE0F9FEB}</Project>
    </ProjectReference>
+    <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc_test_util\grpc_test_util.vcxproj">
+      <Project>{17BCAFC0-5FDC-4C94-AEB9-95F3E220614B}</Project>
+    </ProjectReference>
    <ProjectReference Include="$(SolutionDir)\..\vsprojects\vcxproj\.\grpc\grpc.vcxproj">
      <Project>{29D16885-7228-4C31-81ED-5F9187C7F2A9}</Project>
    </ProjectReference>