[RFC] - extended creation of simple reproducers jars

[Jiri Vanek]

Hi Andrew! thank you for more comments. I think that reply have missed you so this is it. Is chaneglog better in this version?  Also few comments to your concerns are included.


On 07/19/2011 07:20 PM, Jiri Vanek wrote:
> On 07/19/2011 03:15 PM, Pavel Tisnovsky wrote:
> Hi!
> Thanx for review:
>> Hi Jiri,
>>
>> thank you for your work. The patch itself looks good, I'm just curious
>> if this approach would work in case of many "simple" tests, for example
>> 1000 tests. I mean this line:
>>
>> +      $(BOOT_DIR)/bin/javac -d  $(JNLP_TESTS_DIR)/$$dir/ $$srcFiles ; \
>>
>
> This line always compile one single reproducer. They have mostly one or two classes and it is nearly unbelievable that single reproducer will have more tehn hundrets of files. Commandline have 128KB buffer. It i smore then enough for SIMPLE reproducer :D
>> Maybe it would be good to compile the tests in a program loop (it's
>> possible to create for-each loop which can run for files found by find
>> ;-) ) but if your solution works, I'm ok with it.
>>
>>
>> Also ChangeLog entry should be IMHO reworded as it's not understandable
>> (at least for me, but as you know I'm not a native speaker ;-)
>>
>> Cheers,
>> Pavel
>>
>>
>> Jiri Vanek wrote:
>>> Hi!
>>> This patch removes old compiling of files in src directory (by "*") in
>>> simple reproducers by finding .java files (honours also directory
>>> structure which previous technique ignored) and also copy all not java
>>> files into resulted jar (also ignored in "*" approach)
>>> Motivation for this patch are by-jnlp-signed reproducers which can
>>> appear soon and I do not want to have special build code for them (==
>>> including application.jnlp or template.jnlp files)
>>>
>>>
>>> 2011-07-12 Jiri Vanek<jvanek at redhat.com>
>>>
>>>      *Makefile.am: (stamps/netx-dist-tests-prepare-reproducers.stamp):
>>>      now honour directory structure under srcs in simple reproducer and
>>>      copy also not compiled java files into resulted jars from src directory
>>>
>>
>

New changelog:

>   2011-07-19 Jiri Vanek<jvanek at redhat.com>
>
>      *Makefile.am: (stamps/netx-dist-tests-prepare-reproducers.stamp):
>      now are compiled files correctly compiled from directory structure.
>      Also not java files are copied with expected directory structure and
>      jarred together with classes.
>
>
>
> Better? The patch remains same.
>
> Regards J.
>
>
> honoredDirs.patch
>


I think that I'm following the rest of icedtea-web styl. I'm creating file with list of reproduces in one step, and then compiling and jarring them in second. Please note, that there is much more reproducers then files in each of one of them.
>
> diff -r 4267bb156f08 Makefile.am
> --- a/Makefile.am	Tue Jul 19 12:14:35 2011 -0400
> +++ b/Makefile.am	Tue Jul 19 19:16:19 2011 +0200
> @@ -465,11 +465,18 @@
>   stamps/netx-dist-tests-prepare-reproducers.stamp: junit-jnlp-dist-dirs.txt
>   	simpleReproducers=(`cat $(abs_top_builddir)/junit-jnlp-dist-dirs.txt `); \
^^ list gathered in previous step
>   	for dir in "$${simpleReproducers[@]}" ; do \
traversing through this list
> +	  echo "processing: $$dir" ; \
>   	  mkdir -p $(JNLP_TESTS_DIR)/$$dir ; \
> -	  $(BOOT_DIR)/bin/javac -d  $(JNLP_TESTS_DIR)/$$dir/  $(JNLP_TESTS_SRCDIR)/simple/$$dir/srcs/* ; \
>   	  d=`pwd` ; \
> +	  cd $(JNLP_TESTS_SRCDIR)/simple/$$dir/srcs/ ; \
> +	  srcFiles=`find . -mindepth 1 -type f -name "*.java" | sed "s/.\/*//"` ; \
finding java files of this reproducer
> +	  notSrcFiles=`find . -mindepth 1 -type f \! -name "*.java" | sed "s/.\/*//"` ; \
finding non-java files of this reproducer
> +	  $(BOOT_DIR)/bin/javac -d  $(JNLP_TESTS_DIR)/$$dir/  $$srcFiles ; \
all java files of this reproducer compiled
> +	  if [ -n "$$notSrcFiles" ] ; then \
> +	    cp -R --parents $$notSrcFiles $(JNLP_TESTS_DIR)/$$dir/ ; \
all non src files of reproducer copied.
> +	  fi ; \
>   	  cd $(JNLP_TESTS_DIR)/$$dir/ ; \
> -	    $(BOOT_DIR)/bin/jar cf $(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar * ; \
> +	  $(BOOT_DIR)/bin/jar cf $(JNLP_TESTS_SERVER_DEPLOYDIR)/$$dir.jar * ; \
final jar constructed from classes and  copied files.
>   	  cd $$d ; \
>   	  cp -R $(JNLP_TESTS_SRCDIR)/simple/$$dir/resources/*  $(JNLP_TESTS_SERVER_DEPLOYDIR)/ ; \
>   	done ; \
> diff -r 4267bb156f08 tests/jnlp_tests/README
> --- a/tests/jnlp_tests/README	Tue Jul 19 12:14:35 2011 -0400
> +++ b/tests/jnlp_tests/README	Tue Jul 19 19:16:19 2011 +0200
> @@ -1,1 +1,2 @@
> -Each file in directory simple must follows naming convention and is compiled/jared automatically into server's working directory and content of resources likewise. The name of jnlp is independent, and there can be even more jnlps for each future jar.  Files in advanced directory have to care about themselves, but even those can have some parts inside simple directory, so some parts of them are processed automatically.  There are three reproducers – simpletest1, simpletest2 and deadlocktest, which tests test’s suite itself and serve as examples of behaviour.
> +Each file in directory simple must follows naming convention and is compiled/jared automatically into server's working directory and content of resources likewise. The name of jnlp is independent, and there can be even more jnlps for each future jar.  Directories should be honored in srcs and in resources, but noty in testcases.
> +Files in advanced directory have to care about themselves, but even those can have some parts inside simple directory, so some parts of them are processed automatically.  There are three reproducers – simpletest1, simpletest2 and deadlocktest, which tests test’s suite itself and serve as examples of behaviour.