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
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
|
# file : tests/publish.testscript
# license : MIT; see accompanying LICENSE file
.include common.testscript project.testscript
# bdep-publish requirements for the minimum supported git version are higher
# then the default 2.1.0 (see bdep/publish.cxx for details).
#
+if! ($git_version_major > 2 || \
$git_version_major == 2 && $git_version_minor >= 11)
exit
end
repository = $config.bdep.tests.publish.repository
+if ("$repository" == '')
exit
end
test.arguments += --repository "$repository" --yes \
--author-name user --author-email user@example.com
config_cxx = [cmdline] cc config.cxx=$quote($recall($cxx.path) $cxx.config.mode, true)
new += --vcs git,branch=master 2>!
init += $config_cxx -d prj 2>! &prj/**/bootstrap/***
windows = ($cxx.target.class == 'windows')
g = [cmdline] git -C prj >! 2>!
# Note that using the same package name and version for tests may result in
# duplicate submissions. We will use unique version for each test,
# incrementing the patch version for 1.0.X.
#
# Next version to use: 1.0.25
#
# Normally we disable the progress indication that complicates stderr output
# validation. We also disable the progress indication test on Windows, as
# curl's progress is not always properly terminated there, messing up with
# the subsequent output.
#
: submit
:
{
test.arguments += --control 'none'
+$clone_prj
: single-pkg
:
{
test.arguments += --force=uncommitted --simulate 'success'
: single-cfg
:
{
$clone_root_prj;
$init -C @cfg &prj-cfg/***;
sed -i -e 's/^(version:) .*$/\1 1.0.1/' prj/manifest;
$* --no-progress 2>>~%EOE%
synchronizing:
upgrade prj/1.0.1
%package submission is queued(: \.*prj/1.0.1)?%d
%reference: .{12}%
EOE
}
: progress
:
if! $windows
{
$clone_root_prj;
$init -C @cfg &prj-cfg/***;
sed -i -e 's/^(version:) .*$/\1 1.0.19/' prj/manifest;
$* 2>>~%EOE%
synchronizing:
upgrade prj/1.0.19
submitting prj-1.0.19.tar.gz
%.*
%package submission is queued(: \.*prj/1.0.19)?%d
%reference: .{12}%
EOE
}
: no-cfg
:
{
$clone_root_prj;
$* 2>>~%EOE% != 0
%error: no default configuration in project .+%
info: use (@<cfg-name> | --config|-c <cfg-dir> | --all|-a) to specify configuration explicitly
EOE
}
: multi-cfg
:
{
$clone_root_prj;
$init -C @cfg1 &prj-cfg1/***;
$init -C @cfg2 &prj-cfg2/***;
$* --all 2>>EOE != 0
error: package prj is initialized in multiple specified configurations
info: @cfg1
info: @cfg2
EOE
}
: snapshot
:
{
$clone_root_prj;
$init -C @cfg &prj-cfg/***;
sed -i -e 's/^(version:) .*$/\1 1.0.15-a.0.z/' prj/manifest;
$* 2>>EOE != 0;
synchronizing:
upgrade prj/1.0.15-a.0.19700101000000
error: package prj version 1.0.15-a.0.19700101000000 is a snapshot
EOE
$* --force=snapshot 2>>~%EOE% != 0
error: package prj version 1.0.15-a.0.19700101000000 is a snapshot
EOE
}
: non-standard-version
:
: Test publishing a package with the non-standard version from a
: non-bdep-initialized project, using the forwarded build2 configuration.
:
{
$new --no-init --no-amalgamation prj 2>- &prj/***;
sed -i -e 's/^(version:) .*$/\1 1.0.22/' prj/manifest;
sed -i \
-e 's/^(amalgamation =.*)$/\1\nversion = 1.0.22\ndist.package = $project-$version/' \
-e 's/^using version$//' \
prj/build/bootstrap.build;
$build 'configure:' prj/@prj-cfg/,forward &prj/build/bootstrap/*** 2>!;
$* --no-progress --forward --section alpha 2>>~%EOE%;
%package submission is queued(: .*prj/1.0.22)?%
%reference: .{12}%
EOE
# While at it, test specifying a package name on the command line.
#
sed -i -e 's/^(version:) .*$/\1 1.0.23/' prj/manifest;
sed -i -e 's/^(version =) .*$/\1 1.0.23/' prj/build/bootstrap.build;
# Suppress the --yes option.
#
test.arguments = $regex.apply($test.arguments, '^--yes$', '');
$* --no-progress --forward --section alpha prj <'y' 2>>~"%EOE%"
publishing:
% to: $repository%
as: user <user@example.com>
package: prj
version: 1.0.23
project: prj
section: alpha
%.?
%continue\\?.+ package submission is queued.+%
%reference: .{12}%
EOE
}
}
: multi-pkg
:
{
test.options += --no-progress
test.arguments += --force=uncommitted --simulate 'success'
+$new -t empty prj &prj/***
+$new --package -t lib libprj -d prj
+$new --package -t exe prj -d prj
: both
:
{
$clone_prj;
sed -i -e 's/^(version:) .*$/\1 1.0.2/' prj/libprj/manifest;
sed -i -e 's/^(version:) .*$/\1 1.0.2/' prj/prj/manifest;
$init -C @cfg &prj-cfg/***;
$* 2>>~%EOE%
%package submission is queued(: \.*libprj/1.0.2)?%d
%reference: .{12}%
%package submission is queued(: \.*prj/1.0.2)?%d
%reference: .{12}%
EOE
}
: pkg-by-name
:
{
$clone_prj;
sed -i -e 's/^(version:) .*$/\1 1.0.24/' prj/libprj/manifest;
sed -i -e 's/^(version:) .*$/\1 1.0.24/' prj/prj/manifest;
$init -C @cfg &prj-cfg/***;
# Suppress the --yes option.
#
test.arguments = $regex.apply($test.arguments, '^--yes$', '');
$* libprj <'y' 2>>~"%EOE%"
publishing:
% to: $repository%
as: user <user@example.com>
package: libprj
version: 1.0.24
project: prj
section: stable
%.?
%continue\\?.+ package submission is queued.+%
%reference: .{12}%
EOE
}
: diff-configs
:
{
$clone_prj;
sed -i -e 's/^(version:) .*$/\1 1.0.20/' prj/libprj/manifest;
sed -i -e 's/^(version:) .*$/\1 1.0.20/' prj/prj/manifest;
$init -C @cfg1 -d prj/libprj &prj-cfg1/***;
$init -C @cfg2 --config-type host -d prj/prj &prj-cfg2/***;
$* 2>>~%EOE%
%package submission is queued(: \.*libprj/1.0.20)?%d
%reference: .{12}%
%package submission is queued(: \.*prj/1.0.20)?%d
%reference: .{12}%
EOE
}
: diff-configs-forward
:
{
$clone_prj;
sed -i -e 's/^(version:) .*$/\1 1.0.21/' prj/libprj/manifest;
sed -i -e 's/^(version:) .*$/\1 1.0.21/' prj/prj/manifest;
$init -C @cfg1 --no-default --forward -d prj/libprj &prj-cfg1/***;
$init -C @cfg2 --config-type host --no-default --forward -d prj/prj &prj-cfg2/***;
$* --forward 2>>~%EOE%
%package submission is queued(: \.*libprj/1.0.21)?%d
%reference: .{12}%
%package submission is queued(: \.*prj/1.0.21)?%d
%reference: .{12}%
EOE
}
: single
:
{
$clone_prj;
sed -i -e 's/^(version:) .*$/\1 1.0.3/' prj/libprj/manifest;
$init -C @cfg &prj-cfg/***;
# Publish the single libprj package rather than the whole prj project.
#
test.arguments = $regex.apply($test.arguments, '^(prj)$', '\1/libprj');
$* 2>>~%EOE%
%package submission is queued(: \.*prj/1.0.3)?%d
%reference: .{12}%
EOE
}
: prompt
:
{
$clone_prj;
sed -i -e 's/^(version:) .*$/\1 1.0.4/' prj/libprj/manifest;
sed -i -e 's/^(version:) .*$/\1 1.0.4/' prj/prj/manifest;
$init -C @cfg &prj-cfg/***;
# Suppress the --yes option.
#
test.arguments = $regex.apply($test.arguments, '^--yes$', '');
$* <'y' 2>>~"%EOE%"
publishing:
to: $repository
% as: .+@.+%
package: libprj
version: 1.0.4
project: prj
section: stable
package: prj
version: 1.0.4
project: prj
section: stable
%warning: publishing using staged build2 toolchain%?
%continue\\?\\.+ package submission is queued\(: \\.*libprj/1.0.4\)?%d
%reference: .{12}%
%package submission is queued\(: \\.*prj/1.0.4\)?%d
%reference: .{12}%
EOE
}
}
: commited-prj
:
{
test.options += --no-progress
test.arguments += --simulate 'success'
clone_prj = [cmdline] cp --no-cleanup -pr ../prj ./ &prj/***
+$clone_prj
+$g config user.name 'Test Script'
+$g config user.email 'testscript@example.com'
+$g add '*'
+$g commit -m 'Create' --no-verify
: final
:
{
$clone_prj;
$init -C @cfg &prj-cfg/***;
sed -i -e 's/^(version:) .*$/\1 1.0.16/' prj/manifest;
$* 2>>~%EOE% != 0;
synchronizing:
upgrade prj/1.0.16
error: project directory has uncommitted changes
info: run 'git status' for details
info: use 'git stash' to temporarily hide the changes
info: use --force=uncommitted to publish anyway
EOE
$g commit -a -m 'Version';
$* 2>>~%EOE%
%package submission is queued(: \.*prj/1.0.16)?%d
%reference: .{12}%
EOE
}
: snapshot
:
{
$clone_prj;
$init -C @cfg &prj-cfg/***;
sed -i -e 's/^(version:) .*$/\1 1.0.17-a.0.z/' prj/manifest;
$* 2>>~%EOE% != 0;
synchronizing:
% upgrade prj/1.0.17-a.0.\.+%d
error: project directory has uncommitted changes
info: run 'git status' for details
info: use 'git stash' to temporarily hide the changes
info: use --force=uncommitted to publish anyway
EOE
# Note that the uncomitted snapshot sn is the previous commit time + 1
# and the commited snapshot sn is the commit time. That's why let's
# sleep a bit to make sure that the package version increases with the
# commit.
#
sleep 1;
$g commit -a -m 'Version';
$* 2>>~%EOE% != 0;
synchronizing:
% upgrade prj/1.0.17-a.0.\.+%d
%error: package prj version 1.0.17-a.0.\.+ is a snapshot%d
info: use --force=snapshot to publish anyway
EOE
$* --force=snapshot 2>>~%EOE%
%package submission is queued(: \.*prj/1.0.17-a.0.\.+)?%d
%reference: .{12}%
EOE
}
}
: non-vsc-prj
:
{
test.options += --no-progress
test.arguments += --simulate 'success'
clone_prj = [cmdline] cp --no-cleanup -pr ../prj ./ &prj/***;
$clone_prj;
rm -rf prj/.git;
$init -C @cfg &prj-cfg/***;
sed -i -e 's/^(version:) .*$/\1 1.0.18/' prj/manifest;
$* 2>>~%EOE%
synchronizing:
upgrade prj/1.0.18
%package submission is queued(: \.*prj/1.0.18)?%d
%reference: .{12}%
EOE
}
: failure
:
{
test.options += --no-progress
test.arguments += --force=uncommitted
: duplicate-archive
:
{
test.arguments += --simulate 'duplicate-archive'
$clone_root_prj;
$init -C @cfg &prj-cfg/***;
sed -i -e 's/^(version:) .*$/\1 1.0.5/' prj/manifest;
$* 2>>~%EOE% != 0
synchronizing:
upgrade prj/1.0.5
error: duplicate submission
% info: reference: .{12}%?
EOE
}
: internal-error-text
:
{
test.arguments += --simulate 'internal-error-text'
$clone_root_prj;
$init -C @cfg &prj-cfg/***;
sed -i -e 's/^(version:) .*$/\1 1.0.6/' prj/manifest;
$* 2>>~%EOE% != 0
synchronizing:
upgrade prj/1.0.6
error: submission handling failed
% info: consider reporting this to .+ maintainers%
EOE
}
: internal-error-html
:
{
test.arguments += --simulate 'internal-error-html'
$clone_root_prj;
$init -C @cfg &prj-cfg/***;
sed -i -e 's/^(version:) .*$/\1 1.0.7/' prj/manifest;
$* 2>>~%EOE% != 0
synchronizing:
upgrade prj/1.0.7
error: HTTP status code 500 (internal server error)
% info: consider reporting this to .+ maintainers%
EOE
}
}
}
: control
:
{
# The control repository URL doesn't really matter for the submission
# simulation. We specify it to enable the control branch-related
# functionality.
#
test.arguments += --force=uncommitted --simulate 'success' \
--control 'http://example.com/rep.git'
# Create the remote repository.
#
+mkdir --no-cleanup prj.git
+git -C prj.git -c init.defaultBranch=master init --bare --quiet &prj.git/***
+$clone_prj
+$g config user.name 'Test Script'
+$g config user.email 'testscript@example.com'
clone_rep = [cmdline] cp --no-cleanup -r ../prj.git ./ &prj.git/***
clone_prj = [cmdline] cp --no-cleanup -r ../prj ./ &prj/***
: success
:
{
# Setup the remote repository.
#
rep = "file://($windows ? "$regex.replace($~, '\\', '/')" : "$~")/prj.git"
$clone_rep;
# Setup the local repository/project.
#
$clone_prj;
$init -C @cfg &prj-cfg/***;
$g remote add origin "$rep";
# Publish when neither local nor remote-tracking build2-control branches
# are present.
#
sed -i -e 's/^(version:) .*$/\1 1.0.8/' prj/manifest;
$* >&2 2>>~%EOE%;
synchronizing:
upgrade prj/1.0.8
pushing branch build2-control
%.*
submitting prj-1.0.8.tar.gz
%.+
%reference: .{12}%
EOE
test.options += --no-progress;
# Publish when both local and remote-tracking build2-control branches are
# present.
#
sed -i -e 's/^(version:) .*$/\1 1.0.9/' prj/manifest;
$* 2>>~%EOE%;
synchronizing:
upgrade prj/1.0.9
%package submission is queued(: \.*prj/1.0.9)?%d
%reference: .{12}%
EOE
# Publish when the local build2-control branch is not present while the
# remote-tracking branch is.
#
sed -i -e 's/^(version:) .*$/\1 1.0.10/' prj/manifest;
$g branch -D build2-control;
$* 2>>~%EOE%;
synchronizing:
upgrade prj/1.0.10
%package submission is queued(: \.*prj/1.0.10)?%d
%reference: .{12}%
EOE
# Check for the build2-control branch commits presence and the files they
# add.
#
$g checkout build2-control;
$g log --name-only --pretty='format:%s' >>:~%EOO%
Add prj/1.0.10 publish authorization
%submit/.{16}%
Add prj/1.0.9 publish authorization
%submit/.{16}%
Add prj/1.0.8 publish authorization
%submit/.{16}%
Start
EOO
}
: failure
:
{
g2 = [cmdline] git -C prj2 >! 2>!
# Setup the remote repository.
#
rep = "file://($windows ? "$regex.replace($~, '\\', '/')" : "$~")/prj.git"
$clone_rep;
# Setup the local repository/project.
#
$clone_prj;
$init -C @cfg &prj-cfg/***;
$g remote add origin "$rep";
# Publish successfully.
#
sed -i -e 's/^(version:) .*$/\1 1.0.11/' prj/manifest;
$* >! 2>!;
# Push into the build2-control branch from another local repository,
# making the subsequent publish of prj package impossible until the next
# fetch.
#
# Convert specific warnings to infos as we expect them to appear. This, in
# particular, prevents bbot workers to set task result status to warning.
#
git clone "$rep" prj2 &prj2/*** 2>&1 | \
sed -e 's/warning: (remote HEAD refers to nonexistent .*)/info: \1/' >&2 2>!;
$g2 config user.name 'Test Script';
$g2 config user.email 'testscript@example.com';
$g2 checkout -b build2-control --track origin/build2-control;
$g2 commit --allow-empty -m 'Dummy1';
$g2 push;
sed -i -e 's/^(version:) .*$/\1 1.0.12/' prj/manifest;
# Fail to publish (see above for details).
#
$* 2>>~%EOE% != 0;
synchronizing:
upgrade prj/1.0.12
pushing branch build2-control
%.*
error: unable to push build2-control branch
info: run 'git fetch' and try again
EOE
test.options += --no-progress;
# Publish successfully after the fetch.
#
$g fetch;
$* 2>>~%EOE%;
%package submission is queued(: \.*prj/1.0.12)?%d
%reference: .{12}%
EOE
sed -i -e 's/^(version:) .*$/\1 1.0.13/' prj/manifest;
# Reproduce the situation when the local build2-control branch exists but
# the remote-tracking one doesn't (see brep/publish.cxx for details).
#
$g branch -Dr origin/build2-control;
# Note that the push operation is fixed in git 2.32.0 not to print "Branch
# set up to track ..." in the quiet mode.
#
$* >&2 2>>~%EOE%;
synchronizing:
upgrade prj/1.0.13
%Branch '?build2-control'? set up to track remote branch '?build2-control'? from '?origin'?.%d?
%package submission is queued(: \.*prj/1.0.13)?%d
%reference: .{12}%
EOE
# Test publishing after implicit fetches.
#
# Push again into the build2-control branch from another local repository
# (see above for details).
#
$g2 pull --ff-only;
$g2 commit --allow-empty -m 'Dummy2';
$g2 push;
sed -i -e 's/^(version:) .*$/\1 1.0.14/' prj/manifest;
# Note that the prj repository master branch push doesn't implicitly fetch
# the build2-control branch, so the subsequent publishing fails.
#
$g add '*';
$g commit -m 'Create' --no-verify;
$g push --set-upstream origin master;
$* 2>>~%EOE% != 0;
synchronizing:
upgrade prj/1.0.14
%.*
error: unable to push build2-control branch
info: run 'git fetch' and try again
EOE
# Note that the prj repository master branch pull fetches the
# build2-control branch implicitly, so the subsequent publishing succeeds.
#
$g pull --ff-only;
$* 2>>~%EOE%;
%package submission is queued(: \.*prj/1.0.14)?%d
%reference: .{12}%
EOE
# Check the build2-control branch commits presence and the files they add.
#
$g checkout build2-control;
$g log --name-only --pretty='format:%s' >>:~%EOO%
%.*
Add prj/1.0.14 publish authorization
%submit/.{16}%
Dummy2
Add prj/1.0.13 publish authorization
%submit/.{16}%
Add prj/1.0.12 publish authorization
%submit/.{16}%
Dummy1
Add prj/1.0.11 publish authorization
%submit/.{16}%
Start
EOO
}
}
|