Skip to content

Commit cb2c8fa

Browse files
authored
[native_*] Unify CCompilerConfig handling in tests (#1520)
1 parent 0ecd5fd commit cb2c8fa

6 files changed

Lines changed: 97 additions & 78 deletions

File tree

‎pkgs/native_assets_builder/test/helpers.dart‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,38 +128,49 @@ String unparseKey(String key) => key.replaceAll('.', '__').toUpperCase();
128128
/// Archiver provided by the environment.
129129
///
130130
/// Provided on Dart CI.
131-
final Uri? ar = Platform
131+
final Uri? _ar = Platform
132132
.environment[unparseKey(internal.CCompilerConfigImpl.arConfigKeyFull)]
133133
?.asFileUri();
134134

135135
/// Compiler provided by the environment.
136136
///
137137
/// Provided on Dart CI.
138-
final Uri? cc = Platform
138+
final Uri? _cc = Platform
139139
.environment[unparseKey(internal.CCompilerConfigImpl.ccConfigKeyFull)]
140140
?.asFileUri();
141141

142142
/// Linker provided by the environment.
143143
///
144144
/// Provided on Dart CI.
145-
final Uri? ld = Platform
145+
final Uri? _ld = Platform
146146
.environment[unparseKey(internal.CCompilerConfigImpl.ldConfigKeyFull)]
147147
?.asFileUri();
148148

149-
/// Path to script that sets environment variables for [cc], [ld], and [ar].
149+
/// Path to script that sets environment variables for [_cc], [_ld], and [_ar].
150150
///
151151
/// Provided on Dart CI.
152-
final Uri? envScript = Platform.environment[
152+
final Uri? _envScript = Platform.environment[
153153
unparseKey(internal.CCompilerConfigImpl.envScriptConfigKeyFull)]
154154
?.asFileUri();
155155

156-
/// Arguments for [envScript] provided by environment.
156+
/// Arguments for [_envScript] provided by environment.
157157
///
158158
/// Provided on Dart CI.
159-
final List<String>? envScriptArgs = Platform.environment[
159+
final List<String>? _envScriptArgs = Platform.environment[
160160
unparseKey(internal.CCompilerConfigImpl.envScriptArgsConfigKeyFull)]
161161
?.split(' ');
162162

163+
/// Configuration for the native toolchain.
164+
///
165+
/// Provided on Dart CI.
166+
final cCompiler = internal.CCompilerConfigImpl(
167+
compiler: _cc,
168+
archiver: _ar,
169+
linker: _ld,
170+
envScript: _envScript,
171+
envScriptArgs: _envScriptArgs,
172+
);
173+
163174
extension on String {
164175
Uri asFileUri() => Uri.file(this);
165176
}

‎pkgs/native_assets_builder/test/test_data/native_dynamic_linking_test.dart‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,7 @@ void main() async {
4040
linkingEnabled: false,
4141
targetArchitecture: dryRun ? null : ArchitectureImpl.current,
4242
buildMode: dryRun ? null : BuildModeImpl.debug,
43-
cCompiler: dryRun
44-
? null
45-
: CCompilerConfigImpl(
46-
compiler: cc,
47-
envScript: envScript,
48-
envScriptArgs: envScriptArgs,
49-
),
43+
cCompiler: dryRun ? null : cCompiler,
5044
);
5145

5246
final buildConfigUri = testTempUri.resolve('build_config.json');

‎pkgs/native_assets_cli/test/example/local_asset_test.dart‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
})
99
library;
1010

11+
import 'dart:convert';
1112
import 'dart:io';
1213

1314
import 'package:native_assets_cli/native_assets_cli_internal.dart';
@@ -35,29 +36,29 @@ void main() async {
3536
final testPackageUri = packageUri.resolve('example/build/$name/');
3637
final dartUri = Uri.file(Platform.resolvedExecutable);
3738

39+
final config = BuildConfigImpl(
40+
outputDirectory: tempUri,
41+
packageName: name,
42+
packageRoot: testPackageUri,
43+
targetOS: OSImpl.current,
44+
version: HookConfigImpl.latestVersion,
45+
linkModePreference: LinkModePreferenceImpl.dynamic,
46+
dryRun: dryRun,
47+
linkingEnabled: false,
48+
targetArchitecture: dryRun ? null : ArchitectureImpl.current,
49+
buildMode: dryRun ? null : BuildModeImpl.debug,
50+
cCompiler: dryRun ? null : cCompiler,
51+
);
52+
53+
final buildConfigUri = testTempUri.resolve('build_config.json');
54+
await File.fromUri(buildConfigUri)
55+
.writeAsString(jsonEncode(config.toJson()));
56+
3857
final processResult = await Process.run(
3958
dartUri.toFilePath(),
4059
[
4160
'hook/build.dart',
42-
'-Dout_dir=${tempUri.toFilePath()}',
43-
'-Dpackage_name=$name',
44-
'-Dpackage_root=${testPackageUri.toFilePath()}',
45-
'-Dtarget_os=${OSImpl.current}',
46-
'-Dversion=${HookConfigImpl.latestVersion}',
47-
'-Dlinking_enabled=0',
48-
'-Dlink_mode_preference=dynamic',
49-
'-Ddry_run=$dryRun',
50-
if (!dryRun) ...[
51-
'-Dtarget_architecture=${ArchitectureImpl.current}',
52-
'-Dbuild_mode=debug',
53-
if (cc != null) '-Dcc=${cc!.toFilePath()}',
54-
if (envScript != null)
55-
'-D${CCompilerConfigImpl.envScriptConfigKeyFull}='
56-
'${envScript!.toFilePath()}',
57-
if (envScriptArgs != null)
58-
'-D${CCompilerConfigImpl.envScriptArgsConfigKeyFull}='
59-
'${envScriptArgs!.join(' ')}',
60-
],
61+
'--config=${buildConfigUri.toFilePath()}',
6162
],
6263
workingDirectory: testPackageUri.toFilePath(),
6364
);

‎pkgs/native_assets_cli/test/example/native_add_library_test.dart‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
})
99
library;
1010

