Skip to content

Commit 2074172

Browse files
esyrSashan
esyr
authored and
Sashan
committed
.github/workflows/test.yml: check that ssl_poll_perf can be built with -DDEBUG
As the built with this macro set is not checked otherwise. Signed-off-by: Eugene Syromiatnikov <[email protected]>
1 parent 072b6be commit 2074172

File tree

1 file changed

+95
-0
lines changed

1 file changed

+95
-0
lines changed

‎.github/workflows/test.yml‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,37 @@ jobs:
1414
openssl-branch: "openssl-3.0",
1515
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;"',
1616
configopts: 'no-tests',
17+
has-ssl_poll_perf: false,
1718
}, {
1819
openssl-branch: "openssl-3.2",
1920
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;"',
2021
configopts: 'no-apps no-tests',
22+
has-ssl_poll_perf: false,
2123
}, {
2224
openssl-branch: "openssl-3.3",
2325
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;"',
2426
configopts: 'no-apps no-tests',
27+
has-ssl_poll_perf: false,
2528
}, {
2629
openssl-branch: "openssl-3.4",
2730
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;"',
2831
configopts: 'no-apps no-tests',
32+
has-ssl_poll_perf: false,
2933
}, {
3034
openssl-branch: "openssl-3.5",
3135
cmakeopts: '',
3236
configopts: 'no-apps no-tests',
37+
has-ssl_poll_perf: false,
3338
}, {
3439
openssl-branch: "openssl-3.6",
3540
cmakeopts: '',
3641
configopts: 'no-apps no-tests',
42+
has-ssl_poll_perf: true,
3743
}, {
3844
openssl-branch: "master",
3945
cmakeopts: '',
4046
configopts: 'no-apps no-tests',
47+
has-ssl_poll_perf: true,
4148
}
4249
]
4350
runs-on: "ubuntu-latest"
@@ -70,6 +77,16 @@ jobs:
7077
uses: "actions/checkout@v5"
7178
with:
7279
path: "perftools"
80+
- name: "Config perftools build with -DDEBUG"
81+
if: ${{ matrix.release.has-ssl_poll_perf }}
82+
working-directory: "./perftools/source"
83+
run: |
84+
cmake -S . -B build_debug -DOPENSSL_ROOT_DIR="$GITHUB_WORKSPACE/openssl" -DCMAKE_C_FLAGS="-DDEBUG -Werror" -Drun_add_version_dep:BOOL=OFF ${{ matrix.release.cmakeopts }}
85+
- name: "Build ssl_poll_perf with -DDEBUG"
86+
if: ${{ matrix.release.has-ssl_poll_perf }}
87+
working-directory: "./perftools/source"
88+
run: |
89+
cmake --build build_debug --config Debug --target ssl_poll_perf -j 4 -v
7390
- name: "Config perftools build"
7491
working-directory: "./perftools/source"
7592
run: |
@@ -96,30 +113,37 @@ jobs:
96113
openssl-branch: "openssl-3.0",
97114
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D OPENSSL_VERSION=3.0',
98115
configopts: 'no-tests',
116+
has-ssl_poll_perf: false,
99117
}, {
100118
openssl-branch: "openssl-3.2",
101119
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D OPENSSL_VERSION=3.2',
102120
configopts: 'no-apps no-tests',
121+
has-ssl_poll_perf: false,
103122
}, {
104123
openssl-branch: "openssl-3.3",
105124
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D OPENSSL_VERSION=3.3',
106125
configopts: 'no-apps no-tests',
126+
has-ssl_poll_perf: false,
107127
}, {
108128
openssl-branch: "openssl-3.4",
109129
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D OPENSSL_VERSION=3.4',
110130
configopts: 'no-apps no-tests',
131+
has-ssl_poll_perf: false,
111132
}, {
112133
openssl-branch: "openssl-3.5",
113134
cmakeopts: '-D OPENSSL_VERSION=3.5',
114135
configopts: 'no-apps no-tests',
136+
has-ssl_poll_perf: false,
115137
}, {
116138
openssl-branch: "openssl-3.6",
117139
cmakeopts: '-D OPENSSL_VERSION=3.6',
118140
configopts: 'no-apps no-tests',
141+
has-ssl_poll_perf: true,
119142
}, {
120143
openssl-branch: "master",
121144
cmakeopts: '-D OPENSSL_VERSION=4.0',
122145
configopts: 'no-apps no-tests',
146+
has-ssl_poll_perf: true,
123147
}
124148
]
125149
runs-on: "ubuntu-latest"
@@ -154,6 +178,16 @@ jobs:
154178
uses: "actions/checkout@v5"
155179
with:
156180
path: "perftools"
181+
- name: "Config perftools build with -DDEBUG"
182+
if: ${{ matrix.release.has-ssl_poll_perf }}
183+
working-directory: "./perftools/source"
184+
run: |
185+
cmake -S . -B build_debug -DOPENSSL_ROOT_DIR="$GITHUB_WORKSPACE/openssl" -DCMAKE_C_FLAGS="-DDEBUG -Werror" -Drun_add_version_dep:BOOL=OFF ${{ matrix.release.cmakeopts }}
186+
- name: "Build ssl_poll_perf with -DDEBUG"
187+
if: ${{ matrix.release.has-ssl_poll_perf }}
188+
working-directory: "./perftools/source"
189+
run: |
190+
cmake --build build_debug --config Debug --target ssl_poll_perf -j 4 -v
157191
- name: "Config perftools build"
158192
working-directory: "./perftools/source"
159193
run: |
@@ -180,30 +214,37 @@ jobs:
180214
openssl-branch: "openssl-3.0",
181215
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D "run_handshake_pool_size=handshake;;;-o 4"',
182216
configopts: 'no-tests',
217+
has-ssl_poll_perf: false,
183218
}, {
184219
openssl-branch: "openssl-3.2",
185220
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D "run_handshake_pool_size=handshake;;;-o 4"',
186221
configopts: 'no-apps no-tests',
222+
has-ssl_poll_perf: false,
187223
}, {
188224
openssl-branch: "openssl-3.3",
189225
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D "run_handshake_pool_size=handshake;;;-o 4"',
190226
configopts: 'no-apps no-tests',
227+
has-ssl_poll_perf: false,
191228
}, {
192229
openssl-branch: "openssl-3.4",
193230
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D "run_handshake_pool_size=handshake;;;-o 4"',
194231
configopts: 'no-apps no-tests',
232+
has-ssl_poll_perf: false,
195233
}, {
196234
openssl-branch: "openssl-3.5",
197235
cmakeopts: '-D "run_handshake_pool_size=handshake;;;-o 4"',
198236
configopts: 'no-apps no-tests',
237+
has-ssl_poll_perf: false,
199238
}, {
200239
openssl-branch: "openssl-3.6",
201240
cmakeopts: '-D "run_handshake_pool_size=handshake;;;-o 4"',
202241
configopts: 'no-apps no-tests',
242+
has-ssl_poll_perf: true,
203243
}, {
204244
openssl-branch: "master",
205245
cmakeopts: '',
206246
configopts: 'no-apps no-tests',
247+
has-ssl_poll_perf: true,
207248
}
208249
]
209250
runs-on: "ubuntu-latest"
@@ -254,6 +295,26 @@ jobs:
254295
uses: "actions/checkout@v5"
255296
with:
256297
path: "perftools"
298+
- name: "Config perftools build with -DDEBUG"
299+
if: ${{ matrix.release.has-ssl_poll_perf }}
300+
uses: "cross-platform-actions/action@fe0167d8082ac584754ef3ffb567fded22642c7d" #v0.27.0
301+
with:
302+
operating_system: "freebsd"
303+
version: "13.4"
304+
shutdown_vm: false
305+
run: |
306+
cd perftools/source
307+
cmake -S . -B build_debug -DOPENSSL_ROOT_DIR="$GITHUB_WORKSPACE/openssl" -DCMAKE_C_FLAGS="-DDEBUG -Werror" -Drun_add_version_dep:BOOL=OFF ${{ matrix.release.cmakeopts }}
308+
- name: "Build ssl_poll_perf with -DDEBUG"
309+
if: ${{ matrix.release.has-ssl_poll_perf }}
310+
uses: "cross-platform-actions/action@fe0167d8082ac584754ef3ffb567fded22642c7d" #v0.27.0
311+
with:
312+
operating_system: "freebsd"
313+
version: "13.4"
314+
shutdown_vm: false
315+
run: |
316+
cd perftools/source
317+
cmake --build build_debug --config Debug --target ssl_poll_perf -j 4 -v
257318
- name: "Config perftools build"
258319
uses: "cross-platform-actions/action@fe0167d8082ac584754ef3ffb567fded22642c7d" #v0.27.0
259320
with:
@@ -300,30 +361,37 @@ jobs:
300361
openssl-branch: "openssl-3.0",
301362
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;"',
302363
configopts: 'no-tests',
364+
has-ssl_poll_perf: false,
303365
}, {
304366
openssl-branch: "openssl-3.2",
305367
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;"',
306368
configopts: 'no-apps no-tests',
369+
has-ssl_poll_perf: false,
307370
}, {
308371
openssl-branch: "openssl-3.3",
309372
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;"',
310373
configopts: 'no-apps no-tests',
374+
has-ssl_poll_perf: false,
311375
}, {
312376
openssl-branch: "openssl-3.4",
313377
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;"',
314378
configopts: 'no-apps no-tests',
379+
has-ssl_poll_perf: false,
315380
}, {
316381
openssl-branch: "openssl-3.5",
317382
cmakeopts: '',
318383
configopts: 'no-apps no-tests',
384+
has-ssl_poll_perf: false,
319385
}, {
320386
openssl-branch: "openssl-3.6",
321387
cmakeopts: '',
322388
configopts: 'no-apps no-tests',
389+
has-ssl_poll_perf: true,
323390
}, {
324391
openssl-branch: "master",
325392
cmakeopts: '',
326393
configopts: 'no-apps no-tests',
394+
has-ssl_poll_perf: true,
327395
}
328396
]
329397
runs-on: "windows-latest"
@@ -355,6 +423,16 @@ jobs:
355423
uses: "actions/checkout@v5"
356424
with:
357425
path: "perftools"
426+
- name: "Config perftools build with -DDEBUG"
427+
if: ${{ matrix.release.has-ssl_poll_perf }}
428+
working-directory: ".\\perftools\\source"
429+
run: |
430+
cmake -S . -B .\build_debug -DOPENSSL_ROOT_DIR="$env:GITHUB_WORKSPACE\openssl" -DCMAKE_C_FLAGS="/DDEBUG" -Drun_add_version_dep:BOOL=OFF ${{ matrix.release.cmakeopts }}
431+
- name: "Build ssl_poll_perf with -DDEBUG"
432+
if: ${{ matrix.release.has-ssl_poll_perf }}
433+
working-directory: ".\\perftools\\source"
434+
run: |
435+
cmake --build .\build_debug --config Debug --target ssl_poll_perf -j 4 -v
358436
- name: "Config perftools build"
359437
working-directory: ".\\perftools\\source"
360438
run: |
@@ -381,30 +459,37 @@ jobs:
381459
openssl-branch: "openssl-3.0",
382460
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D "run_handshake_pool_size=handshake;;;-o 4"',
383461
configopts: 'no-tests',
462+
has-ssl_poll_perf: false,
384463
}, {
385464
openssl-branch: "openssl-3.2",
386465
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D "run_handshake_pool_size=handshake;;;-o 4"',
387466
configopts: 'no-apps no-tests',
467+
has-ssl_poll_perf: false,
388468
}, {
389469
openssl-branch: "openssl-3.3",
390470
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D "run_handshake_pool_size=handshake;;;-o 4"',
391471
configopts: 'no-apps no-tests',
472+
has-ssl_poll_perf: false,
392473
}, {
393474
openssl-branch: "openssl-3.4",
394475
cmakeopts: '-D "run_newrawkey_algos=newrawkey;-a;x25519" -D "run_evp_fetch_pqs=evp_fetch;;" -D "run_handshake_pool_size=handshake;;;-o 4"',
395476
configopts: 'no-apps no-tests',
477+
has-ssl_poll_perf: false,
396478
}, {
397479
openssl-branch: "openssl-3.5",
398480
cmakeopts: '-D "run_handshake_pool_size=handshake;;;-o 4"',
399481
configopts: 'no-apps no-tests',
482+
has-ssl_poll_perf: false,
400483
}, {
401484
openssl-branch: "openssl-3.6",
402485
cmakeopts: '-D "run_handshake_pool_size=handshake;;;-o 4"',
403486
configopts: 'no-apps no-tests',
487+
has-ssl_poll_perf: true,
404488
}, {
405489
openssl-branch: "master",
406490
cmakeopts: '',
407491
configopts: 'no-apps no-tests',
492+
has-ssl_poll_perf: true,
408493
}
409494
]
410495
runs-on: "macos-latest"
@@ -432,6 +517,16 @@ jobs:
432517
uses: "actions/checkout@v5"
433518
with:
434519
path: "perftools"
520+
- name: "Config perftools build with -DDEBUG"
521+
if: ${{ matrix.release.has-ssl_poll_perf }}
522+
working-directory: "./perftools/source"
523+
run: |
524+
cmake -S . -B build_debug -DOPENSSL_ROOT_DIR="$GITHUB_WORKSPACE/openssl" -DCMAKE_C_FLAGS="-DDEBUG -Werror" -Drun_add_version_dep:BOOL=OFF ${{ matrix.release.cmakeopts }}
525+
- name: "Build ssl_poll_perf with -DDEBUG"
526+
if: ${{ matrix.release.has-ssl_poll_perf }}
527+
working-directory: "./perftools/source"
528+
run: |
529+
cmake --build build_debug --config Debug --target ssl_poll_perf -j 4 -v
435530
- name: "Config perftools build"
436531
working-directory: "./perftools/source"
437532
run: |

0 commit comments

Comments
 (0)