I still need a review for both of these changes. Mike
On Mar 18 2013, at 22:48 , Mike Duigou wrote: > A two small changes to review: > > If approved I will commit to TL (or someone else can commit to build for me) > > Mike > > JDK-8010267 : Add test-clean for cleaning of testoutput directory from output > directory. > > diff --git a/common/makefiles/Main.gmk b/common/makefiles/Main.gmk > --- a/common/makefiles/Main.gmk > +++ b/common/makefiles/Main.gmk > @@ -191,7 +191,7 @@ source-tips: $(OUTPUT_ROOT)/source_tips > > > # Remove everything, except the output from configure. > -clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot > clean-jdk clean-images clean-overlay-images clean-bootcycle-build clean-docs > +clean: clean-langtools clean-corba clean-jaxp clean-jaxws clean-hotspot > clean-jdk clean-images clean-overlay-images clean-bootcycle-build clean-docs > clean-test > @($(CD) $(OUTPUT_ROOT) && $(RM) -r tmp source_tips build.log* > build-trace*.log*) > @$(ECHO) Cleaned all build artifacts. > > @@ -230,6 +230,8 @@ clean-bootcycle-build: > clean-docs: > $(call CleanComponent,docs) > $(call CleanComponent,docstemp) > +clean-test: > + $(call CleanComponent,testoutput) > > .PHONY: langtools corba jaxp jaxws hotspot jdk images overlay-images install > .PHONY: langtools-only corba-only jaxp-only jaxws-only hotspot-only jdk-only > images-only overlay-images-only install-only > > > JDK-8010268 : Remove dependence upon clean target from jdk/test/Makefile prep > target > > None of the current users seem to depend upon the clean behaviour of "prep" > > diff --git a/test/Makefile b/test/Makefile > --- a/test/Makefile > +++ b/test/Makefile > @@ -336,7 +336,7 @@ all: jdk_default > @$(ECHO) "Testing completed successfully" > > # Prep for output > -prep: clean > +prep: > @$(MKDIR) -p $(ABS_TEST_OUTPUT_DIR) > @$(MKDIR) -p `$(DIRNAME) $(ARCHIVE_BUNDLE)` > >
