/hg/icedtea-web: testing server allowed from makefile

[jvanek at icedtea.classpath.org]

changeset 0f85f68370a4 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=0f85f68370a4
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Apr 19 16:41:33 2013 +0200

	testing server allowed from makefile
	* Makefile.am:
	(stamps/netx-dist-tests-prepare-reproducers.stamp) added stamps/netx-dist.stamp stamps/plugin.stamp dependence
	(stamps/test-extensions-compile.stamp) added stamps/netx-dist.stamp stamps/plugin.stamp dependence
	(stamps/compile-reproducers-testcases.stamp) added stamps/plugin.stamp  dependence
	(run-test-server-on-44321) new target, starts server in deploy dir, on port 44321
	(run-test-server-on-random-port) new target, starts server in deploy dir, on random port
	* tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java: (main)
	added better access to random port


diffstat:

 ChangeLog                                                    |  12 +++++++
 Makefile.am                                                  |  20 ++++++++++-
 tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java |   6 ++-
 3 files changed, 33 insertions(+), 5 deletions(-)

diffs (86 lines):

diff -r 369fb7729762 -r 0f85f68370a4 ChangeLog
--- a/ChangeLog	Wed Apr 17 14:38:48 2013 +0200
+++ b/ChangeLog	Fri Apr 19 16:41:33 2013 +0200
@@ -1,3 +1,15 @@
+2013-04-19  Jiri Vanek <jvanek at redhat.com>
+
+	testing server allowed from makefile
+	* Makefile.am:
+	(stamps/netx-dist-tests-prepare-reproducers.stamp) added stamps/netx-dist.stamp stamps/plugin.stamp dependence
+	(stamps/test-extensions-compile.stamp) added stamps/netx-dist.stamp stamps/plugin.stamp dependence
+	(stamps/compile-reproducers-testcases.stamp) added stamps/plugin.stamp  dependence
+	(run-test-server-on-44321) new target, starts server in deploy dir, on port 44321
+	(run-test-server-on-random-port) new target, starts server in deploy dir, on random port
+	* tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java: (main)
+	added better access to random port
+
 2013-04-17  Jiri Vanek <jvanek at redhat.com>
 
 	Added various self-describing tests for codebase
diff -r 369fb7729762 -r 0f85f68370a4 Makefile.am
--- a/Makefile.am	Wed Apr 17 14:38:48 2013 +0200
+++ b/Makefile.am	Fri Apr 19 16:41:33 2013 +0200
@@ -641,7 +641,7 @@
 	mkdir -p stamps && \
 	touch $@
 
-stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs stamps/liveconnect-dist.stamp
+stamps/netx-dist-tests-prepare-reproducers.stamp: stamps/junit-jnlp-dist-dirs stamps/liveconnect-dist.stamp stamps/netx-dist.stamp stamps/plugin.stamp
 	types=($(ALL_NONCUSTOM_REPRODUCERS)); \
 	for which in "$${types[@]}" ; do \
 	  . $(abs_top_srcdir)/NEW_LINE_IFS ; \
@@ -754,7 +754,7 @@
 test-extensions-source-files.txt:
 	find $(TEST_EXTENSIONS_SRCDIR) -name '*.java' | sort > $@
 
-stamps/test-extensions-compile.stamp: stamps/junit-jnlp-dist-dirs test-extensions-source-files.txt
+stamps/test-extensions-compile.stamp: stamps/netx-dist.stamp stamps/plugin.stamp stamps/junit-jnlp-dist-dirs test-extensions-source-files.txt
 	mkdir -p $(TEST_EXTENSIONS_DIR);
 	mkdir -p $(NETX_TEST_DIR);
 	ln -s $(TEST_EXTENSIONS_DIR) $(TEST_EXTENSIONS_COMPATIBILITY_SYMLINK);
@@ -777,7 +777,7 @@
 	mkdir -p stamps && \
 	touch $@
 
-stamps/compile-reproducers-testcases.stamp: stamps/netx.stamp stamps/junit-jnlp-dist-dirs \
+stamps/compile-reproducers-testcases.stamp: stamps/netx-dist.stamp stamps/plugin.stamp stamps/junit-jnlp-dist-dirs \
  test-extensions-source-files.txt stamps/test-extensions-compile.stamp stamps/test-extensions-tests-compile.stamp
 	types=($(ALL_REPRODUCERS)); \
 	for which in "$${types[@]}" ; do \
@@ -1380,6 +1380,20 @@
 	exit 5
 endif
 
+run-test-server-on-44321: stamps/netx.stamp stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public \
+ stamps/test-extensions-compile.stamp stamps/compile-reproducers-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/copy-reproducers-resources.stamp
+	cd $(TEST_EXTENSIONS_DIR) ; \
+	CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) \
+	  $(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \
+	 -Xbootclasspath:$(RUNTIME) net.sourceforge.jnlp.ServerAccess 
+
+run-test-server-on-random-port: stamps/netx.stamp stamps/junit-jnlp-dist-dirs stamps/netx-dist-tests-import-cert-to-public \
+ stamps/test-extensions-compile.stamp stamps/compile-reproducers-testcases.stamp $(JUNIT_RUNNER_JAR) stamps/copy-reproducers-resources.stamp
+	cd $(TEST_EXTENSIONS_DIR) ; \
+	CLASSPATH=$(NETX_DIR)/lib/classes.jar:$(JUNIT_JAR):$(JUNIT_RUNNER_JAR):.:$(TEST_EXTENSIONS_TESTS_DIR) \
+	  $(BOOT_DIR)/bin/java $(REPRODUCERS_DPARAMETERS) \
+	 -Xbootclasspath:$(RUNTIME) net.sourceforge.jnlp.ServerAccess randomport
+
 clean-netx-tests: clean-netx-unit-tests clean-junit-runner clean-netx-dist-tests clean-test-code-coverage-jacoco clean-test-code-coverage
 	if [ -e $(TESTS_DIR)/netx ]; then \
 	  rmdir $(TESTS_DIR)/netx ; \
diff -r 369fb7729762 -r 0f85f68370a4 tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java
--- a/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java	Wed Apr 17 14:38:48 2013 +0200
+++ b/tests/test-extensions/net/sourceforge/jnlp/ServerAccess.java	Fri Apr 19 16:41:33 2013 +0200
@@ -138,8 +138,10 @@
             System.exit(0);
         } else {
             int port = 44321;
-            if (args.length > 0) {
-                port=new Integer(args[0]);
+            if (args.length > 0 && args[0].equalsIgnoreCase("randomport")) {
+                port = findFreePort();
+            } else if (args.length > 0) {
+                port = new Integer(args[0]);
             }
             getIndependentInstance(port);
             while (true) {