Backed out changeset 8553d6d258cc (bug 952206) for Windows bustage.

CLOSED TREE

build/pymake/pymake/data.py

@@ -1590,13 +1590,8 @@ class _RemakeContext(object):
     def remakecb(self, error, didanything):
         assert error in (True, False)
 
-        if error:
-            if self.required:
-                self.cb(remade=False, error=util.MakeError(
-                    'Error remaking required makefiles'))
-                return
-            else:
-                print 'Error remaking makefiles (ignored)'
+        if error and self.required:
+            print "Error remaking makefiles (ignored)"
 
         if len(self.toremake):
             target, self.required = self.toremake.pop(0)

build/pymake/tests/include-required-fails.mk

@@ -1,12 +0,0 @@
-#T returncode: 2
-
-# Required include targets that fail should abort execution.
-
-include dummy.mk
-
-all:
-	@echo TEST-FAIL
-
-dummy.mk:
-	@echo "Evaluated dummy.mk"
-	exit 1