11+
import 'dart:convert';
1112
import 'dart:io';
1213

1314
import 'package:native_assets_cli/native_assets_cli_internal.dart';
@@ -35,29 +36,29 @@ void main() async {
3536
final testPackageUri = packageUri.resolve('example/build/$name/');
3637
final dartUri = Uri.file(Platform.resolvedExecutable);
3738

39+
final config = BuildConfigImpl(
40+
outputDirectory: tempUri,
41+
packageName: name,
42+
packageRoot: testPackageUri,
43+
targetOS: OSImpl.current,
44+
version: HookConfigImpl.latestVersion,
45+
linkModePreference: LinkModePreferenceImpl.dynamic,
46+
dryRun: dryRun,
47+
linkingEnabled: false,
48+
targetArchitecture: dryRun ? null : ArchitectureImpl.current,
49+
buildMode: dryRun ? null : BuildModeImpl.debug,
50+
cCompiler: dryRun ? null : cCompiler,
51+
);
52+
53+
final buildConfigUri = testTempUri.resolve('build_config.json');
54+
await File.fromUri(buildConfigUri)
55+
.writeAsString(jsonEncode(config.toJson()));
56+
3857
final processResult = await Process.run(
3958
dartUri.toFilePath(),
4059
[
4160
'hook/build.dart',
42-
'-Dout_dir=${tempUri.toFilePath()}',
43-
'-Dpackage_name=$name',
44-
'-Dpackage_root=${testPackageUri.toFilePath()}',
45-
'-Dtarget_os=${OSImpl.current}',
46-
'-Dversion=${HookConfigImpl.latestVersion}',
47-
'-Dlinking_enabled=0',
48-
'-Dlink_mode_preference=dynamic',
49-
'-Ddry_run=$dryRun',
50-
if (!dryRun) ...[
51-
'-Dtarget_architecture=${ArchitectureImpl.current}',
52-
'-Dbuild_mode=debug',
53-
if (cc != null) '-Dcc=${cc!.toFilePath()}',
54-
if (envScript != null)
55-
'-D${CCompilerConfigImpl.envScriptConfigKeyFull}='
56-
'${envScript!.toFilePath()}',
57-
if (envScriptArgs != null)
58-
'-D${CCompilerConfigImpl.envScriptArgsConfigKeyFull}='
59-
'${envScriptArgs!.join(' ')}',
60-
],
61+
'--config=${buildConfigUri.toFilePath()}',
6162
],
6263
workingDirectory: testPackageUri.toFilePath(),
6364
);

‎pkgs/native_assets_cli/test/example/native_dynamic_linking_test.dart‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
@TestOn('!windows')
1212
library;
1313

14+
import 'dart:convert';
1415
import 'dart:io';
1516

1617
import 'package:native_assets_cli/native_assets_cli_internal.dart';
@@ -44,29 +45,29 @@ void main() async {
4445
final testPackageUri = packageUri.resolve('example/build/$name/');
4546
final dartUri = Uri.file(Platform.resolvedExecutable);
4647

48+
final config = BuildConfigImpl(
49+
outputDirectory: tempUri,
50+
packageName: name,
51+
packageRoot: testPackageUri,
52+
targetOS: OSImpl.current,
53+
version: HookConfigImpl.latestVersion,
54+
linkModePreference: LinkModePreferenceImpl.dynamic,
55+
dryRun: dryRun,
56+
linkingEnabled: false,
57+
targetArchitecture: dryRun ? null : ArchitectureImpl.current,
58+
buildMode: dryRun ? null : BuildModeImpl.debug,
59+
cCompiler: dryRun ? null : cCompiler,
60+
);
61+
62+
final buildConfigUri = testTempUri.resolve('build_config.json');
63+
File.fromUri(buildConfigUri)
64+
.writeAsStringSync(jsonEncode(config.toJson()));
65+
4766
final processResult = await Process.run(
4867
dartUri.toFilePath(),
4968
[
5069
'hook/build.dart',
51-
'-Dout_dir=${tempUri.toFilePath()}',
52-
'-Dpackage_name=$name',
53-
'-Dpackage_root=${testPackageUri.toFilePath()}',
54-
'-Dtarget_os=${OSImpl.current}',
55-
'-Dversion=${HookConfigImpl.latestVersion}',
56-
'-Dlinking_enabled=0',
57-
'-Dlink_mode_preference=dynamic',
58-
'-Ddry_run=$dryRun',
59-
if (!dryRun) ...[
60-
'-Dtarget_architecture=${ArchitectureImpl.current}',
61-
'-Dbuild_mode=debug',
62-
if (cc != null) '-Dcc=${cc!.toFilePath()}',
63-
if (envScript != null)
64-
'-D${CCompilerConfigImpl.envScriptConfigKeyFull}='
65-
'${envScript!.toFilePath()}',
66-
if (envScriptArgs != null)
67-
'-D${CCompilerConfigImpl.envScriptArgsConfigKeyFull}='
68-
'${envScriptArgs!.join(' ')}',
69-
],
70+
'--config=${buildConfigUri.toFilePath()}',
7071
],
7172
workingDirectory: testPackageUri.toFilePath(),
7273
);

‎pkgs/native_assets_cli/test/helpers.dart‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,38 +87,49 @@ String unparseKey(String key) => key.replaceAll('.', '__').toUpperCase();
8787
/// Archiver provided by the environment.
8888
///
8989
/// Provided on Dart CI.
90-
final Uri? ar = Platform
90+
final Uri? _ar = Platform
9191
.environment[unparseKey(internal.CCompilerConfigImpl.arConfigKeyFull)]
9292
?.asFileUri();
9393

9494
/// Compiler provided by the environment.
9595
///
9696
/// Provided on Dart CI.
97-
final Uri? cc = Platform
97+
final Uri? _cc = Platform
9898
.environment[unparseKey(internal.CCompilerConfigImpl.ccConfigKeyFull)]
9999
?.asFileUri();
100100

101101
/// Linker provided by the environment.
102102
///
103103
/// Provided on Dart CI.
104-
final Uri? ld = Platform
104+
final Uri? _ld = Platform
105105
.environment[unparseKey(internal.CCompilerConfigImpl.ldConfigKeyFull)]
106106
?.asFileUri();
107107

108-
/// Path to script that sets environment variables for [cc], [ld], and [ar].
108+
/// Path to script that sets environment variables for [_cc], [_ld], and [_ar].
109109
///
110110
/// Provided on Dart CI.
111-
final Uri? envScript = Platform.environment[
111+
final Uri? _envScript = Platform.environment[
112112
unparseKey(internal.CCompilerConfigImpl.envScriptConfigKeyFull)]
113113
?.asFileUri();
114114

115-
/// Arguments for [envScript] provided by environment.
115+
/// Arguments for [_envScript] provided by environment.
116116
///
117117
/// Provided on Dart CI.
118-
final List<String>? envScriptArgs = Platform.environment[
118+
final List<String>? _envScriptArgs = Platform.environment[
119119
unparseKey(internal.CCompilerConfigImpl.envScriptArgsConfigKeyFull)]
120120
?.split(' ');
121121

122+
/// Configuration for the native toolchain.
123+
///
124+
/// Provided on Dart CI.
125+
final cCompiler = internal.CCompilerConfigImpl(
126+
compiler: _cc,
127+
archiver: _ar,
128+
linker: _ld,
129+
envScript: _envScript,
130+
envScriptArgs: _envScriptArgs,
131+
);
132+
122133
extension on String {
123134
Uri asFileUri() => Uri.file(this);
124135
}

0 commit comments

Comments
 (0)