# HG changeset patch
# User Andrew John Hughes <gnu.andrew@redhat.com>
# Date 1471317230 -3600
# Node ID 5946cb7c3b7eb3dd7113d3fdfa001a66dff53ab8
# Parent  2b2efb516e5a3f7f0c169ed16da65cd24930a864
PR3144: Test subdirectory of build tree not emptied

2016-08-15  Andrew John Hughes  <gnu.andrew@member.fsf.org>

	PR3144: Test subdirectory of build tree not emptied
	* Makefile.am:
	(CRYPTO_CHECK_BUILD_DIR): Make a subdirectory of
	'test'.
	(clean-tests): Depend on clean-cryptocheck and
	clean-mimetypecheck. Don't try to remove the
	test directory as it will always contain the
	configure-generated jstapset.pl.
	(clean-local); Remove clean-cryptocheck and
	clean-mimetypecheck dependencies now handled
	by clean-tests.
	(clean-mimetypecheck); Depend on clean-check-mimetype
	as that removes a file in the directory which
	this target deletes.
	* NEWS: Updated.

diff -r 2b2efb516e5a -r 5946cb7c3b7e ChangeLog
--- a/ChangeLog	Mon Aug 15 20:13:54 2016 +0100
+++ b/ChangeLog	Tue Aug 16 04:13:50 2016 +0100
@@ -1,3 +1,21 @@
+2016-08-15  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR3144: Test subdirectory of build tree not emptied
+	* Makefile.am:
+	(CRYPTO_CHECK_BUILD_DIR): Make a subdirectory of
+	'test'.
+	(clean-tests): Depend on clean-cryptocheck and
+	clean-mimetypecheck. Don't try to remove the
+	test directory as it will always contain the
+	configure-generated jstapset.pl.
+	(clean-local); Remove clean-cryptocheck and
+	clean-mimetypecheck dependencies now handled
+	by clean-tests.
+	(clean-mimetypecheck); Depend on clean-check-mimetype
+	as that removes a file in the directory which
+	this target deletes.
+	* NEWS: Updated.
+
 2016-07-27  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR3142: Don't assume system mime.types
diff -r 2b2efb516e5a -r 5946cb7c3b7e Makefile.am
--- a/Makefile.am	Mon Aug 15 20:13:54 2016 +0100
+++ b/Makefile.am	Tue Aug 16 04:13:50 2016 +0100
@@ -46,7 +46,7 @@
 FONTCONFIG_PATH = openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs
 REWRITER_BUILD_DIR = $(abs_top_builddir)/rewriter.build
 GENERATED_BUILD_DIR = $(abs_top_builddir)/generated.build
-CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/cryptocheck.build
+CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/test/cryptocheck.build
 MIME_TYPE_CHECK_BUILD_DIR = $(abs_top_builddir)/test/mimetypecheck.build
 
 # Source directories
@@ -1019,12 +1019,7 @@
  check-java-debug check-java-src
 
 clean-tests: clean-jtreg clean-tapset-report clean-check-mimetype \
- clean-check-java-debug clean-check-java-src
-	if [ $(abs_top_srcdir) != $(abs_top_builddir) ] ; then \
-	  if [ -e test ] ; then \
-	    rmdir test ; \
-	  fi \
-	fi
+ clean-check-java-debug clean-check-java-src clean-cryptocheck clean-mimetypecheck
 
 clean-local: clean-tests $(PULSE_JAVA_CLEAN_TARGET) \
  clean-extract clean-ports clean-overlay clean-native-ecj \
@@ -1032,7 +1027,7 @@
  clean-icedtea-against-ecj clean-extract-ecj clean-generated clean-replace-hotspot \
  clean-rewriter clean-rewrite-rhino clean-rt clean-bootstrap-directory \
  clean-bootstrap-directory-ecj clean-bootstrap-directory-symlink \
- clean-bootstrap-directory-symlink-ecj clean-fonts clean-cryptocheck clean-mimetypecheck
+ clean-bootstrap-directory-symlink-ecj clean-fonts
 	if [ -e bootstrap ]; then \
 	  rmdir bootstrap ; \
 	fi
@@ -3049,7 +3044,7 @@
 	mkdir -p stamps
 	touch $@
 
-clean-mimetypecheck:
+clean-mimetypecheck: clean-check-mimetype
 	rm -rf $(MIME_TYPE_CHECK_BUILD_DIR)
 	rm -f stamps/mimetypecheck.stamp
 
diff -r 2b2efb516e5a -r 5946cb7c3b7e NEWS
--- a/NEWS	Mon Aug 15 20:13:54 2016 +0100
+++ b/NEWS	Tue Aug 16 04:13:50 2016 +0100
@@ -49,6 +49,7 @@
   - PR3139: Update documentation
   - PR3140: Pass $(CC) and $(CXX) to OpenJDK build
   - PR3142: Don't assume system mime.types supports text/x-java-source
+  - PR3144: Test subdirectory of build tree not emptied
 
 New in release 1.13.11 (2016-05-05):