浏览代码

Merge pull request #17815 from billfeng327/bugfix/enable-ptrace-for-asan

adding ptrace to asan
Jan Tattermusch 6 年之前
父节点
当前提交
79274b23de
共有 2 个文件被更改,包括 16 次插入6 次删除
  1. 16 0
      third_party/toolchains/BUILD
  2. 0 6
      tools/remote_build/rbe_common.bazelrc

+ 16 - 0
third_party/toolchains/BUILD

@@ -56,6 +56,14 @@ platform(
             name: "dockerNetwork"
             name: "dockerNetwork"
             value: "off"
             value: "off"
         }
         }
+        properties: {
+            name: "dockerAddCapabilities"
+            value: "SYS_PTRACE"
+        }
+        properties: {
+            name: "dockerPrivileged"
+            value: "true"
+        }
         """,
         """,
 )
 )
 
 
@@ -87,6 +95,14 @@ platform(
             name: "dockerNetwork"
             name: "dockerNetwork"
             value: "off"
             value: "off"
         }
         }
+        properties: {
+            name: "dockerAddCapabilities"
+            value: "SYS_PTRACE"
+        }
+        properties: {
+            name: "dockerPrivileged"
+            value: "true"
+        }
     """,
     """,
 )
 )
 
 

+ 0 - 6
tools/remote_build/rbe_common.bazelrc

@@ -54,12 +54,6 @@ build:asan --copt=-gmlt
 # TODO(jtattermusch): use more reasonable test timeout
 # TODO(jtattermusch): use more reasonable test timeout
 build:asan --test_timeout=3600
 build:asan --test_timeout=3600
 build:asan --test_tag_filters=-qps_json_driver
 build:asan --test_tag_filters=-qps_json_driver
-build:asan --host_platform_remote_properties_override='''
-  properties: {
-      name: "dockerDropCapabilities"
-      value: ""
-  }
-'''
 
 
 # memory sanitizer: most settings are already in %workspace%/.bazelrc
 # memory sanitizer: most settings are already in %workspace%/.bazelrc
 # we only need a few additional ones that are Foundry specific
 # we only need a few additional ones that are Foundry specific