From 507335ea694edc152200d81ffceb67058ed3d1ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Wed, 29 Apr 2015 09:10:04 +0200 Subject: [PATCH 1/3] Make check-requires.py exit 1 on missing/unused requires --- bin/check-requires.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bin/check-requires.py b/bin/check-requires.py index 6422985ff2..09503ea291 100644 --- a/bin/check-requires.py +++ b/bin/check-requires.py @@ -181,10 +181,13 @@ def check_requires(closure_lib, *filenames): (filename, uses_linenos[missing_require], missing_require)) missing_count += 1 - if unused_count or missing_count: - logger.error('%d unused goog.requires, %d missing goog.requires' % - (unused_count, missing_count)) + + return (unused_count, missing_count) if __name__ == "__main__": - check_requires(*sys.argv[1:]) + unused_count, missing_count = check_requires(*sys.argv[1:]) + if unused_count > 0 or missing_count > 0: + logger.error('%d unused goog.requires, %d missing goog.requires' % + (unused_count, missing_count)) + sys.exit(1) From 6d1baec34a896542d1219be41c2d73a305e06abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Wed, 29 Apr 2015 09:10:18 +0200 Subject: [PATCH 2/3] Add missing goog.require --- test/spec/ol/interaction/modifyinteraction.test.js | 1 + 1 file changed, 1 insertion(+) diff --git a/test/spec/ol/interaction/modifyinteraction.test.js b/test/spec/ol/interaction/modifyinteraction.test.js index 17807fabbb..5991fd7d4a 100644 --- a/test/spec/ol/interaction/modifyinteraction.test.js +++ b/test/spec/ol/interaction/modifyinteraction.test.js @@ -145,6 +145,7 @@ goog.require('ol.Feature'); goog.require('ol.Map'); goog.require('ol.MapBrowserPointerEvent'); goog.require('ol.View'); +goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); goog.require('ol.interaction.Modify'); goog.require('ol.layer.Vector'); From b4434725a5b546e11153afdb7b3c70b24cd4cc61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Lemoine?= Date: Wed, 29 Apr 2015 09:12:13 +0200 Subject: [PATCH 3/3] Make check-whitespace.py exit 1 on whitespace errors --- bin/check-whitespace.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/check-whitespace.py b/bin/check-whitespace.py index 4ce5996bf6..e8a123ba3c 100644 --- a/bin/check-whitespace.py +++ b/bin/check-whitespace.py @@ -37,8 +37,10 @@ def check_whitespace(*filenames): if whitespace: logger.info('%s: trailing whitespace at end of file', filename) errors += 1 - if errors: - logger.error('%d whitespace errors' % (errors,)) + return errors if __name__ == "__main__": - check_whitespace(*sys.argv[1:]) + errors = check_whitespace(*sys.argv[1:]) + if errors > 0: + logger.error('%d whitespace errors' % (errors,)) + sys.exit(1)