summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-17 18:20:06 +0000
committerSam Thursfield <sam.thursfield@codethink.co.uk>2015-02-17 18:20:06 +0000
commit9c8a7333ff0b86e1e2bb0bd5de0f7ff199980e03 (patch)
tree3004606d38b3cbccc6c6908575eef0ba6d1f9ccd
parent39a5a942c86f58f2b80b1054f4209f907bf96461 (diff)
downloadmorph-9c8a7333ff0b86e1e2bb0bd5de0f7ff199980e03.tar.gz
5: build once system, while repeatedly starting and cancelling another
No errors.
-rwxr-xr-xscripts/distbuild32
1 files changed, 21 insertions, 11 deletions
diff --git a/scripts/distbuild b/scripts/distbuild
index 349b929c..0c6aaa86 100755
--- a/scripts/distbuild
+++ b/scripts/distbuild
@@ -319,12 +319,12 @@ class DistbuildTestHarness(cliapp.Application):
['baserock:baserock/definitions',
'c7292b7c81cdd7e5b9e85722406371748453c44f',
'systems/weston-system-x86_64-generic.morph'],
- ['baserock:baserock/definitions',
- '918e33e27a3c8921c6fcad517e5bbe394cf16168',
- 'systems/base-system-x86_64-generic.morph'],
- ['baserock:baserock/definitions',
- '918e33e27a3c8921c6fcad517e5bbe394cf16168',
- 'systems/weston-system-x86_64-generic.morph']
+ #['baserock:baserock/definitions',
+ # '918e33e27a3c8921c6fcad517e5bbe394cf16168',
+ # 'systems/base-system-x86_64-generic.morph'],
+ #['baserock:baserock/definitions',
+ # '918e33e27a3c8921c6fcad517e5bbe394cf16168',
+ # 'systems/weston-system-x86_64-generic.morph']
]
try:
@@ -342,13 +342,23 @@ class DistbuildTestHarness(cliapp.Application):
initiators = []
initiator_monitor = ProcessMonitor()
try:
- for i, triplet in enumerate(to_build):
+ main_initiator = self.start_build(
+ 'build-main', controller, to_build[1],
+ log_path=subdir(datadir, 'main'))
+ initiators.append(main_initiator)
+ initiator_monitor.watch(main_initiator)
+
+ # Start a bunch of builds, cancelling them after 90 seconds.
+ for i in range(0,12):
initiator = self.start_build(
- 'build-%i' % i, controller, triplet,
+ 'build-%i' % i, controller, to_build[0],
log_path=subdir(datadir, str(i)))
- initiators.append(initiator)
- initiator_monitor.watch(initiator)
- time.sleep(30)
+
+ time.sleep(90)
+
+ print('Cancel initiator %s' % initiator)
+ initiator.terminate()
+ initiator.wait()
while not all(initiator.poll() for initiator in initiators):
select.select([], [], [], 0.1)