Skip to content

Commit 2b90b3e

Browse files
mkannwischerhanno-becker
authored andcommitted
config-variations CI: avoid config include via relative path
Signed-off-by: Matthias J. Kannwischer <matthias@kannwischer.eu>
1 parent c3283f9 commit 2b90b3e

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

.github/actions/config-variations/action.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ runs:
3737
shell: bash
3838
run: |
3939
make clean
40-
CFLAGS='-DMLD_CONFIG_FILE=\"../../test/break_pct_config.h\"' make func -j4
40+
CFLAGS='-Itest -DMLD_CONFIG_FILE=\"break_pct_config.h\"' make func -j4
4141
# PCT breakage is done at runtime via MLD_BREAK_PCT
4242
make run_func # Should be OK
4343
MLD_BREAK_PCT=0 make run_func # Should be OK
@@ -53,7 +53,7 @@ runs:
5353
with:
5454
gh_token: ${{ inputs.gh_token }}
5555
compile_mode: native
56-
cflags: "-std=c11 -D_GNU_SOURCE -DMLD_CONFIG_FILE=\\\\\\\"../../test/custom_zeroize_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
56+
cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_zeroize_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
5757
ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
5858
func: true
5959
kat: true
@@ -66,7 +66,7 @@ runs:
6666
with:
6767
gh_token: ${{ inputs.gh_token }}
6868
compile_mode: native
69-
cflags: "-std=c11 -D_GNU_SOURCE -DMLD_CONFIG_FILE=\\\\\\\"../../test/custom_native_capability_config_1.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
69+
cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_native_capability_config_1.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
7070
ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
7171
func: true
7272
kat: true
@@ -79,7 +79,7 @@ runs:
7979
with:
8080
gh_token: ${{ inputs.gh_token }}
8181
compile_mode: native
82-
cflags: "-std=c11 -D_GNU_SOURCE -DMLD_CONFIG_FILE=\\\\\\\"../../test/custom_native_capability_config_0.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
82+
cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_native_capability_config_0.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
8383
ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
8484
func: true
8585
kat: true
@@ -92,7 +92,7 @@ runs:
9292
with:
9393
gh_token: ${{ inputs.gh_token }}
9494
compile_mode: native
95-
cflags: "-std=c11 -march=armv8.4-a+sha3 -D_GNU_SOURCE -DMLD_CONFIG_FILE=\\\\\\\"../../test/custom_native_capability_config_ID_AA64PFR1_EL1.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
95+
cflags: "-std=c11 -march=armv8.4-a+sha3 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_native_capability_config_ID_AA64PFR1_EL1.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
9696
ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
9797
func: true
9898
kat: true
@@ -105,7 +105,7 @@ runs:
105105
with:
106106
gh_token: ${{ inputs.gh_token }}
107107
compile_mode: native
108-
cflags: "-std=c11 -mavx2 -mbmi2 -mpopcnt -D_GNU_SOURCE -DMLD_CONFIG_FILE=\\\\\\\"../../test/custom_native_capability_config_CPUID_AVX2.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
108+
cflags: "-std=c11 -mavx2 -mbmi2 -mpopcnt -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_native_capability_config_CPUID_AVX2.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
109109
ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
110110
func: true
111111
kat: true
@@ -118,7 +118,7 @@ runs:
118118
with:
119119
gh_token: ${{ inputs.gh_token }}
120120
compile_mode: native
121-
cflags: "-std=c11 -D_GNU_SOURCE -DMLD_CONFIG_FILE=\\\\\\\"../../test/no_asm_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
121+
cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"no_asm_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
122122
ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
123123
func: true
124124
kat: true
@@ -131,7 +131,7 @@ runs:
131131
with:
132132
gh_token: ${{ inputs.gh_token }}
133133
compile_mode: native
134-
cflags: "-std=c11 -D_GNU_SOURCE -DMLD_CONFIG_FILE=\\\\\\\"../../test/serial_fips202_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
134+
cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"serial_fips202_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
135135
ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
136136
func: true
137137
kat: true
@@ -144,7 +144,7 @@ runs:
144144
with:
145145
gh_token: ${{ inputs.gh_token }}
146146
compile_mode: native
147-
cflags: "-std=c11 -D_GNU_SOURCE -DMLD_CONFIG_FILE=\\\\\\\"../../test/custom_randombytes_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
147+
cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_randombytes_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
148148
ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
149149
func: true
150150
kat: true
@@ -157,7 +157,7 @@ runs:
157157
with:
158158
gh_token: ${{ inputs.gh_token }}
159159
compile_mode: native
160-
cflags: "-std=c11 -D_GNU_SOURCE -DMLD_CONFIG_FILE=\\\\\\\"../../test/custom_memcpy_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
160+
cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_memcpy_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
161161
ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
162162
func: true
163163
kat: true
@@ -170,7 +170,7 @@ runs:
170170
with:
171171
gh_token: ${{ inputs.gh_token }}
172172
compile_mode: native
173-
cflags: "-std=c11 -D_GNU_SOURCE -DMLD_CONFIG_FILE=\\\\\\\"../../test/custom_memset_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
173+
cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_memset_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
174174
ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
175175
func: true
176176
kat: true
@@ -183,7 +183,7 @@ runs:
183183
with:
184184
gh_token: ${{ inputs.gh_token }}
185185
compile_mode: native
186-
cflags: "-std=c11 -D_GNU_SOURCE -DMLD_CONFIG_FILE=\\\\\\\"../../test/custom_stdlib_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
186+
cflags: "-std=c11 -D_GNU_SOURCE -Itest -DMLD_CONFIG_FILE=\\\\\\\"custom_stdlib_config.h\\\\\\\" -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
187187
ldflags: "-fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all"
188188
func: true
189189
kat: true

0 commit comments

Comments
 (0)