[fyi][icedtea-web]Refactoring of reproducers as agreed in April

Omair Majid omajid at redhat.com
Wed Jun 27 12:29:37 PDT 2012


On 06/27/2012 02:44 PM, Jiri Vanek wrote:
> Forgot attachements :( Sorry .

No worries! Please see my other reply for general comments. I am only
going to comment on the patches themselves here.

> # HG changeset patch
> # User Jiri Vanek <jvanek at redhat.com>
> # Date 1340795716 -7200
> # Node ID d2d54449ba85dbd1f62f6a7de09336215f8d6138
> # Parent  c55bbb9022b4d9596cf7359df6bd9ca1eefae951
> hg move tests/netx/jnlp_testsengine tests/test-extensions
> 

Looks good to me.

> jnlp_tests2reproducers2.giff
> 
> 
> # HG changeset patch
> # User Jiri Vanek <jvanek at redhat.com>
> # Date 1340795546 -7200
> # Node ID c55bbb9022b4d9596cf7359df6bd9ca1eefae951
> # Parent  ee7c412bbd8f7ba73589aa1c4e13ef1b9a651056
> hg move tests/jnlp_tests/ tests/netx/reproducers

Please see my other email on the folder name. Other than that, it's fine.


> # HG changeset patch
> # User Jiri Vanek <jvanek at redhat.com>
> # Date 1340799925 -7200
> # Node ID 8fecc343a8be86846784b6e3b79cadd30d858174
> # Parent  d2d54449ba85dbd1f62f6a7de09336215f8d6138
> Extracted inner classes and testcases from test-extensions
> 
> All tests from test-extensions extracted to test-extensions-tests.
> All inner classes in test-extensions extracted as outer classes
> 
> diff --git a/tests/test-extensions-tests/net/sourceforge/jnlp/ResourcesTest.java b/tests/test-extensions-tests/net/sourceforge/jnlp/ResourcesTest.java


> diff --git a/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java b/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java
> new file mode 100644
> --- /dev/null
> +++ b/tests/test-extensions/net/sourceforge/jnlp/TinyHttpdImpl.java
> @@ -0,0 +1,174 @@
> +/* TinyHttpdImpl.java
> +Copyright (C) 2011,2012 Red Hat, Inc.
> +
> +This file is part of IcedTea.
> +
> +IcedTea is free software; you can redistribute it and/or
> +modify it under the terms of the GNU General Public License as published by
> +the Free Software Foundation, version 2.
> +
> +IcedTea is distributed in the hope that it will be useful,
> +but WITHOUT ANY WARRANTY; without even the implied warranty of
> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +General Public License for more details.
> +
> +You should have received a copy of the GNU General Public License
> +along with IcedTea; see the file COPYING.  If not, write to
> +the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> +02110-1301 USA.
> +
> +Linking this library statically or dynamically with other modules is
> +making a combined work based on this library.  Thus, the terms and
> +conditions of the GNU General Public License cover the whole
> +combination.
> +
> +As a special exception, the copyright holders of this library give you
> +permission to link this library with independent modules to produce an
> +executable, regardless of the license terms of these independent
> +modules, and to copy and distribute the resulting executable under
> +terms of your choice, provided that you also meet, for each linked
> +independent module, the terms and conditions of the license of that
> +module.  An independent module is a module which is not derived from
> +or based on this library.  If you modify this library, you may extend
> +this exception to your version of the library, but you are not
> +obligated to do so.  If you do not wish to do so, delete this
> +exception statement from your version.
> + */
> +
> +package net.sourceforge.jnlp;
> +
> +import java.io.BufferedReader;
> +import java.io.DataOutputStream;
> +import java.io.File;
> +import java.io.FileInputStream;
> +import java.io.InputStreamReader;
> +import java.net.Socket;
> +import java.net.SocketException;
> +import java.net.URLDecoder;
> +import java.util.StringTokenizer;
> +
> +/**
> + * based on http://www.mcwalter.org/technology/java/httpd/tiny/index.html
> + * Very small implementation of http return headers for our served resources
> + * Originally Licenced under GPLv2.0 

Uh... that means this entire file (at least) must be licensed under
GPLv2 too (and not GPLv2 + Classpath exception).

> # HG changeset patch
> # User Jiri Vanek <jvanek at redhat.com>
> # Date 1340802762 -7200
> # Node ID 22b0bb2a158a72045fd2e66b374bdd7907983b06
> # Parent  10ad94d806b613b6b5ee412c39f043da5985cb65
> Added missing license headers
> 
> diff --git a/tests/netx/reproducers/simple/CreateClassLoader/resources/CreateClassLoader.jnlp b/tests/netx/reproducers/simple/CreateClassLoader/resources/CreateClassLoader.jnlp
> --- a/tests/netx/reproducers/simple/CreateClassLoader/resources/CreateClassLoader.jnlp
> +++ b/tests/netx/reproducers/simple/CreateClassLoader/resources/CreateClassLoader.jnlp
> @@ -1,3 +1,40 @@

To be pedantic, xml files should not have comments before the <?xml
declaration: http://stackoverflow.com/a/1196485

This may work currently, but this is not something we should rely on.

> +<!--
> +
> +This file is part of IcedTea.
> +
> +IcedTea is free software; you can redistribute it and/or modify
> +it under the terms of the GNU General Public License as published by
> +the Free Software Foundation; either version 2, or (at your option)
> +any later version.
> +
> +IcedTea is distributed in the hope that it will be useful, but
> +WITHOUT ANY WARRANTY; without even the implied warranty of
> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> +General Public License for more details.
> +
> +You should have received a copy of the GNU General Public License
> +along with IcedTea; see the file COPYING.  If not, write to the
> +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> +02110-1301 USA.
> +
> +Linking this library statically or dynamically with other modules is
> +making a combined work based on this library.  Thus, the terms and
> +conditions of the GNU General Public License cover the whole
> +combination.
> +
> +As a special exception, the copyright holders of this library give you
> +permission to link this library with independent modules to produce an
> +executable, regardless of the license terms of these independent
> +modules, and to copy and distribute the resulting executable under
> +terms of your choice, provided that you also meet, for each linked
> +independent module, the terms and conditions of the license of that
> +module.  An independent module is a module which is not derived from
> +or based on this library.  If you modify this library, you may extend
> +this exception to your version of the library, but you are not
> +obligated to do so.  If you do not wish to do so, delete this
> +exception statement from your version.
> + -->
> +
>  <?xml version="1.0" encoding="utf-8"?> 
>  <jnlp spec="1.0"
>        codebase="./"


> 
> customMakefiles2.diff
> 

Hm... this contains lots of unrelated changes and doesnt contain the
changes I expected to see (it still has netx/jnlp_testsengine). Is this
the right patch?


> 
> diff -r f4f02e8c080d Makefile.am
> --- a/Makefile.am	Tue May 29 17:38:27 2012 +0200
> +++ b/Makefile.am	Tue May 29 17:50:16 2012 +0200
> @@ -1,58 +1,58 @@
>  # Source directories
>  
> -NETX_DIR = $(abs_top_builddir)/netx.build
> -NETX_SRCDIR = $(abs_top_srcdir)/netx
> -NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
> -NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/javaws/about/resources
> -NETX_EXTRA_DIST_DIR=$(abs_top_builddir)/extra-lib/net/sourceforge/javaws/about/resources
> +export NETX_DIR = $(abs_top_builddir)/netx.build
> +export NETX_SRCDIR = $(abs_top_srcdir)/netx
> +export NETX_RESOURCE_DIR=$(NETX_SRCDIR)/net/sourceforge/jnlp/resources
> +export NETX_EXTRA_DIR=$(abs_top_srcdir)/extra/net/sourceforge/javaws/about/resources
> +export NETX_EXTRA_DIST_DIR=$(abs_top_builddir)/extra-lib/net/sourceforge/javaws/about/resources
>  
> -REPORT_STYLES_DIRNAME=report-styles
> +export REPORT_STYLES_DIRNAME=report-styles
>  
> -TESTS_SRCDIR=$(abs_top_srcdir)/tests
> -TESTS_DIR=$(abs_top_builddir)/tests.build
> +export TESTS_SRCDIR=$(abs_top_srcdir)/tests
> +export TESTS_DIR=$(abs_top_builddir)/tests.build
>  
> -NETX_UNIT_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/unit
> -NETX_UNIT_TEST_DIR=$(TESTS_DIR)/netx/unit
> +export NETX_UNIT_TEST_SRCDIR=$(TESTS_SRCDIR)/netx/unit
> +export NETX_UNIT_TEST_DIR=$(TESTS_DIR)/netx/unit
>  
> -JUNIT_RUNNER_DIR=$(TESTS_DIR)/junit-runner
> -JUNIT_RUNNER_SRCDIR=$(TESTS_SRCDIR)/junit-runner
> +export JUNIT_RUNNER_DIR=$(TESTS_DIR)/junit-runner
> +export JUNIT_RUNNER_SRCDIR=$(TESTS_SRCDIR)/junit-runner
>  
> -JNLP_TESTS_ENGINE_SRCDIR=$(TESTS_SRCDIR)/netx/jnlp_testsengine
> -JNLP_TESTS_SRCDIR=$(TESTS_SRCDIR)/jnlp_tests
> -JNLP_TESTS_ENGINE_DIR=$(TESTS_DIR)/netx/jnlp_testsengine
> -JNLP_TESTS_SERVER_DEPLOYDIR=$(TESTS_DIR)/jnlp_test_server
> -JNLP_TESTS_DIR=$(TESTS_DIR)/jnlp_tests
> -PRIVATE_KEYSTORE_NAME=teststore.ks
> -PRIVATE_KEYSTORE_PASS=123456789
> -EXPORTED_TEST_CERT=icedteatests.crt
> -TEST_CERT_ALIAS=icedteaweb
> -PUBLIC_KEYSTORE=${HOME}/.icedtea/security/trusted.certs
> -PUBLIC_KEYSTORE_PASS=changeit
> +export JNLP_TESTS_ENGINE_SRCDIR=$(TESTS_SRCDIR)/netx/jnlp_testsengine
> +export JNLP_TESTS_SRCDIR=$(TESTS_SRCDIR)/jnlp_tests
> +export JNLP_TESTS_ENGINE_DIR=$(TESTS_DIR)/netx/jnlp_testsengine
> +export JNLP_TESTS_SERVER_DEPLOYDIR=$(TESTS_DIR)/jnlp_test_server
> +export JNLP_TESTS_DIR=$(TESTS_DIR)/jnlp_tests
> +export PRIVATE_KEYSTORE_NAME=teststore.ks
> +export PRIVATE_KEYSTORE_PASS=123456789
> +export EXPORTED_TEST_CERT=icedteatests.crt
> +export TEST_CERT_ALIAS=icedteaweb
> +export PUBLIC_KEYSTORE=${HOME}/.icedtea/security/trusted.certs
> +export PUBLIC_KEYSTORE_PASS=changeit
>  
> -JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar
> -UNIT_CLASS_NAMES = $(abs_top_builddir)/unit_class_names
> -REPRODUCERS_CLASS_NAMES = $(abs_top_builddir)/reproducers_class_names
> -REPRODUCERS_CLASS_WHITELIST = $(abs_top_srcdir)/netx-dist-tests-whitelist
> -EMMA_JAVA_ARGS=-Xmx2G
> -META_MANIFEST = META-INF/MANIFEST.MF
> +export JUNIT_RUNNER_JAR=$(abs_top_builddir)/junit-runner.jar
> +export UNIT_CLASS_NAMES = $(abs_top_builddir)/unit_class_names
> +export REPRODUCERS_CLASS_NAMES = $(abs_top_builddir)/reproducers_class_names
> +export REPRODUCERS_CLASS_WHITELIST = $(abs_top_srcdir)/netx-dist-tests-whitelist
> +export EMMA_JAVA_ARGS=-Xmx2G
> +export META_MANIFEST = META-INF/MANIFEST.MF
>  
>  # linking variables
> -PLUGIN_LINK_NAME=libjavaplugin.so
> -MOZILLA_LOCAL_PLUGINDIR=${HOME}/.mozilla/plugins
> -MOZILLA_GLOBAL64_PLUGINDIR=/usr/lib64/mozilla/plugins
> -MOZILLA_GLOBAL32_PLUGINDIR=/usr/lib/mozilla/plugins
> -OPERA_GLOBAL64_PLUGINDIR=/usr/lib64/opera/plugins
> -OPERA_GLOBAL32_PLUGINDIR=/usr/lib/opera/plugins
> -BUILT_PLUGIN_LIBRARY=IcedTeaPlugin.so
> -MOZILLA_LOCAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origU
> -MOZILLA_GLOBAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origMG
> -OPERA_GLOBAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origOG
> -MOZILLA_FAMILY_TEST= "$(FIREFOX)" != "" -o "$(CHROMIUM)" != "" -o "$(CHROME)" != "" -o "$(MIDORI)" != "" -o "$(EPIPHANY)" != "" 
> +export PLUGIN_LINK_NAME=libjavaplugin.so
> +export MOZILLA_LOCAL_PLUGINDIR=${HOME}/.mozilla/plugins
> +export MOZILLA_GLOBAL64_PLUGINDIR=/usr/lib64/mozilla/plugins
> +export MOZILLA_GLOBAL32_PLUGINDIR=/usr/lib/mozilla/plugins
> +export OPERA_GLOBAL64_PLUGINDIR=/usr/lib64/opera/plugins
> +export OPERA_GLOBAL32_PLUGINDIR=/usr/lib/opera/plugins
> +export BUILT_PLUGIN_LIBRARY=IcedTeaPlugin.so
> +export MOZILLA_LOCAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origU
> +export MOZILLA_GLOBAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origMG
> +export OPERA_GLOBAL_BACKUP_FILE=${HOME}/$(PLUGIN_LINK_NAME).origOG
> +export MOZILLA_FAMILY_TEST= "$(FIREFOX)" != "" -o "$(CHROMIUM)" != "" -o "$(CHROME)" != "" -o "$(MIDORI)" != "" -o "$(EPIPHANY)" != "" 
>  # end of linking variables
>  
>  # Build directories
>  
> -BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
> +export  BOOT_DIR = $(abs_top_builddir)/bootstrap/jdk1.6.0
>  
>  if WITH_RHINO
>    RHINO_RUNTIME=:$(RHINO_JAR)

Cheers,
Omair



More information about the distro-pkg-dev mailing list