@@ -66,13 +66,13 @@ TEST(ArgsTestGroup, Args_CustomToolchain) {
66
66
// Toolchain
67
67
CHECK_TRUE (gcc_toolchain.state .build );
68
68
CHECK_FALSE (gcc_toolchain.state .test );
69
- CHECK (gcc_toolchain.id == buildcc::Toolchain::Id ::Gcc);
69
+ CHECK (gcc_toolchain.id == buildcc::ToolchainId ::Gcc);
70
70
STRCMP_EQUAL (gcc_toolchain.name .c_str (), " gcc" );
71
- STRCMP_EQUAL (gcc_toolchain.asm_compiler .c_str (), " as" );
72
- STRCMP_EQUAL (gcc_toolchain.c_compiler .c_str (), " gcc" );
73
- STRCMP_EQUAL (gcc_toolchain.cpp_compiler .c_str (), " g++" );
74
- STRCMP_EQUAL (gcc_toolchain.archiver .c_str (), " ar" );
75
- STRCMP_EQUAL (gcc_toolchain.linker .c_str (), " ld" );
71
+ STRCMP_EQUAL (gcc_toolchain.binaries . assembler .c_str (), " as" );
72
+ STRCMP_EQUAL (gcc_toolchain.binaries . c_compiler .c_str (), " gcc" );
73
+ STRCMP_EQUAL (gcc_toolchain.binaries . cpp_compiler .c_str (), " g++" );
74
+ STRCMP_EQUAL (gcc_toolchain.binaries . archiver .c_str (), " ar" );
75
+ STRCMP_EQUAL (gcc_toolchain.binaries . linker .c_str (), " ld" );
76
76
}
77
77
78
78
TEST (ArgsTestGroup, Args_MultipleCustomToolchain) {
@@ -104,24 +104,24 @@ TEST(ArgsTestGroup, Args_MultipleCustomToolchain) {
104
104
// GCC
105
105
CHECK_TRUE (gcc_toolchain.state .build );
106
106
CHECK_FALSE (gcc_toolchain.state .test );
107
- CHECK (gcc_toolchain.id == buildcc::Toolchain::Id ::Gcc);
107
+ CHECK (gcc_toolchain.id == buildcc::ToolchainId ::Gcc);
108
108
STRCMP_EQUAL (gcc_toolchain.name .c_str (), " gcc" );
109
- STRCMP_EQUAL (gcc_toolchain.asm_compiler .c_str (), " as" );
110
- STRCMP_EQUAL (gcc_toolchain.c_compiler .c_str (), " gcc" );
111
- STRCMP_EQUAL (gcc_toolchain.cpp_compiler .c_str (), " g++" );
112
- STRCMP_EQUAL (gcc_toolchain.archiver .c_str (), " ar" );
113
- STRCMP_EQUAL (gcc_toolchain.linker .c_str (), " ld" );
109
+ STRCMP_EQUAL (gcc_toolchain.binaries . assembler .c_str (), " as" );
110
+ STRCMP_EQUAL (gcc_toolchain.binaries . c_compiler .c_str (), " gcc" );
111
+ STRCMP_EQUAL (gcc_toolchain.binaries . cpp_compiler .c_str (), " g++" );
112
+ STRCMP_EQUAL (gcc_toolchain.binaries . archiver .c_str (), " ar" );
113
+ STRCMP_EQUAL (gcc_toolchain.binaries . linker .c_str (), " ld" );
114
114
115
115
// MSVC
116
116
CHECK_TRUE (msvc_toolchain.state .build );
117
117
CHECK_TRUE (msvc_toolchain.state .test );
118
- CHECK (msvc_toolchain.id == buildcc::Toolchain::Id ::Msvc);
118
+ CHECK (msvc_toolchain.id == buildcc::ToolchainId ::Msvc);
119
119
STRCMP_EQUAL (msvc_toolchain.name .c_str (), " msvc" );
120
- STRCMP_EQUAL (msvc_toolchain.asm_compiler .c_str (), " cl" );
121
- STRCMP_EQUAL (msvc_toolchain.c_compiler .c_str (), " cl" );
122
- STRCMP_EQUAL (msvc_toolchain.cpp_compiler .c_str (), " cl" );
123
- STRCMP_EQUAL (msvc_toolchain.archiver .c_str (), " lib" );
124
- STRCMP_EQUAL (msvc_toolchain.linker .c_str (), " link" );
120
+ STRCMP_EQUAL (msvc_toolchain.binaries . assembler .c_str (), " cl" );
121
+ STRCMP_EQUAL (msvc_toolchain.binaries . c_compiler .c_str (), " cl" );
122
+ STRCMP_EQUAL (msvc_toolchain.binaries . cpp_compiler .c_str (), " cl" );
123
+ STRCMP_EQUAL (msvc_toolchain.binaries . archiver .c_str (), " lib" );
124
+ STRCMP_EQUAL (msvc_toolchain.binaries . linker .c_str (), " link" );
125
125
}
126
126
127
127
TEST (ArgsTestGroup, Args_DuplicateCustomToolchain) {
@@ -165,13 +165,13 @@ TEST(ArgsTestGroup, Args_CustomTarget) {
165
165
// Toolchain
166
166
CHECK_TRUE (gcc_toolchain.state .build );
167
167
CHECK_FALSE (gcc_toolchain.state .test );
168
- CHECK (gcc_toolchain.id == buildcc::Toolchain::Id ::Gcc);
168
+ CHECK (gcc_toolchain.id == buildcc::ToolchainId ::Gcc);
169
169
STRCMP_EQUAL (gcc_toolchain.name .c_str (), " gcc" );
170
- STRCMP_EQUAL (gcc_toolchain.asm_compiler .c_str (), " as" );
171
- STRCMP_EQUAL (gcc_toolchain.c_compiler .c_str (), " gcc" );
172
- STRCMP_EQUAL (gcc_toolchain.cpp_compiler .c_str (), " g++" );
173
- STRCMP_EQUAL (gcc_toolchain.archiver .c_str (), " ar" );
174
- STRCMP_EQUAL (gcc_toolchain.linker .c_str (), " ld" );
170
+ STRCMP_EQUAL (gcc_toolchain.binaries . assembler .c_str (), " as" );
171
+ STRCMP_EQUAL (gcc_toolchain.binaries . c_compiler .c_str (), " gcc" );
172
+ STRCMP_EQUAL (gcc_toolchain.binaries . cpp_compiler .c_str (), " g++" );
173
+ STRCMP_EQUAL (gcc_toolchain.binaries . archiver .c_str (), " ar" );
174
+ STRCMP_EQUAL (gcc_toolchain.binaries . linker .c_str (), " ld" );
175
175
176
176
// Target
177
177
STRCMP_EQUAL (gcc_target.compile_command .c_str (),
@@ -219,13 +219,13 @@ TEST(ArgsTestGroup, Args_MultipleCustomTarget) {
219
219
// Toolchain
220
220
CHECK_TRUE (gcc_toolchain.state .build );
221
221
CHECK_FALSE (gcc_toolchain.state .test );
222
- CHECK (gcc_toolchain.id == buildcc::Toolchain::Id ::Gcc);
222
+ CHECK (gcc_toolchain.id == buildcc::ToolchainId ::Gcc);
223
223
STRCMP_EQUAL (gcc_toolchain.name .c_str (), " gcc" );
224
- STRCMP_EQUAL (gcc_toolchain.asm_compiler .c_str (), " as" );
225
- STRCMP_EQUAL (gcc_toolchain.c_compiler .c_str (), " gcc" );
226
- STRCMP_EQUAL (gcc_toolchain.cpp_compiler .c_str (), " g++" );
227
- STRCMP_EQUAL (gcc_toolchain.archiver .c_str (), " ar" );
228
- STRCMP_EQUAL (gcc_toolchain.linker .c_str (), " ld" );
224
+ STRCMP_EQUAL (gcc_toolchain.binaries . assembler .c_str (), " as" );
225
+ STRCMP_EQUAL (gcc_toolchain.binaries . c_compiler .c_str (), " gcc" );
226
+ STRCMP_EQUAL (gcc_toolchain.binaries . cpp_compiler .c_str (), " g++" );
227
+ STRCMP_EQUAL (gcc_toolchain.binaries . archiver .c_str (), " ar" );
228
+ STRCMP_EQUAL (gcc_toolchain.binaries . linker .c_str (), " ld" );
229
229
230
230
// Target
231
231
STRCMP_EQUAL (gcc_target.compile_command .c_str (),
@@ -240,13 +240,13 @@ TEST(ArgsTestGroup, Args_MultipleCustomTarget) {
240
240
// Toolchain
241
241
CHECK_TRUE (msvc_toolchain.state .build );
242
242
CHECK_TRUE (msvc_toolchain.state .test );
243
- CHECK (msvc_toolchain.id == buildcc::Toolchain::Id ::Msvc);
243
+ CHECK (msvc_toolchain.id == buildcc::ToolchainId ::Msvc);
244
244
STRCMP_EQUAL (msvc_toolchain.name .c_str (), " msvc" );
245
- STRCMP_EQUAL (msvc_toolchain.asm_compiler .c_str (), " cl" );
246
- STRCMP_EQUAL (msvc_toolchain.c_compiler .c_str (), " cl" );
247
- STRCMP_EQUAL (msvc_toolchain.cpp_compiler .c_str (), " cl" );
248
- STRCMP_EQUAL (msvc_toolchain.archiver .c_str (), " lib" );
249
- STRCMP_EQUAL (msvc_toolchain.linker .c_str (), " link" );
245
+ STRCMP_EQUAL (msvc_toolchain.binaries . assembler .c_str (), " cl" );
246
+ STRCMP_EQUAL (msvc_toolchain.binaries . c_compiler .c_str (), " cl" );
247
+ STRCMP_EQUAL (msvc_toolchain.binaries . cpp_compiler .c_str (), " cl" );
248
+ STRCMP_EQUAL (msvc_toolchain.binaries . archiver .c_str (), " lib" );
249
+ STRCMP_EQUAL (msvc_toolchain.binaries . linker .c_str (), " link" );
250
250
251
251
// Target
252
252
STRCMP_EQUAL (msvc_target.compile_command .c_str (),
0 commit comments