--- a/ChangeLog	Mon Mar 14 13:13:16 2016 +0000
+++ b/ChangeLog	Mon Mar 14 18:52:01 2016 +0000
@@ -1,3 +1,16 @@
+2016-03-14  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR2880: Add missing test directory in make check
+	* Makefile.am:
+	(CRYPTO_CHECK_BUILD_DIR): Locate inside the test
+	directory.
+	(ECC_CHECK_BUILD_DIR): Likewise.
+	(jtregcheck): Create the test directory if it
+	doesn't exist.
+	(check-tapset-probes): Likewise.
+	(check-tapset-jstack): Likewise.
+	* NEWS: Updated.
+
 2016-03-04  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR2873: Fix make distcheck

--- a/Makefile.am	Mon Mar 14 13:13:16 2016 +0000
+++ b/Makefile.am	Mon Mar 14 18:52:01 2016 +0000
@@ -68,8 +68,8 @@
 STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot
 STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea
 JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot
-CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/cryptocheck.build
-ECC_CHECK_BUILD_DIR = $(abs_top_builddir)/ecccheck.build
+CRYPTO_CHECK_BUILD_DIR = $(abs_top_builddir)/test/cryptocheck.build
+ECC_CHECK_BUILD_DIR = $(abs_top_builddir)/test/ecccheck.build
 
 # Source directories
 
@@ -2182,6 +2182,7 @@
 	| awk '$$2 == 1 && $$3 ~ /^$(subst /,\/,$(CURDIR)/$(sdkimg))/ {print $$1}'
 
 jtregcheck: $(TESTS_TO_RUN)
+	$(MKDIR_P) test
 	for i in $(TEST_SUITES); do \
 	  echo "--------------- jtreg console summary for $$i ---------------"; \
 	  egrep -v '^(Passed:|Directory|Re[a-z]+\ written\ to)' test/check-$$i.log; \
@@ -2215,6 +2216,7 @@
 	if test "x${PERL}" = "x"; then \
 	  echo "ERROR: Perl not found"; exit -1; \
 	fi
+	$(MKDIR_P) test
 	${PERL} $(abs_top_srcdir)/test/tapset/jstaptest.pl \
 	  -B $(BUILD_IMAGE_DIR) -A $(BUILD_ARCH_DIR) \
 	  -S $(abs_top_srcdir)/test/tapset \
@@ -2226,6 +2228,7 @@
 	if test "x${PERL}" = "x"; then \
 	  echo "ERROR: Perl not found"; exit -1; \
 	fi
+	$(MKDIR_P) test
 	${PERL} $(abs_top_srcdir)/test/tapset/jstaptest.pl \
 	  -B $(BUILD_IMAGE_DIR) -A $(BUILD_ARCH_DIR) \
 	  -S $(abs_top_srcdir)/test/tapset \

--- a/NEWS	Mon Mar 14 13:13:16 2016 +0000
+++ b/NEWS	Mon Mar 14 18:52:01 2016 +0000
@@ -147,6 +147,7 @@
   - PR2853: Revert changes to libpng source code now 8078245 is in place.
   - PR2865: Handle uninstallation.
   - PR2873: Fix make distcheck.
+  - PR2880: Add missing test directory in make check.
   - Don't substitute 'j' for '-j' inside -I directives
   - Extend 8041658 to all files in the HotSpot build.
   - Remove jcheck