/hg/icedtea-web: Modified Makefile.am to process only whiteliste...

[jkang at icedtea.classpath.org]

changeset 9fbfc6ef9237 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=9fbfc6ef9237
author: Jie Kang <jkang at redhat.com>
date: Fri Sep 19 15:51:19 2014 -0400

	Modified Makefile.am to process only whitelisted reproducers.

	2014-09-19  Jie Kang  <jkang at redhat.com>

	    Modified Makefile.am to use whitelist when processing reproducers.
	    * Makefile.am: Now filters reproducers using netx-dist-tests-whitelist


diffstat:

 ChangeLog   |   5 +++++
 Makefile.am |  22 ++++++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r 6e689ab02eb0 -r 9fbfc6ef9237 ChangeLog
--- a/ChangeLog	Fri Sep 19 15:47:00 2014 -0400
+++ b/ChangeLog	Fri Sep 19 15:51:19 2014 -0400
@@ -1,3 +1,8 @@
+2014-09-19  Jie Kang  <jkang at redhat.com>
+
+    Modified Makefile.am to use whitelist when processing reproducers.
+    * Makefile.am: Now filters reproducers using netx-dist-tests-whitelist
+
 2014-09-19  Jie Kang  <jkang at redhat.com>
 
     Added three keys to DeploymentConfiguration. Max cache size, cache enable,
diff -r 6e689ab02eb0 -r 9fbfc6ef9237 Makefile.am
--- a/Makefile.am	Fri Sep 19 15:47:00 2014 -0400
+++ b/Makefile.am	Fri Sep 19 15:51:19 2014 -0400
@@ -691,19 +691,28 @@
 	mkdir -p $(REPRODUCERS_BUILD_DIR)
 	touch $@
 
-junit-jnlp-dist-custom.txt:
+junit-jnlp-dist-custom.txt: $(REPRODUCERS_CLASS_WHITELIST)
 	cd $(REPRODUCERS_TESTS_SRCDIR)/$(CUSTOM_REPRODUCERS)/ ; \
-	find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" > $(abs_top_builddir)/$@
+	whiteListed=`cat $(REPRODUCERS_CLASS_WHITELIST)`; \
+	for x in $$whiteListed ; do \
+	  find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" | grep $$x > $(abs_top_builddir)/$@ || true ; \
+	done
 
-junit-jnlp-dist-simple.txt:
+junit-jnlp-dist-simple.txt: $(REPRODUCERS_CLASS_WHITELIST)
 	cd $(REPRODUCERS_TESTS_SRCDIR)/simple/ ; \
-	find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" > $(abs_top_builddir)/$@
+	whiteListed=`cat $(REPRODUCERS_CLASS_WHITELIST)`; \
+	for x in $$whiteListed ; do \
+	  find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" | grep $$x > $(abs_top_builddir)/$@ || true ; \
+	done
 
-stamps/junit-jnlp-dist-signed.stamp: 
+stamps/junit-jnlp-dist-signed.stamp: $(REPRODUCERS_CLASS_WHITELIST)
 	types=($(SIGNED_REPRODUCERS)) ; \
 	for which in "$${types[@]}" ; do \
 	  pushd $(REPRODUCERS_TESTS_SRCDIR)/$$which/ ; \
-	  find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" > $(abs_top_builddir)/junit-jnlp-dist-$$which.txt ; \
+	  whiteListed=`cat $(REPRODUCERS_CLASS_WHITELIST)`; \
+	    for x in $$whiteListed ; do \
+	      find .  -maxdepth 1 -mindepth 1 | sed "s/.\/*//" | grep $$x > $(abs_top_builddir)/junit-jnlp-dist-$$which.txt ; \
+	    done ; \
 	  popd ; \
 	done ; \
 	mkdir -p stamps && \
@@ -874,6 +883,7 @@
 	  simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-$$which.txt `); \
 	  IFS="$$IFS_BACKUP" ; \
 	  for dir in "$${simpleReproducers[@]}" ; do \
+	    echo "compiling" $$dir ; \
 	    $(BOOT_DIR)/bin/javac $(IT_JAVACFLAGS) \
 	      -d $(TEST_EXTENSIONS_TESTS_DIR) \
 	      -classpath $(JUNIT_JAR):$(NETX_DIR)/lib/classes.jar:$(TEST_EXTENSIONS_DIR) \