FYI: Fix PR632: patches/security/20110215/6878713.patch breaks shark zero build

[Dr Andrew John Hughes]

On 10:39 Tue 22 Feb     , Mark Wielaard wrote:
> On Mon, 2011-02-21 at 20:52 +0000, Dr Andrew John Hughes wrote:
> > I can see how it would be advantageous from a speed perspective, but for me,
> > if I'm going to bother building one of the alternative VMs, I want to know it
> > actually works.  Now I guess you can run 'check-hotspot' with each of the alternative
> > VMs but I don't see why that saves anything over just doing the full build,
> > which tests the VM heavily with lots of javac invocations.
> 
> So we need targets for at least check-hotspot and check-langtools to be
> run with alternative runtimes build in. This might even be a nice idea
> for pure hotspot client/server/tiered testing. Ideally also
> make-check-jdk, but that on itself takes ages.
> 

Or just use the --enable options which already work with make check.

> > > Also, could we have an alias for "hotspot=next" or something? Assuming
> > > that we only support "current" and "next" hotspot, then you don't have
> > > to remember which particular version it represents (also easier for
> > > making sure a buildslave tracks them).
> > > 
> > 
> > I think what you want is already catered for; as documented in README,
> > a simple --with-hotspot-build will get you the alternative HotSpot.
> > 
> >   ORIGINAL_BUILD="original"
> >   ALTERNATE_BUILD="hs20"
> > ...
> >    if test "x${HSBUILD}" = xyes; then
> >         HSBUILD="${ALTERNATE_BUILD}"
> >   elif test "x${HSBUILD}" = xno; then
> >         HSBUILD="${ORIGINAL_BUILD}"
> >   fi
> > 
> > so the two alternatives are always available via --with-hotspot-build
> > and --without-hotspot-build, the former being the one from the HotSpot
> > tarball, the latter from the original OpenJDK tarball.
> 
> O wow. That is nice. Completely missed that. I added a new "quick"
> squeeze-x86_64 builder icedtea6-squeeze-x86_64-quick-hotspot for that
> (patch attached - note the horrible copy/paste, sorry about that).
> 
> I would almost suggest you make this so that it is possible to use this
> with --enable-additional-vms for easy testing by users...
> 

Feel free to propose a patch.  I don't know addvm, but changing things so you
could build both HotSpots sounds complicated to me for little benefit.

> Cheers,
> 
> Mark

> diff -r 15bb449380ba icedtea/master.cfg
> --- a/icedtea/master.cfg	Mon Feb 21 11:08:43 2011 +0100
> +++ b/icedtea/master.cfg	Tue Feb 22 10:38:04 2011 +0100
> @@ -62,6 +62,7 @@
>  c['schedulers'].append(Scheduler(name="icedtea6-quick", branch="icedtea6",
>                                   treeStableTimer=5*60,
>                           builderNames=["icedtea6-squeeze-x86_64-quick",
> +                                       "icedtea6-squeeze-x86_64-quick-hotspot",
>                                         "icedtea6-squeeze-armv7l-quick",
>                                         "icedtea6-natty-armv7l-quick",
>                                         "icedtea6-natty-armv7l-quick-cacao",
> @@ -259,6 +260,29 @@
>                        description="check-langtools",
>                        workdir="build"))
>  
> +f3h = factory.BuildFactory()
> +f3h.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
> +f3h.addStep(ShellCommand(command=["./autogen.sh"],
> +                        workdir="src",
> +                        description="autogen"))
> +f3h.addStep(ShellCommand(command=["rm", "-rf", "build"],
> +                        workdir=".",
> +                        description="clean build dir"))
> +f3h.addStep(Configure(command=["../src/configure",
> +                              "--disable-bootstrap",
> +                              "--disable-optimizations",
> +                              "--disable-docs",
> +                              "--with-hotspot-build",
> +                              "--with-parallel-jobs=4"],
> +                              workdir="build"))
> +f3h.addStep(Compile(workdir="build"))
> +f3h.addStep(JTRegCheck(command=["make", "check-hotspot"],
> +                      description="check-hotspot",
> +                      workdir="build"))
> +f3h.addStep(JTRegCheck(command=["make", "check-langtools"],
> +                      description="check-langtools",
> +                      workdir="build"))
> +
>  f3as = factory.BuildFactory()
>  f3as.addStep(Mercurial(baseURL=hgrepo, workdir="src", mode="update"))
>  f3as.addStep(ShellCommand(command=["./autogen.sh"],
> @@ -479,6 +503,11 @@
>                             'slavenames': ["squeeze-x86_64"],
>                             'builddir': "icedtea6-quick",
>                             'factory': f3 }
> +icedtea6_builder_quick_hotspot = {
> +                           'name': "icedtea6-squeeze-x86_64-quick-hotspot",
> +                           'slavenames': ["squeeze-x86_64"],
> +                           'builddir': "icedtea6-quick-hotspot",
> +                           'factory': f3h }
>  icedtea6_builder_quick_arm_squeeze = { 'name': "icedtea6-squeeze-armv7l-quick",
>                             'slavenames': ["squeeze-armv7l"],
>                             'builddir': "icedtea6-squeeze-armv7l-quick",
> @@ -579,6 +608,7 @@
>                            'factory': f4 }
>  
>  c['builders'] = [icedtea6_builder_quick,
> +                 icedtea6_builder_quick_hotspot,
>                   icedtea6_builder_quick_arm_squeeze,
>                   icedtea6_builder_quick_arm_natty,
>                   icedtea6_builder_quick_arm_natty_cacao,


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37