From 1af0983e5b8a2949abd18a45642876f1f28f2ff8 Mon Sep 17 00:00:00 2001 From: cclauss Date: Fri, 29 Mar 2019 11:55:35 +0100 Subject: [PATCH 1/5] tools: js2c.py use ==/!= to compare str, bytes, and int literals --- tools/js2c.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/js2c.py b/tools/js2c.py index eff44940c57ec6..d255010ad011fc 100755 --- a/tools/js2c.py +++ b/tools/js2c.py @@ -149,7 +149,7 @@ def ReadMacros(lines): hash = line.find('#') if hash != -1: line = line[:hash] line = line.strip() - if len(line) is 0: continue + if len(line) == 0: continue const_match = CONST_PATTERN.match(line) if const_match: name = const_match.group(1) From 933847771ddf5ee1ccc79d2861bdb113c5f4a5a6 Mon Sep 17 00:00:00 2001 From: cclauss Date: Fri, 29 Mar 2019 12:01:44 +0100 Subject: [PATCH 2/5] tools: test.py use ==/!= to compare str, bytes, and int literals --- tools/test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/test.py b/tools/test.py index cb501637b8d524..19db5fdeaec41a 100755 --- a/tools/test.py +++ b/tools/test.py @@ -355,7 +355,7 @@ def HasRun(self, output): logger.info(' ---') logger.info(' duration_ms: %d.%d' % (total_seconds, duration.microseconds / 1000)) - if self.severity is not 'ok' or self.traceback is not '': + if self.severity != 'ok' or self.traceback != '': if output.HasTimedOut(): self.traceback = 'timeout\n' + output.output.stdout + output.output.stderr self._printDiagnostic() @@ -1641,7 +1641,7 @@ def Main(): continue archEngineContext = Execute([vm, "-p", "process.arch"], context) vmArch = archEngineContext.stdout.rstrip() - if archEngineContext.exit_code is not 0 or vmArch == "undefined": + if archEngineContext.exit_code != 0 or vmArch == "undefined": print("Can't determine the arch of: '%s'" % vm) print(archEngineContext.stderr.rstrip()) continue From ed49fdf423c0c9e6ba5012db92d8438d7da9e160 Mon Sep 17 00:00:00 2001 From: cclauss Date: Fri, 29 Mar 2019 15:31:29 +0100 Subject: [PATCH 3/5] Travis CI: Add 5 extra minutes for make to complete https://docs.travis-ci.com/user/common-build-problems/#build-times-out-because-no-output-was-received --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2569b44ec39e83..8f85f7a520db5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,4 +31,4 @@ matrix: - ./configure - make -j2 V= script: - - PARALLEL_ARGS='--flaky-tests=skip' make -j1 test + - travis_wait 5 PARALLEL_ARGS='--flaky-tests=skip' make -j1 test From ab3babc1bcd16604ae362facf6568c0d77444091 Mon Sep 17 00:00:00 2001 From: cclauss Date: Fri, 29 Mar 2019 16:24:51 +0100 Subject: [PATCH 4/5] Move the travis_wait --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8f85f7a520db5c..798a39c2e9774e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,4 +31,4 @@ matrix: - ./configure - make -j2 V= script: - - travis_wait 5 PARALLEL_ARGS='--flaky-tests=skip' make -j1 test + - PARALLEL_ARGS='--flaky-tests=skip' travis_wait 5 make -j1 test From d153c7d7e649e006acca4a58160b3155701e90b0 Mon Sep 17 00:00:00 2001 From: cclauss Date: Fri, 29 Mar 2019 17:40:04 +0100 Subject: [PATCH 5/5] .travis.yml: Revert the travis_wait --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 798a39c2e9774e..2569b44ec39e83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,4 +31,4 @@ matrix: - ./configure - make -j2 V= script: - - PARALLEL_ARGS='--flaky-tests=skip' travis_wait 5 make -j1 test + - PARALLEL_ARGS='--flaky-tests=skip' make -j1 test