Skip to content

Commit ec292a8

Browse files
authored
[native_toolchain_c] Pass in archiver from environment in test - take 2 (#1461)
1 parent 6eeb6d9 commit ec292a8

7 files changed

Lines changed: 35 additions & 70 deletions

File tree

‎pkgs/native_toolchain_c/test/cbuilder/cbuilder_build_failure_test.dart‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ void main() {
3737
targetOS: OS.current,
3838
linkModePreference: LinkModePreference.dynamic,
3939
buildMode: BuildMode.release,
40-
cCompiler: CCompilerConfig(
41-
compiler: cc,
42-
envScript: envScript,
43-
envScriptArgs: envScriptArgs,
44-
),
40+
cCompiler: cCompiler,
4541
linkingEnabled: false,
4642
);
4743
final buildOutput = BuildOutput();

‎pkgs/native_toolchain_c/test/cbuilder/cbuilder_test.dart‎

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,7 @@ void main() {
5252
buildMode: buildMode,
5353
// Ignored by executables.
5454
linkModePreference: LinkModePreference.dynamic,
55-
cCompiler: CCompilerConfig(
56-
compiler: cc,
57-
envScript: envScript,
58-
envScriptArgs: envScriptArgs,
59-
),
55+
cCompiler: cCompiler,
6056
linkingEnabled: false,
6157
);
6258
final buildOutput = BuildOutput();
@@ -132,11 +128,7 @@ void main() {
132128
targetOS: OS.current,
133129
buildMode: BuildMode.release,
134130
linkModePreference: LinkModePreference.dynamic,
135-
cCompiler: CCompilerConfig(
136-
compiler: cc,
137-
envScript: envScript,
138-
envScriptArgs: envScriptArgs,
139-
),
131+
cCompiler: cCompiler,
140132
linkingEnabled: false,
141133
);
142134
final buildOutput = BuildOutput();
@@ -226,11 +218,7 @@ void main() {
226218
buildMode: BuildMode.release,
227219
// Ignored by executables.
228220
linkModePreference: LinkModePreference.dynamic,
229-
cCompiler: CCompilerConfig(
230-
compiler: cc,
231-
envScript: envScript,
232-
envScriptArgs: envScriptArgs,
233-
),
221+
cCompiler: cCompiler,
234222
linkingEnabled: false,
235223
);
236224
final buildOutput = BuildOutput();
@@ -284,11 +272,7 @@ void main() {
284272
targetOS: OS.current,
285273
buildMode: BuildMode.release,
286274
linkModePreference: LinkModePreference.dynamic,
287-
cCompiler: CCompilerConfig(
288-
compiler: cc,
289-
envScript: envScript,
290-
envScriptArgs: envScriptArgs,
291-
),
275+
cCompiler: cCompiler,
292276
linkingEnabled: false,
293277
);
294278
final buildOutput = BuildOutput();
@@ -330,11 +314,7 @@ void main() {
330314
targetOS: OS.current,
331315
buildMode: BuildMode.release,
332316
linkModePreference: LinkModePreference.dynamic,
333-
cCompiler: CCompilerConfig(
334-
compiler: cc,
335-
envScript: envScript,
336-
envScriptArgs: envScriptArgs,
337-
),
317+
cCompiler: cCompiler,
338318
linkingEnabled: false,
339319
);
340320
final buildOutput = BuildOutput();
@@ -390,11 +370,7 @@ void main() {
390370
targetOS: OS.current,
391371
// Ignored by executables.
392372
linkModePreference: LinkModePreference.dynamic,
393-
cCompiler: CCompilerConfig(
394-
compiler: cc,
395-
envScript: envScript,
396-
envScriptArgs: envScriptArgs,
397-
),
373+
cCompiler: cCompiler,
398374
linkingEnabled: false,
399375
);
400376
final buildOutput = BuildOutput();
@@ -455,11 +431,7 @@ void main() {
455431
targetOS: OS.current,
456432
// Ignored by executables.
457433
linkModePreference: LinkModePreference.dynamic,
458-
cCompiler: CCompilerConfig(
459-
compiler: cc,
460-
envScript: envScript,
461-
envScriptArgs: envScriptArgs,
462-
),
434+
cCompiler: cCompiler,
463435
linkingEnabled: false,
464436
);
465437
final buildOutput = BuildOutput();
@@ -527,11 +499,7 @@ Future<void> testDefines({
527499
buildMode: buildMode,
528500
// Ignored by executables.
529501
linkModePreference: LinkModePreference.dynamic,
530-
cCompiler: CCompilerConfig(
531-
compiler: cc,
532-
envScript: envScript,
533-
envScriptArgs: envScriptArgs,
534-
),
502+
cCompiler: cCompiler,
535503
linkingEnabled: false,
536504
);
537505
final buildOutput = BuildOutput();

‎pkgs/native_toolchain_c/test/cbuilder/objective_c_test.dart‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@ void main() {
4343
targetArchitecture: Architecture.current,
4444
targetOS: OS.current,
4545
linkModePreference: LinkModePreference.dynamic,
46-
cCompiler: CCompilerConfig(
47-
compiler: cc,
48-
envScript: envScript,
49-
envScriptArgs: envScriptArgs,
50-
),
46+
cCompiler: cCompiler,
5147
linkingEnabled: false,
5248
);
5349
final buildOutput = BuildOutput();

‎pkgs/native_toolchain_c/test/clinker/build_testfiles.dart‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@ Future<Uri> buildTestArchive(
3333
targetOS: os,
3434
buildMode: BuildMode.release,
3535
linkModePreference: LinkModePreference.dynamic,
36-
cCompiler: CCompilerConfig(
37-
compiler: cc,
38-
envScript: envScript,
39-
envScriptArgs: envScriptArgs,
40-
),
36+
cCompiler: cCompiler,
4137
linkingEnabled: false,
4238
);
4339
final buildOutput = BuildOutput();

‎pkgs/native_toolchain_c/test/clinker/objects_test.dart‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ Future<void> main() async {
3131
final tempUri = await tempDirForTest();
3232

3333
final uri = await buildTestArchive(tempUri, os, architecture);
34-
3534
final linkConfig = LinkConfig.build(
3635
outputDirectory: tempUri,
3736
packageName: 'testpackage',
@@ -41,14 +40,10 @@ Future<void> main() async {
4140
buildMode: BuildMode.debug,
4241
linkModePreference: LinkModePreference.dynamic,
4342
assets: [],
44-
cCompiler: CCompilerConfig(
45-
compiler: cc,
46-
archiver: ar,
47-
linker: ld,
48-
envScript: envScript,
49-
envScriptArgs: envScriptArgs,
50-
),
43+
cCompiler: cCompiler,
5144
);
45+
printOnFailure(linkConfig.cCompiler.toString());
46+
printOnFailure(Platform.environment.keys.toList().toString());
5247
await CLinker.library(
5348
name: name,
5449
assetName: '',

‎pkgs/native_toolchain_c/test/clinker/treeshake_helper.dart‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,10 @@ Future<void> runTests(List<Architecture> architectures) async {
6767
buildMode: BuildMode.release,
6868
linkModePreference: LinkModePreference.dynamic,
6969
assets: [],
70+
cCompiler: cCompiler,
7071
);
72+
printOnFailure(config.cCompiler.toString());
73+
printOnFailure(Platform.environment.keys.toList().toString());
7174
await clinker.linker([testArchive.toFilePath()]).run(
7275
config: config,
7376
output: linkOutput,

‎pkgs/native_toolchain_c/test/helpers.dart‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,31 +123,42 @@ String unparseKey(String key) => key.replaceAll('.', '__').toUpperCase();
123123
/// Archiver provided by the environment.
124124
///
125125
/// Provided on Dart CI.
126-
final Uri? ar = Platform.environment[unparseKey('c_compiler.ar')]?.asFileUri();
126+
final Uri? _ar = Platform.environment[unparseKey('c_compiler.ar')]?.asFileUri();
127127

128128
/// Compiler provided by the environment.
129129
///
130130
/// Provided on Dart CI.
131-
final Uri? cc = Platform.environment[unparseKey('c_compiler.cc')]?.asFileUri();
131+
final Uri? _cc = Platform.environment[unparseKey('c_compiler.cc')]?.asFileUri();
132132

133133
/// Linker provided by the environment.
134134
///
135135
/// Provided on Dart CI.
136-
final Uri? ld = Platform.environment[unparseKey('c_compiler.ld')]?.asFileUri();
136+
final Uri? _ld = Platform.environment[unparseKey('c_compiler.ld')]?.asFileUri();
137137

138-
/// Path to script that sets environment variables for [cc], [ld], and [ar].
138+
/// Path to script that sets environment variables for [_cc], [_ld], and [_ar].
139139
///
140140
/// Provided on Dart CI.
141-
final Uri? envScript =
141+
final Uri? _envScript =
142142
Platform.environment[unparseKey('c_compiler.env_script')]?.asFileUri();
143143

144-
/// Arguments for [envScript] provided by environment.
144+
/// Arguments for [_envScript] provided by environment.
145145
///
146146
/// Provided on Dart CI.
147-
final List<String>? envScriptArgs = Platform
147+
final List<String>? _envScriptArgs = Platform
148148
.environment[unparseKey('c_compiler.env_script_arguments')]
149149
?.split(' ');
150150

151+
/// Configuration for the native toolchain.
152+
///
153+
/// Provided on Dart CI.
154+
final cCompiler = CCompilerConfig(
155+
compiler: _cc,
156+
archiver: _ar,
157+
linker: _ld,
158+
envScript: _envScript,
159+
envScriptArgs: _envScriptArgs,
160+
);
161+
151162
extension on String {
152163
Uri asFileUri() => Uri.file(this);
153164
}

0 commit comments

Comments
 (0)