Skip to content

Commit d8f6aa9

Browse files
LarryOstermanLarryOsterman
authored
First cut at removing proxy tests (#4416)
* FIrst cut at removing proxy tests Changed the proxy tests from opt-out to opt-in so they're disabled by default. Removed lines enabling proxy from ci.yml file.
1 parent 6706c20 commit d8f6aa9

File tree

5 files changed

+478
-383
lines changed

5 files changed

+478
-383
lines changed

‎CMakeSettings.json‎

Lines changed: 78 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,20 @@
77
"inheritEnvironments": [ "msvc_x64_x64" ],
88
"buildRoot": "${projectDir}\\out\\build\\${name}",
99
"installRoot": "${projectDir}\\out\\install\\${name}",
10-
"cmakeCommandArgs": "-DINSTALL_GTEST=OFF -DBUILD_TESTING=ON -DBUILD_TRANSPORT_CURL=ON -DBUILD_SAMPLES=ON -DBUILD_PERFORMANCE_TESTS=ON",
10+
"cmakeCommandArgs": "",
1111
"buildCommandArgs": "-v",
1212
"ctestCommandArgs": "",
1313
"variables": [
14+
{
15+
"name": "INSTALL_GTEST",
16+
"value": "False",
17+
"type": "BOOL"
18+
},
19+
{
20+
"name": "BUILD_TESTING",
21+
"value": "True",
22+
"type": "BOOL"
23+
},
1424
{
1525
"name": "VCPKG_TARGET_TRIPLET",
1626
"value": "x64-windows-static",
@@ -25,6 +35,26 @@
2535
"name": "VCPKG_MANIFEST_MODE",
2636
"value": "True",
2737
"type": "BOOL"
38+
},
39+
{
40+
"name": "ENABLE_PROXY_TESTS",
41+
"value": "False",
42+
"type": "BOOL"
43+
},
44+
{
45+
"name": "BUILD_TRANSPORT_CURL",
46+
"value": "True",
47+
"type": "BOOL"
48+
},
49+
{
50+
"name": "BUILD_SAMPLES",
51+
"value": "True",
52+
"type": "BOOL"
53+
},
54+
{
55+
"name": "BUILD_PERFORMANCE_TESTS",
56+
"value": "True",
57+
"type": "BOOL"
2858
}
2959
]
3060
},
@@ -74,6 +104,11 @@
74104
"value": "True",
75105
"type": "BOOL"
76106
},
107+
{
108+
"name": "ENABLE_PROXY_TESTS",
109+
"value": "False",
110+
"type": "BOOL"
111+
},
77112
{
78113
"name": "BUILD_SAMPLES",
79114
"value": "True",
@@ -101,6 +136,11 @@
101136
"name": "MSVC_USE_STATIC_CRT",
102137
"value": "True",
103138
"type": "BOOL"
139+
},
140+
{
141+
"name": "ENABLE_PROXY_TESTS",
142+
"value": "False",
143+
"type": "BOOL"
104144
}
105145
]
106146
},
@@ -129,6 +169,11 @@
129169
"name": "MSVC_USE_STATIC_CRT",
130170
"value": "True",
131171
"type": "BOOL"
172+
},
173+
{
174+
"name": "ENABLE_PROXY_TESTS",
175+
"value": "False",
176+
"type": "BOOL"
132177
}
133178
]
134179
},
@@ -154,8 +199,8 @@
154199
"type": "BOOL"
155200
},
156201
{
157-
"name": "DISABLE_PROXY_TESTS",
158-
"value": "True",
202+
"name": "ENABLE_PROXY_TESTS",
203+
"value": "False",
159204
"type": "BOOL"
160205
},
161206
{
@@ -220,6 +265,11 @@
220265
"name": "BUILD_PERFORMANCE_TESTS",
221266
"value": "true",
222267
"type": "BOOL"
268+
},
269+
{
270+
"name": "ENABLE_PROXY_TESTS",
271+
"value": "False",
272+
"type": "BOOL"
223273
}
224274
]
225275
},
@@ -239,6 +289,11 @@
239289
"value": "True",
240290
"type": "BOOL"
241291
},
292+
{
293+
"name": "ENABLE_PROXY_TESTS",
294+
"value": "False",
295+
"type": "BOOL"
296+
},
242297
{
243298
"name": "BUILD_TRANSPORT_CURL",
244299
"value": "True",
@@ -287,6 +342,11 @@
287342
"value": "True",
288343
"type": "BOOL"
289344
},
345+
{
346+
"name": "ENABLE_PROXY_TESTS",
347+
"value": "False",
348+
"type": "BOOL"
349+
},
290350
{
291351
"name": "BUILD_TRANSPORT_CURL",
292352
"value": "True",
@@ -325,6 +385,11 @@
325385
"value": "True",
326386
"type": "BOOL"
327387
},
388+
{
389+
"name": "ENABLE_PROXY_TESTS",
390+
"value": "False",
391+
"type": "BOOL"
392+
},
328393
{
329394
"name": "BUILD_TRANSPORT_CURL",
330395
"value": "True",
@@ -367,6 +432,11 @@
367432
"value": "True",
368433
"type": "BOOL"
369434
},
435+
{
436+
"name": "ENABLE_PROXY_TESTS",
437+
"value": "False",
438+
"type": "BOOL"
439+
},
370440
{
371441
"name": "BUILD_SAMPLES",
372442
"value": "True",
@@ -419,6 +489,11 @@
419489
"value": "True",
420490
"type": "BOOL"
421491
},
492+
{
493+
"name": "ENABLE_PROXY_TESTS",
494+
"value": "False",
495+
"type": "BOOL"
496+
},
422497
{
423498
"name": "BUILD_SAMPLES",
424499
"value": "True",

‎eng/pipelines/templates/stages/platform-matrix.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"Pool": "Azure Pipelines",
1616
"BuildArgs": "-j 10",
1717
"VCPKG_DEFAULT_TRIPLET": "x64-osx",
18-
"CmakeArgs": " -DBUILD_TESTING=ON -DDISABLE_PROXY_TESTS=ON -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_TRANSPORT_CURL=ON",
18+
"CmakeArgs": " -DBUILD_TESTING=ON -DENABLE_PROXY_TESTS=OFF -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_TRANSPORT_CURL=ON",
1919
"PublishMapFiles": "true"
2020
}
2121
},
@@ -59,7 +59,7 @@
5959
"CmakeArgs": " -DBUILD_TRANSPORT_CURL=ON"
6060
},
6161
"Win32Api_release_curl": {
62-
"CmakeArgs": " -DBUILD_TESTING=ON -DDISABLE_PROXY_TESTS=ON -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_TRANSPORT_CURL=ON -DMSVC_USE_STATIC_CRT=ON ",
62+
"CmakeArgs": " -DBUILD_TESTING=ON -DENABLE_PROXY_TESTS=OFF -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_TRANSPORT_CURL=ON -DMSVC_USE_STATIC_CRT=ON ",
6363
"BuildArgs": "--parallel 8 --config Release",
6464
"PublishMapFiles": "true"
6565
}

