Skip to content

Commit 7d2df49

Browse files
mattgodboltmattgodbolt
committed
Fix tests
1 parent 2b1b550 commit 7d2df49

File tree

5 files changed

+133
-54
lines changed

5 files changed

+133
-54
lines changed

‎bin/test/fortran_library_builder_test.py‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def test_get_toolchain_path_from_options_gcc_toolchain(requests_mock):
4343
install_context = mock.Mock(spec_set=InstallationContext)
4444
build_config = create_fortran_test_build_config()
4545
builder = FortranLibraryBuilder(
46-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
46+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
4747
)
4848

4949
options = "--gcc-toolchain=/opt/gfortran-11 -O2"
@@ -57,7 +57,7 @@ def test_get_toolchain_path_from_options_gxx_name(requests_mock):
5757
install_context = mock.Mock(spec_set=InstallationContext)
5858
build_config = create_fortran_test_build_config()
5959
builder = FortranLibraryBuilder(
60-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
60+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
6161
)
6262

6363
options = "--gxx-name=/opt/gcc/bin/g++ -std=f2008"
@@ -71,7 +71,7 @@ def test_get_toolchain_path_from_options_none(requests_mock):
7171
install_context = mock.Mock(spec_set=InstallationContext)
7272
build_config = create_fortran_test_build_config()
7373
builder = FortranLibraryBuilder(
74-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
74+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
7575
)
7676

7777
options = "-O2 -std=f2008"
@@ -85,7 +85,7 @@ def test_get_std_ver_from_options(requests_mock):
8585
install_context = mock.Mock(spec_set=InstallationContext)
8686
build_config = create_fortran_test_build_config()
8787
builder = FortranLibraryBuilder(
88-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
88+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
8989
)
9090

9191
options = "-std=f2018 -O2"
@@ -99,7 +99,7 @@ def test_get_std_lib_from_options(requests_mock):
9999
install_context = mock.Mock(spec_set=InstallationContext)
100100
build_config = create_fortran_test_build_config()
101101
builder = FortranLibraryBuilder(
102-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
102+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
103103
)
104104

105105
options = "-stdlib=libgfortran -O2"
@@ -113,7 +113,7 @@ def test_get_target_from_options(requests_mock):
113113
install_context = mock.Mock(spec_set=InstallationContext)
114114
build_config = create_fortran_test_build_config()
115115
builder = FortranLibraryBuilder(
116-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
116+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
117117
)
118118

119119
options = "-target aarch64-linux-gnu -O2"
@@ -127,7 +127,7 @@ def test_replace_optional_arg_with_value(requests_mock):
127127
install_context = mock.Mock(spec_set=InstallationContext)
128128
build_config = create_fortran_test_build_config()
129129
builder = FortranLibraryBuilder(
130-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
130+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
131131
)
132132

133133
arg = "fpm build --arch=%arch% --build=%buildtype%"
@@ -141,7 +141,7 @@ def test_replace_optional_arg_no_value(requests_mock):
141141
install_context = mock.Mock(spec_set=InstallationContext)
142142
build_config = create_fortran_test_build_config()
143143
builder = FortranLibraryBuilder(
144-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
144+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
145145
)
146146

147147
arg = "fpm build %arch?% --build=%buildtype%"
@@ -155,7 +155,7 @@ def test_expand_make_arg(requests_mock):
155155
install_context = mock.Mock(spec_set=InstallationContext)
156156
build_config = create_fortran_test_build_config()
157157
builder = FortranLibraryBuilder(
158-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
158+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
159159
)
160160

161161
arg = "--arch=%arch% --build=%buildtype% --std=%stdver%"
@@ -171,7 +171,7 @@ def test_get_conan_hash_success(mock_subprocess, requests_mock):
171171
install_context.dry_run = False
172172
build_config = create_fortran_test_build_config()
173173
builder = FortranLibraryBuilder(
174-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
174+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
175175
)
176176

177177
mock_subprocess.return_value = b"conanfile.py: ID: fortran123456\nOther output"
@@ -192,7 +192,7 @@ def test_execute_build_script_success(mock_subprocess, requests_mock):
192192
install_context = mock.Mock(spec_set=InstallationContext)
193193
build_config = create_fortran_test_build_config()
194194
builder = FortranLibraryBuilder(
195-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
195+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
196196
)
197197

198198
mock_subprocess.return_value = 0
@@ -210,7 +210,7 @@ def test_execute_build_script_timeout(mock_subprocess, requests_mock):
210210
install_context = mock.Mock(spec_set=InstallationContext)
211211
build_config = create_fortran_test_build_config()
212212
builder = FortranLibraryBuilder(
213-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
213+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
214214
)
215215

