blob: 1fb13454a867d9b299bb2a88ebeec383f07149a3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
|
# file : tests/cc/modules/testscript
# copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
# license : MIT; see accompanying LICENSE file
crosstest = false
test.arguments = config.cxx="$recall($cxx.path)"
.include ../../common.test
+cat <<EOI >+build/bootstrap.build
using test
EOI
+cat <<EOI >=build/root.build
cxx.std = experimental
cxx.features.symexport = true
# Force modules.
#
cxx.features.modules = true
using cxx
# We forced modules but for VC we need at least 15u3 (19.11). So "unforce"
# them in this case.
#
if ($cxx.id == 'msvc' && $cxx.version.major == 19 && $cxx.version.minor < 11)
cxx.features.modules = false
hxx{*}: extension = hxx
mxx{*}: extension = mxx
cxx{*}: extension = cxx
if ($cxx.target.class == 'windows')
bmis{*}: cxx.poptions += '-DLIBFOO_EXPORT=__declspec(dllexport)'
exe{*}: test = true
EOI
# Determine if we have module support.
#
+$* noop <<EOI | set modules
print $cxx.features.modules
EOI
+$modules || exit
# Common source files that are symlinked in the test directories if used.
#
+cat <<EOI >=core.mxx
#ifndef LIBFOO_EXPORT
# define LIBFOO_EXPORT
#endif
#if __cpp_modules >= 201704
export
#endif
module foo.core;
export LIBFOO_EXPORT int f (int);
EOI
+cat <<EOI >=core.cxx
module foo.core;
int f (int i) {return i - 1;}
EOI
+cat <<EOI >=driver.cxx
import foo.core;
int main (int argc, char*[]) {return f (argc);}
EOI
: bmi-combined
:
: Test combined interface/implementation unit specified as bmi{}.
:
cp ../core.mxx ./ && cat >+core.mxx <<EOI;
int f (int i) {return i - 1;}
EOI
ln -s ../driver.cxx ./;
$* test clean <<EOI
exe{test}: cxx{driver} bmi{core}
bmi{core}: mxx{core}
EOI
: mxx-combined
:
: Test combined interface/implementation unit specified as mxx{}.
:
cp ../core.mxx ./ && cat >+core.mxx <<EOI;
int f (int i) {return i - 1;}
EOI
ln -s ../driver.cxx ./;
$* test clean <<EOI
exe{test}: cxx{driver} mxx{core}
EOI
: bmi-separate
:
: Test separate interface/implementation unit specified as bmi{}.
:
ln -s ../core.mxx ../core.cxx ../driver.cxx ./;
$* test clean <<EOI
exe{test}: cxx{driver} {bmi cxx}{core}
bmi{core}: mxx{core}
EOI
: mxx-separate
:
: Test separate interface/implementation unit specified as mxx{}.
:
ln -s ../core.mxx ../core.cxx ../driver.cxx ./;
$* test clean <<EOI
exe{test}: cxx{driver} {mxx cxx}{core}
EOI
: name-match
:
: Test fuzzy/explicit match between module name and file name.
:
{
# "Bad" match which we should better.
#
+cat <<EOI >=core.mxx
#if __cpp_modules >= 201704
export
#endif
module bar.core;
EOI
: separator
:
: Test separator equivalence.
:
ln -s ../../core.mxx foo-core.mxx;
ln -s ../core.mxx ../../core.cxx ../../driver.cxx ./;
$* test clean <'exe{test}: cxx{driver core} mxx{core foo-core}'
: case
:
: Test case-insensitivity and case-change as a separator.
:
ln -s ../../core.mxx FooCore.mxx;
ln -s ../core.mxx ../../core.cxx ../../driver.cxx ./;
$* test clean <'exe{test}: cxx{driver core} mxx{core FooCore}'
: dir
:
: Test subdirectory.
:
mkdir foo;
ln -s ../../core.mxx foo/core.mxx;
ln -s ../core.mxx ../../core.cxx ../../driver.cxx ./;
$* test clean <'exe{test}: cxx{driver core} mxx{core} foo/mxx{core}'
: explicit
:
: Explicit module name.
:
ln -s ../../core.mxx baz.mxx;
ln -s ../core.mxx ../../core.cxx ../../driver.cxx ./;
$* test clean <<EOO
exe{test}: cxx{driver core} mxx{core baz}
mxx{baz}@./: cc.module_name = foo.core
EOO
}
: unresolved
:
ln -s ../driver.cxx ./;
$* test &*.d <'exe{test}: cxx{driver}' 2>>EOE != 0
driver.cxx: error: unable to resolve module foo.core
EOE
: misguessed
:
ln -s ../core.mxx ./;
cat <'import bar.core;' >=driver.cxx;
$* test &*.d <'exe{test}: cxx{driver} mxx{core}' 2>>EOE != 0
driver.cxx: error: failed to correctly guess module name from mxx{core}
info: guessed: bar.core
info: actual: foo.core
info: consider adjusting module interface file names or
info: consider specifying module name with cc.module_name
EOE
: library
:
: Test importing a module from a library.
:
ln -s ../core.mxx ../core.cxx ../driver.cxx ./;
$* test clean <<EOI
./: lib{foo} exe{test} # Full build.
exe{test}: cxx{driver} lib{foo}
lib{foo}: {mxx cxx}{core}
EOI
: re-export
:
: Test module re-exporting (export import M;)
:
if ($cxx.id.type != "clang")
{
+cat <<EOI >=base.mxx
#if __cpp_modules >= 201704
export
#endif
module foo.base;
export import foo.core;
EOI
+cat <<EOI >=extra.mxx
#ifndef LIBFOO_EXPORT
# define LIBFOO_EXPORT
#endif
#if __cpp_modules >= 201704
export
#endif
module foo.extra;
export
{
import foo.base;
// VC appears to require dll-export of inline functions.
//
LIBFOO_EXPORT inline int g (int i) {return i != 0 ? i : -1;}
}
EOI
+cat <<EOI >=foo.mxx
#if __cpp_modules >= 201704
export
#endif
module foo;
export
{
import foo.core;
import foo.base;
import foo.extra;
}
EOI
: basic
:
ln -s ../base.mxx ../../core.mxx ../../core.cxx ./;
cat <<EOI >=driver.cxx;
import foo.base;
int main (int argc, char*[]) {return f (argc);}
EOI
$* test clean <'exe{test}: cxx{driver core} mxx{core base}'
: recursive
:
ln -s ../base.mxx ../extra.mxx ../../core.mxx ../../core.cxx ./;
cat <<EOI >=driver.cxx;
import foo.extra;
int main (int argc, char*[]) {return f (g (argc));}
EOI
$* test clean <'exe{test}: cxx{driver core} mxx{core base extra}'
: duplicate
:
ln -s ../base.mxx ../extra.mxx ../foo.mxx ../../core.mxx ../../core.cxx ./;
cat <<EOI >=driver.cxx;
import foo;
int main (int argc, char*[]) {return f (g (argc));}
EOI
$* test clean <'exe{test}: cxx{driver core} mxx{core base extra foo}'
: library
:
ln -s ../base.mxx ../extra.mxx ../foo.mxx ../../core.mxx ../../core.cxx ./;
cat <<EOI >=driver.cxx;
import foo;
int main (int argc, char*[]) {return f (g (argc));}
EOI
$* test clean <<EOI
exe{test}: cxx{driver} mxx{foo} lib{foo}
lib{foo}: mxx{core base extra} cxx{core}
EOI
}
: import
:
: Test module import. Currently, all the implementation require access to the
: entire, recursively-explored list of BMIs.
:
{
# Note: using VC export module fixup support.
+cat <<EOI >=base.mxx
export module foo.base;
import foo.core;
export int g (int i) {return f (i);}
EOI
+cat <<EOI >=extra.mxx
export module foo.extra;
import foo.base;
export int h (int i) {return g (i);}
EOI
: basic
:
ln -s ../base.mxx ../../core.mxx ../../core.cxx ./;
cat <<EOI >=driver.cxx;
import foo.base;
int main (int argc, char*[]) {return g (argc);}
EOI
$* test clean <'exe{test}: cxx{driver core} mxx{core base}'
: recursive
:
ln -s ../base.mxx ../extra.mxx ../../core.mxx ../../core.cxx ./;
cat <<EOI >=driver.cxx;
import foo.extra;
int main (int argc, char*[]) {return h (argc);}
EOI
$* test clean <'exe{test}: cxx{driver core} mxx{core base extra}'
}
: resolve-change
:
: Test detection of module name to BMI resolution change.
:
ln -s ../core.mxx ../core.cxx ../driver.cxx ./;
cat <<EOI >=foo-core.mxx;
#if __cpp_modules >= 201704
export
#endif
module foo.core;
export inline int f (int i) {return i - 2;}
EOI
$* update <<EOI;
./: exe{test} bmie{foo-core}
exe{test}: cxx{driver} {mxx cxx}{core}
bmie{foo-core}: mxx{foo-core}
EOI
$* test --verbose 1 <<EOI 2>>EOE;
exe{test}: cxx{driver} {mxx}{foo-core}
exe{test}: test.arguments = two
EOI
c++ cxx{driver}
ld exe{test}
test exe{test}
EOE
$* test clean <<EOI
./: exe{test} bmie{foo-core}
exe{test}: cxx{driver} {mxx cxx}{core}
bmie{foo-core}: mxx{foo-core}
EOI
: symexport
:
: Test the __symexport feature.
:
cat <<EOI >=core.mxx;
#if __cpp_modules >= 201704
export
#endif
module foo.core;
export __symexport int f (int);
__symexport int g_impl (int i) {return i - 1;}
export __symexport inline int g (int i) {return g_impl (i);}
EOI
ln -s ../core.cxx core-f.cxx;
cat <<EOI >=core-g.cxx;
module foo.core;
int g_impl (int i) {return i - 1;}
EOI
cat <<EOI >=driver.cxx;
import foo.core;
int main (int argc, char*[]) {return f (argc) + g (argc);}
EOI
$* test clean <<EOI
./: lib{foo} exe{test} # Full build.
exe{test}: cxx{driver} lib{foo}
lib{foo}: mxx{core} cxx{core-f} # core-g @@ VC
EOI
: export-fixup
:
: Test removing the export keyword for VC compatibility.
:
ln -s ../core.cxx ../driver.cxx ./;
cat <<EOI >=core.mxx;
export module foo.core;
export int f (int);
EOI
$* test clean <'exe{test}: cxx{driver core} mxx{core}'
|