From 489d04b0aa760c7c3fc17f5ba28e22e6e7d3541d Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Mon, 8 Jul 2019 10:08:32 -0400 Subject: [PATCH] Re-Enable Codec tests on Wuffs bot Bug: skia:8235 Bug: skia:8750 Bug: skia:8762 This reverts commit 30d15e6ca04460252a0a15eb378cab426dc6f3c2 ("Blacklist Codec tests on Wuffs bot"). Change-Id: I9d8f7dcbb6333590ef3ca70997e76fac6407fcbe Reviewed-on: https://skia-review.googlesource.com/c/skia/+/224178 Auto-Submit: Leon Scroggins Reviewed-by: Kevin Lubick Commit-Queue: Leon Scroggins --- ...g-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs.json | 307 ------------------ infra/bots/recipes/test.py | 7 - 2 files changed, 314 deletions(-) delete mode 100644 infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs.json diff --git a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs.json b/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs.json deleted file mode 100644 index fda937266f..0000000000 --- a/infra/bots/recipes/test.expected/Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs.json +++ /dev/null @@ -1,307 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/tmp" - ], - "infra_step": true, - "name": "makedirs tmp_dir" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[START_DIR]/skia/infra/bots/assets/skp/VERSION", - "/path/to/tmp/" - ], - "infra_step": true, - "name": "Get skp VERSION" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "42", - "[START_DIR]/tmp/SKP_VERSION" - ], - "infra_step": true, - "name": "write SKP_VERSION", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@SKP_VERSION@42@@@", - "@@@STEP_LOG_END@SKP_VERSION@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", - "/path/to/tmp/" - ], - "infra_step": true, - "name": "Get skimage VERSION" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "42", - "[START_DIR]/tmp/SK_IMAGE_VERSION" - ], - "infra_step": true, - "name": "write SK_IMAGE_VERSION", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@SK_IMAGE_VERSION@42@@@", - "@@@STEP_LOG_END@SK_IMAGE_VERSION@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "[START_DIR]/skia/infra/bots/assets/svg/VERSION", - "/path/to/tmp/" - ], - "infra_step": true, - "name": "Get svg VERSION" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "copy", - "42", - "[START_DIR]/tmp/SVG_VERSION" - ], - "infra_step": true, - "name": "write SVG_VERSION", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@SVG_VERSION@42@@@", - "@@@STEP_LOG_END@SVG_VERSION@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "rmtree", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "rmtree test" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", - "--json-output", - "/path/to/tmp/json", - "ensure-directory", - "--mode", - "0777", - "[START_DIR]/test" - ], - "infra_step": true, - "name": "makedirs test" - }, - { - "cmd": [ - "python", - "-u", - "\nimport contextlib\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nHASHES_URL = sys.argv[1]\nRETRIES = 5\nTIMEOUT = 60\nWAIT_BASE = 15\n\nsocket.setdefaulttimeout(TIMEOUT)\nfor retry in range(RETRIES):\n try:\n with contextlib.closing(\n urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:\n hashes = w.read()\n with open(sys.argv[2], 'w') as f:\n f.write(hashes)\n break\n except Exception as e:\n print 'Failed to get uninteresting hashes from %s:' % HASHES_URL\n print e\n if retry == RETRIES:\n raise\n waittime = WAIT_BASE * math.pow(2, retry)\n print 'Retry in %d seconds.' % waittime\n time.sleep(waittime)\n", - "https://example.com/hashes.txt", - "[START_DIR]/tmp/uninteresting_hashes.txt" - ], - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_REPO[depot_tools]" - }, - "infra_step": true, - "name": "get uninteresting hashes", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import contextlib@@@", - "@@@STEP_LOG_LINE@python.inline@import math@@@", - "@@@STEP_LOG_LINE@python.inline@import socket@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@import time@@@", - "@@@STEP_LOG_LINE@python.inline@import urllib2@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@HASHES_URL = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@RETRIES = 5@@@", - "@@@STEP_LOG_LINE@python.inline@TIMEOUT = 60@@@", - "@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 15@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@socket.setdefaulttimeout(TIMEOUT)@@@", - "@@@STEP_LOG_LINE@python.inline@for retry in range(RETRIES):@@@", - "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ with contextlib.closing(@@@", - "@@@STEP_LOG_LINE@python.inline@ urllib2.urlopen(HASHES_URL, timeout=TIMEOUT)) as w:@@@", - "@@@STEP_LOG_LINE@python.inline@ hashes = w.read()@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ f.write(hashes)@@@", - "@@@STEP_LOG_LINE@python.inline@ break@@@", - "@@@STEP_LOG_LINE@python.inline@ except Exception as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Failed to get uninteresting hashes from %s:' % HASHES_URL@@@", - "@@@STEP_LOG_LINE@python.inline@ print e@@@", - "@@@STEP_LOG_LINE@python.inline@ if retry == RETRIES:@@@", - "@@@STEP_LOG_LINE@python.inline@ raise@@@", - "@@@STEP_LOG_LINE@python.inline@ waittime = WAIT_BASE * math.pow(2, retry)@@@", - "@@@STEP_LOG_LINE@python.inline@ print 'Retry in %d seconds.' % waittime@@@", - "@@@STEP_LOG_LINE@python.inline@ time.sleep(waittime)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n" - ], - "name": "get swarming bot id", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n" - ], - "name": "get swarming task id", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[skia::flavor]/resources/symbolize_stack_trace.py", - "[START_DIR]", - "catchsegv", - "[START_DIR]/build/dm", - "--resourcePath", - "[START_DIR]/skia/resources", - "--skps", - "[START_DIR]/skp", - "--images", - "[START_DIR]/skimage/dm", - "--colorImages", - "[START_DIR]/skimage/colorspace", - "--nameByHash", - "--properties", - "gitHash", - "abc123", - "builder", - "Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs", - "buildbucket_build_id", - "123454321", - "task_id", - "task_12345", - "swarming_bot_id", - "skia-bot-123", - "swarming_task_id", - "123456", - "--svgs", - "[START_DIR]/svg", - "--key", - "arch", - "x86_64", - "compiler", - "Clang", - "configuration", - "Debug", - "cpu_or_gpu", - "CPU", - "cpu_or_gpu_value", - "AVX2", - "extra_config", - "Wuffs", - "model", - "GCE", - "os", - "Debian9", - "style", - "default", - "--uninterestingHashesFile", - "[START_DIR]/tmp/uninteresting_hashes.txt", - "--writePath", - "[START_DIR]/[SWARM_OUT_DIR]", - "--dont_write", - "pdf", - "--randomProcessorTest", - "--nogpu", - "--config", - "8888", - "--src", - "tests", - "gm", - "image", - "colorImage", - "--blacklist", - "_", - "image", - "gen_platf", - "error", - "_", - "tests", - "_", - "Codec_partial", - "_", - "tests", - "_", - "Codec_gif", - "--nonativeFonts", - "--verbose" - ], - "cwd": "[START_DIR]/skia", - "env": { - "CHROME_HEADLESS": "1", - "PATH": ":RECIPE_REPO[depot_tools]" - }, - "name": "symbolized dm" - }, - { - "name": "$result" - } -] \ No newline at end of file diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index b8b2b4480d..424fbc02c9 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -767,12 +767,6 @@ def dm_flags(api, bot): # skia:7603 match.append('~^GrMeshTest$') - if 'Wuffs' in api.vars.extra_tokens: - # skia:8750 - blacklist(['_', 'tests', '_', 'Codec_partial']) - # skia:8762 - blacklist(['_', 'tests', '_', 'Codec_gif']) - if 'LenovoYogaC630' in bot and 'ANGLE' in api.vars.extra_tokens: # skia:8976 blacklist(['_', 'tests', '_', 'GrDefaultPathRendererTest']) @@ -1018,7 +1012,6 @@ TEST_BUILDERS = [ 'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-MSAN', ('Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All' '-SK_USE_DISCARDABLE_SCALEDIMAGECACHE'), - 'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-Wuffs', 'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-Lottie', ('Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All' '-SK_FORCE_RASTER_PIPELINE_BLITTER'),