Bug 646763: Fix |make check-ooms| which never ran (r=nnethercote)
authorPaul Biggar <pbiggar@mozilla.com>
Sun, 03 Apr 2011 18:29:46 -0700
changeset 67910 ee8f319bc315e04bfd44105328740bcb020c3f28
parent 67909 5550f333d8c8d9ad18cf950dec92734ff3bab11e
child 67911 f89b07ec09e2c9c35b21dee3b86412441b93808d
push id2
push userclegnitto@mozilla.com
push dateTue, 12 Apr 2011 06:20:47 +0000
treeherdermozilla-aurora@8aafa888ccd5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnnethercote
bugs646763
milestone2.2a1pre
Bug 646763: Fix |make check-ooms| which never ran (r=nnethercote)
config/find_OOM_errors.py
js/src/Makefile.in
js/src/config/find_OOM_errors.py
--- a/config/find_OOM_errors.py
+++ b/config/find_OOM_errors.py
@@ -224,16 +224,18 @@ for f in files:
   max = int(max)
   
   # OOMs don't recover well for the first 20 allocations or so.
   # TODO: revisit this.
   for i in range(20, max): 
 
     if OPTIONS.regression == None:
       print "Testing allocation %d/%d in %s" % (i,max,f)
+    else:
+      sys.stdout.write('.') # something short for tinderbox, no space or \n
 
     command = (command_template + ' -A %d') % (f, i)
     out, err, exit = run(command)
 
     # Success (5 is SM's exit code for controlled errors)
     if exit == 5 and err.find("out of memory") != -1:
       continue
 
@@ -312,16 +314,17 @@ for f in files:
       log.write ("Valgrind info:\n" + vout)
       log.write ("\n")
       log.write ("\n")
       log.flush()
 
   if not OPTIONS.regression == None:
     count_lines()
 
+print '\n',
 
 # Do the actual regression check
 if OPTIONS.regression:
   expected_num_failures = OPTIONS.regression
 
   if num_failures != expected_num_failures:
 
     print "TEST-UNEXPECTED-FAIL |",
--- a/js/src/Makefile.in
+++ b/js/src/Makefile.in
@@ -601,17 +601,17 @@ check:: check-vanilla-new
 endif
 
 # Help ensure that the number of OOM errors in SpiderMonkey doesn't increase.
 # If the number of OOM errors changes, update the number below. We intend this
 # number to go down over time, by fixing OOMs.
 check-ooms:
 	$(wildcard $(RUN_TEST_PROGRAM)) $(PYTHON) -u $(srcdir)/config/find_OOM_errors.py --regression 125
 
-ifdef DEBUG
+ifeq ($(MOZ_DEBUG),1)
 check:: check-ooms
 endif
 
 ## Prevent regressing in our deprecation of non-preferred memory management functions.
 # We use all the files in the distribution so that different configurations
 # don't give different results. We skip the contents of objdirs using |find|
 # (it can't be done with %-expansion, because the files we want to skip aren't
 # in the vpath).
--- a/js/src/config/find_OOM_errors.py
+++ b/js/src/config/find_OOM_errors.py
@@ -224,16 +224,18 @@ for f in files:
   max = int(max)
   
   # OOMs don't recover well for the first 20 allocations or so.
   # TODO: revisit this.
   for i in range(20, max): 
 
     if OPTIONS.regression == None:
       print "Testing allocation %d/%d in %s" % (i,max,f)
+    else:
+      sys.stdout.write('.') # something short for tinderbox, no space or \n
 
     command = (command_template + ' -A %d') % (f, i)
     out, err, exit = run(command)
 
     # Success (5 is SM's exit code for controlled errors)
     if exit == 5 and err.find("out of memory") != -1:
       continue
 
@@ -312,16 +314,17 @@ for f in files:
       log.write ("Valgrind info:\n" + vout)
       log.write ("\n")
       log.write ("\n")
       log.flush()
 
   if not OPTIONS.regression == None:
     count_lines()
 
+print '\n',
 
 # Do the actual regression check
 if OPTIONS.regression:
   expected_num_failures = OPTIONS.regression
 
   if num_failures != expected_num_failures:
 
     print "TEST-UNEXPECTED-FAIL |",