Index: scripts/slave/recipes/skia/swarm_test.py |
diff --git a/scripts/slave/recipes/skia/swarm_test.py b/scripts/slave/recipes/skia/swarm_test.py |
index 54c7fbf7c0c1d68dfe3e4926c89b74bc41ad5a6d..0a0e6d896a4dba12e156a3d1ee799124dac7767f 100644 |
--- a/scripts/slave/recipes/skia/swarm_test.py |
+++ b/scripts/slave/recipes/skia/swarm_test.py |
@@ -83,6 +83,8 @@ def GenTests(api): |
swarm_out_dir='[SWARM_OUT_DIR]') + |
api.path.exists( |
api.path['slave_build'].join('skia'), |
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', |
+ 'skimage', 'VERSION'), |
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') |
) |
) |
@@ -111,6 +113,8 @@ def GenTests(api): |
swarm_out_dir='[SWARM_OUT_DIR]') + |
api.path.exists( |
api.path['slave_build'].join('skia'), |
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', |
+ 'skimage', 'VERSION'), |
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') |
) + |
api.step_data('dm', retcode=1) |
@@ -127,6 +131,8 @@ def GenTests(api): |
swarm_out_dir='[SWARM_OUT_DIR]') + |
api.path.exists( |
api.path['slave_build'].join('skia'), |
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', |
+ 'skimage', 'VERSION'), |
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') |
) + |
AndroidTestData(builder) + |
@@ -134,11 +140,7 @@ def GenTests(api): |
stdout=api.raw_io.output('42')) + |
api.step_data('read SK_IMAGE_VERSION', |
stdout=api.raw_io.output('42')) + |
- api.step_data('get uninteresting hashes', retcode=1) + |
- api.path.exists( |
- api.path['slave_build'].join('skia'), |
- api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') |
- ) |
+ api.step_data('get uninteresting hashes', retcode=1) |
) |
yield ( |
@@ -151,6 +153,8 @@ def GenTests(api): |
swarm_out_dir='[SWARM_OUT_DIR]') + |
api.path.exists( |
api.path['slave_build'].join('skia'), |
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', |
+ 'skimage', 'VERSION'), |
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') |
) + |
AndroidTestData(builder) + |
@@ -160,11 +164,7 @@ def GenTests(api): |
stdout=api.raw_io.output('42')) + |
api.step_data( |
'exists skps', |
- stdout=api.raw_io.output('')) + |
- api.path.exists( |
- api.path['slave_build'].join('skia'), |
- api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') |
- ) |
+ stdout=api.raw_io.output('')) |
) |
yield ( |
@@ -177,6 +177,8 @@ def GenTests(api): |
swarm_out_dir='[SWARM_OUT_DIR]') + |
api.path.exists( |
api.path['slave_build'].join('skia'), |
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', |
+ 'skimage', 'VERSION'), |
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') |
) + |
AndroidTestData(builder) + |
@@ -186,11 +188,7 @@ def GenTests(api): |
stdout=api.raw_io.output('42')) + |
api.step_data( |
'exists skps', |
- stdout=api.raw_io.output('')) + |
- api.path.exists( |
- api.path['slave_build'].join('skia'), |
- api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') |
- ) |
+ stdout=api.raw_io.output('')) |
) |
yield ( |
@@ -203,6 +201,8 @@ def GenTests(api): |
swarm_out_dir='[SWARM_OUT_DIR]') + |
api.path.exists( |
api.path['slave_build'].join('skia'), |
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', |
+ 'skimage', 'VERSION'), |
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') |
) + |
AndroidTestData(builder) + |
@@ -212,11 +212,7 @@ def GenTests(api): |
stdout=api.raw_io.output('2')) + |
api.step_data( |
'exists skia_images', |
- stdout=api.raw_io.output('')) + |
- api.path.exists( |
- api.path['slave_build'].join('skia'), |
- api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') |
- ) |
+ stdout=api.raw_io.output('')) |
) |
yield ( |
@@ -229,6 +225,8 @@ def GenTests(api): |
swarm_out_dir='[SWARM_OUT_DIR]') + |
api.path.exists( |
api.path['slave_build'].join('skia'), |
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', |
+ 'skimage', 'VERSION'), |
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') |
) + |
AndroidTestData(builder) + |
@@ -238,11 +236,7 @@ def GenTests(api): |
retcode=1) + |
api.step_data( |
'exists skia_images', |
- stdout=api.raw_io.output('')) + |
- api.path.exists( |
- api.path['slave_build'].join('skia'), |
- api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') |
- ) |
+ stdout=api.raw_io.output('')) |
) |
yield ( |
@@ -255,22 +249,21 @@ def GenTests(api): |
swarm_out_dir='[SWARM_OUT_DIR]') + |
api.path.exists( |
api.path['slave_build'].join('skia'), |
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', |
+ 'skimage', 'VERSION'), |
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') |
) + |
AndroidTestData(builder, adb='/usr/bin/adb') + |
api.step_data('read SKP_VERSION', |
stdout=api.raw_io.output('42')) + |
api.step_data('read SK_IMAGE_VERSION', |
- stdout=api.raw_io.output('42')) + |
- api.path.exists( |
- api.path['slave_build'].join('skia'), |
- api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') |
- ) |
+ stdout=api.raw_io.output('42')) |
) |
+ builder = 'Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Release-Trybot' |
yield ( |
api.test('big_issue_number') + |
- api.properties(buildername='Build-Win-MSVC-x86-Debug', |
+ api.properties(buildername=builder, |
mastername='client.skia.compile', |
slavename='skiabot-linux-swarm-000', |
buildnumber=5, |
@@ -281,7 +274,24 @@ def GenTests(api): |
issue=2147533002L) + |
api.path.exists( |
api.path['slave_build'].join('skia'), |
+ api.path['slave_build'].join('skia', 'infra', 'bots', 'assets', |
+ 'skimage', 'VERSION'), |
api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') |
) + |
api.platform('win', 64) |
) |
+ |
+ builder = 'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug' |
+ yield ( |
+ api.test('legacy_skimage_version') + |
+ api.properties(buildername=builder, |
+ mastername='client.skia', |
+ slavename='skiabot-linux-swarm-000', |
+ buildnumber=6, |
+ revision='abc123', |
+ swarm_out_dir='[SWARM_OUT_DIR]') + |
+ api.path.exists( |
+ api.path['slave_build'].join('skia'), |
+ api.path['slave_build'].join('tmp', 'uninteresting_hashes.txt') |
+ ) |
+ ) |