‎sdk/core/azure-core/test/ut/CMakeLists.txt‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ cmake_minimum_required (VERSION 3.13)
55

66
set(azure-core-test)
77

8-
# Create test data for FileUpload test (100K) by writing 1K * 100 times
8+
# Create test data for FileUpload test (100K) by writing 100 * 1000 times
99
set(RANGE 0)
10+
#cSpell:disable
1011
set(1K "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
12+
#cSpell:enable
1113
file(WRITE ${CMAKE_BINARY_DIR}/fileData "")
1214
while(RANGE LESS 100)
1315
file(APPEND ${CMAKE_BINARY_DIR}/fileData "${1K}")
@@ -109,6 +111,11 @@ if (DISABLE_PROXY_TESTS)
109111
add_compile_definitions(DISABLE_PROXY_TESTS)
110112
endif()
111113

114+
if (ENABLE_PROXY_TESTS)
115+
message(STATUS "Enabling proxy tests." )
116+
add_compile_definitions(ENABLE_PROXY_TESTS)
117+
endif()
118+
112119
# If the System.TeamProjectId ADO variable is set, we are running in the pipeline, behave accordingly.
113120
if (ENV{SYSTEM_TEAMPROJECTID})
114121
add_compile_definitions(IN_CI_PIPELINE)

0 commit comments

Comments
 (0)