Changeset 309 for trunk/openjdk/Makefile

Timestamp:

Feb 13, 2012, 10:07:12 PM (14 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b24 from branches/vendor/oracle.

Location:

trunk/openjdk

Files:

• . (modified) (1 prop)
• Makefile (modified) (3 diffs)

trunk/openjdk/Makefile

@@ -1 +1 @@
 #
-# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -475 +475 @@
 $(OUTPUTDIR)/test_failures.txt: $(OUTPUTDIR)/test_log.txt
         @$(RM) $@
-        @( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) > $@
+        @( $(EGREP) '^FAILED:' $< || $(ECHO) "" ) | $(NAWK) 'length>0' > $@
 
 # Get log file of all tests run
@@ -489 +489 @@
 $(OUTPUTDIR)/test_log.txt:
         $(RM) $@
-        ( $(CD) test &&                                     \
-          $(MAKE) NO_STOPPING=- PRODUCT_HOME=$(JDK_TO_TEST) \
+        ( $(CD) test &&                                                 \
+          $(MAKE) NO_STOPPING=-                                         \
+                  ALT_OUTPUTDIR=$(ABS_OUTPUTDIR)                        \
+                  ALT_JDK_IMPORT_PATH=$(JDK_TO_TEST)                    \
+                  PRODUCT_HOME=$(JDK_TO_TEST)                           \
+                  LANGTOOLS_PRODUCT_HOME=$(ABS_OUTPUTDIR)/langtools     \
         ) | tee $@