Backed out changeset 676dca561a2c
authorChris Cooper <ccooper@deadsquid.com>
Thu, 12 Apr 2012 18:53:25 -0400
changeset 94822 e6f4ae0bd30eee9891863f9a88be6494c9ff27dc
parent 94821 88b2925e68b9e5b4035d93dc56878158b58fcb3e
child 94823 f75b7814f69837f2c6526c2dfd1ceb60a66691e2
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone14.0a1
backs out676dca561a2cfbf1ac57a0e35b2455ec2aa2212a
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 676dca561a2c
config/makefiles/makeutils.mk
config/makefiles/test/Makefile.in
--- a/config/makefiles/makeutils.mk
+++ b/config/makefiles/makeutils.mk
@@ -29,22 +29,8 @@ argv +=)
 ###########################################################################
 ## Access function args as a simple list, inline within user functions.
 ## Usage: $(info ** $(call banner,$(getargv)))
 ##    $(call banner,scalar)
 ##    $(call banner,list0 list1 list2)
 ##    $(call banner,ref) ; ref=foo bar tans
 ## getarglist() would be a more accurate name but is longer to type
 getargv = $(if $(call isvar,$(1)),$($(1)),$(argv))
-
-## http://www.gnu.org/software/make/manual/make.html#Call-Function
-## Usage: o = $(call map,origin,o map $(MAKE))
-map = $(foreach val,$(2),$(call $(1),$(val)))
-
-
-# Usage: $(call checkIfEmpty,[error|warning] foo NULL bar)
-checkIfEmpty =$(foreach var,$(wordlist 2,100,$(getargv)),$(if $(strip $($(var))),$(NOP),$(call $(1),Variable $(var) does not contain a value)))
-
-# Usage: $(call errorIfEmpty,foo NULL bar)
-errorIfEmpty =$(call checkIfEmpty,error $(getargv))
-warnIfEmpty  =$(call checkIfEmpty,warning $(getargv))
-
-
--- a/config/makefiles/test/Makefile.in
+++ b/config/makefiles/test/Makefile.in
@@ -31,24 +31,16 @@ check::
 
 ## Logic processed at compile time so be selective about when to test
 ifneq ($(NULL),$(findstring check,$(MAKECMDGOALS)))
 
 $(info ===========================================================================)
 $(info Running test: $(MAKECMDGOALS): pwd=$(CURDIR))
 $(info ===========================================================================)
 
-
-ifdef VERBOSE
-$(info )
-$(info ===========================================================================)
-$(info Running test: istype, getargv)
-$(info ===========================================================================)
-endif
-
 ## Silent errors are oh so much fun
 ifndef istype
   $(error makeutils.mk was not included)
 endif
 
 # arg_scalar = [scalar|literal]
 arg_list = foo bar
 arg_ref  = arg_list
@@ -93,37 +85,11 @@ ifneq (scalar,$(call getargv,scalar))
 endif
 ifneq ($(arg_list),$(call getargv,arg_list))
   $(error getargv(arg_list)=list, found [$(call getargv,arg_list)])
 endif
 ifneq (arg_list,$(call getargv,arg_ref))
   $(error getargv(arg_ref)=list, found [$(call getargv,arg_ref)])
 endif
 
-
-ifdef MANUAL_TEST
-  # For automated testing a callback is needed that can set an external status
-  # variable that can be tested.  Syntax is tricky to get correct functionality.
-  ifdef VERBOSE
-    $(info )
-    $(info ===========================================================================)
-    $(info Running test: checkIfEmpty)
-    $(info ===========================================================================)
-  endif
-
-  #status =
-  #setTRUE =status=true
-  #setFALSE =status=$(NULL)
-  #$(call checkIfEmpty,setFALSE NULL)
-  #$(if $(status),$(error checkIfEmpty(xyz) failed))
-  #$(call checkIfEmpty,setTRUE xyz)
-  #$(if $(status),$(error checkIfEmpty(xyz) failed))
-  xyz=abc
-  $(info STATUS: warnIfEmpty - two vars)
-  $(call warnIfEmpty,foo xyz bar)
-  $(info STATUS: errorIfEmpty - on first var)
-  $(call errorIfEmpty,foo xyz bar)
-  $(error TEST FAILED: processing should not reach this point)
-endif
-
 endif # check in MAKECMDGOALS