Specify a few more values with properties
I missed one implicit OPENSSL_NO_ASM. Also we currently implicitly skip
SSL tests for TSan and SDE, but we can just specify that explicitly.
Change-Id: I56d926688f1c18f0cf8e3d93271cc02ec29a32b2
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/57646
Reviewed-by: Bob Beck <bbe@google.com>
diff --git a/generated/cr-buildbucket.cfg b/generated/cr-buildbucket.cfg
index 509d613..eafe2cb 100644
--- a/generated/cr-buildbucket.cfg
+++ b/generated/cr-buildbucket.cfg
@@ -539,7 +539,8 @@
' "CMAKE_SYSTEM_NAME": "Linux",'
' "CMAKE_SYSTEM_PROCESSOR": "x86"'
' },'
- ' "recipe": "boringssl"'
+ ' "recipe": "boringssl",'
+ ' "run_ssl_tests": false'
'}'
execution_timeout_secs: 3600
caches {
@@ -697,7 +698,8 @@
' "gclient_vars": {'
' "checkout_libcxx": true'
' },'
- ' "recipe": "boringssl"'
+ ' "recipe": "boringssl",'
+ ' "run_ssl_tests": false'
'}'
execution_timeout_secs: 1800
caches {
@@ -997,6 +999,7 @@
' "group": "client.boringssl"'
' },'
' "cmake_args": {'
+ ' "OPENSSL_NO_ASM": "1",'
' "OPENSSL_NO_SSE2_FOR_TESTING": "1"'
' },'
' "recipe": "boringssl"'
@@ -1108,7 +1111,8 @@
' "cmake_args": {'
' "CMAKE_BUILD_TYPE": "RelWithAsserts"'
' },'
- ' "recipe": "boringssl"'
+ ' "recipe": "boringssl",'
+ ' "run_ssl_tests": false'
'}'
execution_timeout_secs: 3600
caches {
@@ -1498,7 +1502,8 @@
' "CMAKE_BUILD_TYPE": "RelWithAsserts"'
' },'
' "msvc_target": "x86",'
- ' "recipe": "boringssl"'
+ ' "recipe": "boringssl",'
+ ' "run_ssl_tests": false'
'}'
execution_timeout_secs: 3600
caches {
@@ -1740,7 +1745,8 @@
' "CMAKE_BUILD_TYPE": "RelWithAsserts"'
' },'
' "msvc_target": "x64",'
- ' "recipe": "boringssl"'
+ ' "recipe": "boringssl",'
+ ' "run_ssl_tests": false'
'}'
execution_timeout_secs: 3600
caches {
@@ -2555,7 +2561,8 @@
' "gclient_vars": {'
' "checkout_libcxx": true'
' },'
- ' "recipe": "boringssl"'
+ ' "recipe": "boringssl",'
+ ' "run_ssl_tests": false'
'}'
execution_timeout_secs: 1800
service_account: "boringssl-try-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -2767,6 +2774,7 @@
properties:
'{'
' "cmake_args": {'
+ ' "OPENSSL_NO_ASM": "1",'
' "OPENSSL_NO_SSE2_FOR_TESTING": "1"'
' },'
' "recipe": "boringssl"'
diff --git a/main.star b/main.star
index c2fb79b..3f75581 100755
--- a/main.star
+++ b/main.star
@@ -493,6 +493,7 @@
"CMAKE_C_FLAGS": "-m32 -msse2",
"CMAKE_CXX_FLAGS": "-m32 -msse2",
},
+ "run_ssl_tests": False,
},
)
both_builders(
@@ -573,6 +574,9 @@
"gclient_vars": {
"checkout_libcxx": True,
},
+ # SSL tests are all single-threaded, so running them under TSan is a
+ # waste of time.
+ "run_ssl_tests": False,
},
)
both_builders(
@@ -689,6 +693,7 @@
"cmake_args": {
"CMAKE_BUILD_TYPE": "RelWithAsserts",
},
+ "run_ssl_tests": False,
},
)
both_builders(
@@ -721,6 +726,7 @@
short_name = "nosse2",
properties = {
"cmake_args": {
+ "OPENSSL_NO_ASM": "1",
"OPENSSL_NO_SSE2_FOR_TESTING": "1",
},
},
@@ -782,6 +788,7 @@
"CMAKE_BUILD_TYPE": "RelWithAsserts",
},
"msvc_target": "x86",
+ "run_ssl_tests": False,
},
)
both_builders(
@@ -862,6 +869,7 @@
"CMAKE_BUILD_TYPE": "RelWithAsserts",
},
"msvc_target": "x64",
+ "run_ssl_tests": False,
},
)
both_builders(
