# HG changeset patch
# User erikj
# Date 1494433651 -7200
# Node ID 4635fa3adac65633c55c41eac2de411756975e3c
# Parent  7583288d0802e37295f7e646f702ea5ead17f8a6
8179867: JDK9 b167: demos exist in JDK bundles
Reviewed-by: ihse

diff -r 7583288d0802 -r 4635fa3adac6 make/Bundles.gmk
--- a/make/Bundles.gmk	Wed May 10 09:02:51 2017 +0200
+++ b/make/Bundles.gmk	Wed May 10 18:27:31 2017 +0200
@@ -183,6 +183,7 @@
           $(JDK_SYMBOLS_EXCLUDE_PATTERN) \
           $(JDK_EXTRA_EXCLUDES) \
           $(SYMBOLS_EXCLUDE_PATTERN) \
+          $(JDK_IMAGE_HOMEDIR)/demo/%
           , \
           $(ALL_JDK_FILES) \
       )
diff -r 7583288d0802 -r 4635fa3adac6 make/Main.gmk
--- a/make/Main.gmk	Wed May 10 09:02:51 2017 +0200
+++ b/make/Main.gmk	Wed May 10 18:27:31 2017 +0200
@@ -277,7 +277,10 @@
 demos-jdk:
 	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileDemos.gmk)
 
-ALL_TARGETS += demos-jdk
+test-image-demos-jdk:
+	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileDemos.gmk images)
+
+ALL_TARGETS += demos-jdk test-image-demos-jdk
 
 ################################################################################
 # Jigsaw specific data and analysis targets.
@@ -631,6 +634,7 @@
   # jdk libs, even though they don't need to. To avoid warnings, make sure they
   # aren't built until after libjava and libjvm are available to link to.
   demos-jdk: java.base-libs exploded-image-optimize
+  test-image-demos-jdk: demos-jdk
 
   # Declare dependency from <module>-java to <module>-gensrc
   $(foreach m, $(GENSRC_MODULES), $(eval $m-java: $m-gensrc))
@@ -963,7 +967,8 @@
 
 # This target builds the test image
 test-image: prepare-test-image test-image-hotspot-jtreg-native \
-    test-image-jdk-jtreg-native test-image-failure-handler test-image-hotspot-gtest
+    test-image-jdk-jtreg-native test-image-failure-handler test-image-hotspot-gtest \
+    test-image-demos-jdk
 
 # all-images builds all our deliverables as images.
 all-images: product-images test-image docs-image