216216
mock_subprocess.side_effect = TimeoutExpired("cmd", 600)
@@ -227,7 +227,7 @@ def test_conanproxy_login_success(mock_get_ssm, requests_mock):
227227
install_context = mock.Mock(spec_set=InstallationContext)
228228
build_config = create_fortran_test_build_config()
229229
builder = FortranLibraryBuilder(
230-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
230+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
231231
)
232232

233233
mock_get_ssm.return_value = "fortran_password"
@@ -249,7 +249,7 @@ def test_makebuildhash(requests_mock):
249249
install_context = mock.Mock(spec_set=InstallationContext)
250250
build_config = create_fortran_test_build_config()
251251
builder = FortranLibraryBuilder(
252-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
252+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
253253
)
254254

255255
result = builder.makebuildhash(
@@ -266,7 +266,7 @@ def test_does_compiler_support_fixed_target_match(requests_mock):
266266
install_context = mock.Mock(spec_set=InstallationContext)
267267
build_config = create_fortran_test_build_config()
268268
builder = FortranLibraryBuilder(
269-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
269+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
270270
)
271271

272272
result = builder.does_compiler_support(
@@ -281,7 +281,7 @@ def test_does_compiler_support_fixed_target_mismatch(requests_mock):
281281
install_context = mock.Mock(spec_set=InstallationContext)
282282
build_config = create_fortran_test_build_config()
283283
builder = FortranLibraryBuilder(
284-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
284+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
285285
)
286286

287287
result = builder.does_compiler_support("/usr/bin/gfortran", "fortran", "x86", "-target x86_64-linux-gnu", "")
@@ -294,7 +294,7 @@ def test_get_commit_hash_with_git(requests_mock):
294294
install_context = mock.Mock(spec_set=InstallationContext)
295295
build_config = create_fortran_test_build_config()
296296
builder = FortranLibraryBuilder(
297-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
297+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
298298
)
299299

300300
with patch("os.path.exists", return_value=True):
@@ -312,7 +312,7 @@ def test_get_commit_hash_without_git(requests_mock):
312312
install_context = mock.Mock(spec_set=InstallationContext)
313313
build_config = create_fortran_test_build_config()
314314
builder = FortranLibraryBuilder(
315-
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False
315+
logger, "fortran", "fortranlib", "2.0.0", "/tmp/source", install_context, build_config, False, 1
316316
)
317317

318318
with patch("os.path.exists", return_value=False):

‎bin/test/library_builder_test.py‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def test_get_toolchain_path_from_options_gcc_toolchain(requests_mock):
100100
install_context = mock.Mock(spec_set=InstallationContext)
101101
build_config = create_test_build_config()
102102
builder = LibraryBuilder(
103-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
103+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
104104
)
105105

106106
options = "--gcc-toolchain=/opt/gcc-11 -O2"
@@ -114,7 +114,7 @@ def test_get_toolchain_path_from_options_gxx_name(requests_mock):
114114
install_context = mock.Mock(spec_set=InstallationContext)
115115
build_config = create_test_build_config()
116116
builder = LibraryBuilder(
117-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
117+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
118118
)
119119

120120
options = "--gxx-name=/opt/gcc/bin/g++ -std=c++17"
@@ -128,7 +128,7 @@ def test_get_toolchain_path_from_options_none(requests_mock):
128128
install_context = mock.Mock(spec_set=InstallationContext)
129129
build_config = create_test_build_config()
130130
builder = LibraryBuilder(
131-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
131+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
132132
)
133133

134134
options = "-O2 -std=c++17"
@@ -142,7 +142,7 @@ def test_get_sysroot_path_from_options(requests_mock):
142142
install_context = mock.Mock(spec_set=InstallationContext)
143143
build_config = create_test_build_config()
144144
builder = LibraryBuilder(
145-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
145+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
146146
)
147147

148148
options = "--sysroot=/opt/sysroot -O2"
@@ -156,7 +156,7 @@ def test_get_std_ver_from_options(requests_mock):
156156
install_context = mock.Mock(spec_set=InstallationContext)
157157
build_config = create_test_build_config()
158158
builder = LibraryBuilder(
159-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
159+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
160160
)
161161

162162
options = "-std=c++17 -O2"
@@ -170,7 +170,7 @@ def test_get_std_lib_from_options(requests_mock):
170170
install_context = mock.Mock(spec_set=InstallationContext)
171171
build_config = create_test_build_config()
172172
builder = LibraryBuilder(
173-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
173+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
174174
)
175175

176176
options = "-stdlib=libc++ -O2"
@@ -184,7 +184,7 @@ def test_get_target_from_options(requests_mock):
184184
install_context = mock.Mock(spec_set=InstallationContext)
185185
build_config = create_test_build_config()
186186
builder = LibraryBuilder(
187-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
187+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
188188
)
189189

190190
options = "-target x86_64-linux-gnu -O2"
@@ -198,7 +198,7 @@ def test_replace_optional_arg_with_value(requests_mock):
198198
install_context = mock.Mock(spec_set=InstallationContext)
199199
build_config = create_test_build_config()
200200
builder = LibraryBuilder(
201-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
201+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
202202
)
203203

204204
arg = "cmake -DARCH=%arch% -DBUILD=%buildtype%"
@@ -212,7 +212,7 @@ def test_replace_optional_arg_no_value(requests_mock):
212212
install_context = mock.Mock(spec_set=InstallationContext)
213213
build_config = create_test_build_config()
214214
builder = LibraryBuilder(
215-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
215+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
216216
)
217217

218218
arg = "cmake %arch?% -DBUILD=%buildtype%"
@@ -226,7 +226,7 @@ def test_expand_make_arg(requests_mock):
226226
install_context = mock.Mock(spec_set=InstallationContext)
227227
build_config = create_test_build_config()
228228
builder = LibraryBuilder(
229-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
229+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
230230
)
231231

232232
arg = "-DARCH=%arch% -DBUILD=%buildtype% -DSTD=%stdver%"
@@ -242,7 +242,7 @@ def test_get_conan_hash_success(mock_subprocess, requests_mock):
242242
install_context.dry_run = False
243243
build_config = create_test_build_config()
244244
builder = LibraryBuilder(
245-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
245+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
246246
)
247247

248248
mock_subprocess.return_value = b"conanfile.py: ID: abc123def456\nOther output"
@@ -263,7 +263,7 @@ def test_execute_build_script_success(mock_subprocess, requests_mock):
263263
install_context = mock.Mock(spec_set=InstallationContext)
264264
build_config = create_test_build_config()
265265
builder = LibraryBuilder(
266-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
266+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
267267
)
268268

269269
mock_subprocess.return_value = 0
@@ -281,7 +281,7 @@ def test_execute_build_script_timeout(mock_subprocess, requests_mock):
281281
install_context = mock.Mock(spec_set=InstallationContext)
282282
build_config = create_test_build_config()
283283
builder = LibraryBuilder(
284-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
284+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
285285
)
286286

287287
mock_subprocess.side_effect = TimeoutExpired("cmd", 600)
@@ -298,7 +298,7 @@ def test_conanproxy_login_success(mock_get_ssm, requests_mock):
298298
install_context = mock.Mock(spec_set=InstallationContext)
299299
build_config = create_test_build_config()
300300
builder = LibraryBuilder(
301-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
301+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
302302
)
303303

304304
mock_get_ssm.return_value = "test_password"
@@ -321,7 +321,7 @@ def test_conanproxy_login_with_env_var(mock_get_ssm, requests_mock):
321321
install_context = mock.Mock(spec_set=InstallationContext)
322322
build_config = create_test_build_config()
323323
builder = LibraryBuilder(
324-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
324+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
325325
)
326326

327327
mock_response = mock.Mock()
@@ -342,7 +342,7 @@ def test_does_compiler_support_fixed_target_match(requests_mock):
342342
install_context = mock.Mock(spec_set=InstallationContext)
343343
build_config = create_test_build_config()
344344
builder = LibraryBuilder(
345-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
345+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
346346
)
347347

348348
result = builder.does_compiler_support("/usr/bin/gcc", "gcc", "x86_64-linux-gnu", "-target x86_64-linux-gnu", "")
@@ -355,7 +355,7 @@ def test_does_compiler_support_fixed_target_mismatch(requests_mock):
355355
install_context = mock.Mock(spec_set=InstallationContext)
356356
build_config = create_test_build_config()
357357
builder = LibraryBuilder(
358-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
358+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
359359
)
360360

361361
result = builder.does_compiler_support("/usr/bin/gcc", "gcc", "x86", "-target x86_64-linux-gnu", "")
@@ -368,7 +368,7 @@ def test_script_env_linux(requests_mock):
368368
install_context = mock.Mock(spec_set=InstallationContext)
369369
build_config = create_test_build_config()
370370
builder = LibraryBuilder(
371-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
371+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
372372
)
373373

374374
result = builder.script_env("CC", "/usr/bin/gcc")
@@ -382,7 +382,7 @@ def test_count_headers(mock_glob, requests_mock):
382382
install_context = mock.Mock(spec_set=InstallationContext)
383383
build_config = create_test_build_config()
384384
builder = LibraryBuilder(
385-
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux
385+
logger, "cpp", "testlib", "1.0.0", "/tmp/source", install_context, build_config, False, LibraryPlatform.Linux, 1
386386
)
387387

388388
mock_glob.side_effect = [

0 commit comments

Comments
 (0)