Bug 1063728 - Run check_spidermonkey_style.py before starting to build; r=jandem
authorEhsan Akhgari <ehsan@mozilla.com>
Fri, 05 Sep 2014 18:00:24 -0400
changeset 203979 9a796d86bae8a80e6f0121846dd6e3ece178f64b
parent 203978 e584d23b3ce3f9fbe169577f085ed62c030af7d0
child 203980 46995fe95c3e373ca6dd2dde4e3beb573f8b2f8f
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersjandem
bugs1063728
milestone35.0a1
Bug 1063728 - Run check_spidermonkey_style.py before starting to build; r=jandem
config/check_spidermonkey_style.py
js/src/Makefile.in
--- a/config/check_spidermonkey_style.py
+++ b/config/check_spidermonkey_style.py
@@ -569,16 +569,20 @@ def tarjan(V, E):
     for v in V:
         if v not in vertex_index:
             index = strongconnect(v, index)
 
     return all_SCCs
 
 
 def main():
+    # Suppress the build time check if MOZ_NO_BUILD_TIME_SM_CHECKS is set.
+    if "MOZ_NO_BUILD_TIME_SM_CHECKS" in os.environ:
+        sys.exit(0)
+
     ok = check_style()
 
     if ok:
         print('TEST-PASS | check_spidermonkey_style.py | ok')
     else:
         print('TEST-UNEXPECTED-FAIL | check_spidermonkey_style.py | actual output does not match expected output;  diff is above')
 
     sys.exit(0 if ok else 1)
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -132,17 +132,17 @@ endif
 check-style::
 	(cd $(srcdir) && $(PYTHON) $(topsrcdir)/config/check_spidermonkey_style.py);
 
 check-jit-test::
 	$(JITTEST_ASAN_ENV) $(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/jit-test/jit_test.py \
 	        --no-slow --no-progress --tinderbox --tbpl $(JITTEST_VALGRIND_FLAG) \
 	        $(DIST)/bin/$(JS_SHELL_NAME)$(BIN_SUFFIX)
 
-check:: check-style
+export:: check-style
 
 # jstests doesn't have a --jitflags option, so we need to loop, updating the
 # exit code (RC) after each invocation.
 # FIXME: MethodJIT doesn't work for 1 test case (bug 644393), so
 # --no-extensions is set to skip that test. Remove as soon as possible.
 check-jstests:
 	RC=0; \
 	for f in `echo '$(JITFLAGS)' | tr ',' '\n'`; \