diff options
| -rwxr-xr-x | tools/distrib/check_copyright.py | 5 | ||||
| -rwxr-xr-x | tools/run_tests/check_cache_mk.sh | 39 | ||||
| -rwxr-xr-x | tools/run_tests/check_submodules.sh (renamed from tools/run_tests/run_sanity.sh) | 9 | ||||
| -rwxr-xr-x | tools/run_tests/run_tests.py | 8 | ||||
| -rw-r--r-- | tools/run_tests/sanity_tests.yaml | 9 |
5 files changed, 57 insertions, 13 deletions
diff --git a/tools/distrib/check_copyright.py b/tools/distrib/check_copyright.py index 0c0669083a..935acf525e 100755 --- a/tools/distrib/check_copyright.py +++ b/tools/distrib/check_copyright.py @@ -136,7 +136,10 @@ for filename in subprocess.check_output('git ls-tree -r --name-only -r HEAD', else: log(args.skips, 'skip', filename) continue - text = load(filename) + try: + text = load(filename) + except: + continue m = re.search(re_license, text) if m: gdict = m.groupdict() diff --git a/tools/run_tests/check_cache_mk.sh b/tools/run_tests/check_cache_mk.sh new file mode 100755 index 0000000000..b738d6a965 --- /dev/null +++ b/tools/run_tests/check_cache_mk.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +# Copyright 2015-2016, Google Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +set -e + +if [ -f cache.mk ] ; then + echo "Please don't commit cache.mk" + exit 1 +fi + diff --git a/tools/run_tests/run_sanity.sh b/tools/run_tests/check_submodules.sh index 467f06edd7..e75e493726 100755 --- a/tools/run_tests/run_sanity.sh +++ b/tools/run_tests/check_submodules.sh @@ -52,12 +52,3 @@ diff -u $submodules $want_submodules rm $submodules $want_submodules -if [ -f cache.mk ] ; then - echo "Please don't commit cache.mk" - exit 1 -fi - -./tools/buildgen/generate_projects.sh -./tools/distrib/check_copyright.py -./tools/distrib/clang_format_code.sh -./tools/distrib/check_trailing_newlines.sh diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 637aff8585..c1f1576378 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -97,7 +97,7 @@ class SimpleConfig(object): shortname=shortname, environ=actual_environ, cpu_cost=cpu_cost, - timeout_seconds=self.timeout_multiplier * timeout_seconds, + timeout_seconds=(self.timeout_multiplier * timeout_seconds if timeout_seconds else None), hash_targets=hash_targets if self.allow_hashing else None, flake_retries=5 if args.allow_flakes else 0, @@ -444,8 +444,10 @@ class ObjCLanguage(object): class Sanity(object): def test_specs(self, config, args): - return [config.job_spec(['tools/run_tests/run_sanity.sh'], None, timeout_seconds=15*60), - config.job_spec(['tools/run_tests/check_sources_and_headers.py'], None)] + import yaml + with open('tools/run_tests/sanity_tests.yaml', 'r') as f: + return [config.job_spec([cmd['script']], None, timeout_seconds=None, environ={'TEST': 'true'}, cpu_cost=cmd.get('cpu_cost', 1)) + for cmd in yaml.load(f)] def pre_build_steps(self): return [] diff --git a/tools/run_tests/sanity_tests.yaml b/tools/run_tests/sanity_tests.yaml new file mode 100644 index 0000000000..160acde565 --- /dev/null +++ b/tools/run_tests/sanity_tests.yaml @@ -0,0 +1,9 @@ +# a set of tests that are run in parallel for sanity tests +- script: tools/run_tests/check_sources_and_headers.py +- script: tools/run_tests/check_submodules.sh +- script: tools/run_tests/check_cache_mk.sh +- script: tools/buildgen/generate_projects.sh + cpu_cost: 100 +- script: tools/distrib/check_copyright.py +- script: tools/distrib/clang_format_code.sh +- script: tools/distrib/check_trailing_newlines.sh |