rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk.spec,1.47,1.48

[Thomas Fitzsimmons (fitzsim)]

Author: fitzsim

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14091

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Tue Jun  3 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.16.b09
- Add runtests define.
- Provide Xvfb instance to jtreg.
- Run test suites on JIT architectures only.
- Clean up arch handling.




Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- java-1.6.0-openjdk.spec	31 May 2008 00:06:17 -0000	1.47
+++ java-1.6.0-openjdk.spec	3 Jun 2008 15:16:10 -0000	1.48
@@ -3,6 +3,9 @@
 # java-1.6.0-openjdk-devel.
 %define gcjbootstrap 0
 
+# If runtests is 0 test suites will not be run.
+%define runtests 1
+
 %define icedteaver 1.2
 %define icedteasnapshot %{nil}
 %define openjdkver b09
@@ -21,32 +24,27 @@
 
 %define mauvedate 2008-03-11
 
-%ifarch x86_64
-%define archbuild amd64
-%define archinstall amd64
-%else
-%ifarch ppc
-%define archbuild ppc
-%define archinstall ppc
-%else
-%ifarch ppc64
-%define archbuild ppc64
-%define archinstall ppc64
-%else
+%define multilib_arches ppc64 sparc64 x86_64
+
+%define jit_arches %{ix86} x86_64
+
 %ifarch %{ix86}
 %define archbuild i586
 %define archinstall i386
-%else
-%ifarch ia64
-%define archbuild ia64
-%define archinstall ia64
-%else
-%define archbuild zero
-%define archinstall zero
-%endif
 %endif
+%ifarch x86_64
+%define archbuild amd64
+%define archinstall amd64
 %endif
+%ifnarch %{jit_arches}
+%define archbuild %{_arch}
+%define archinstall %{_arch}
 %endif
+
+# Reduce build time from 27 hours to 12 hours by only running test
+# suites on JIT architectures.
+%ifnarch %{jit_arches}
+%define runtests 0
 %endif
 
 %define buildoutputdir openjdk/control/build/linux-%{archbuild}
@@ -65,7 +63,7 @@
 
 # Hard-code libdir on 64-bit architectures to make the 64-bit JDK
 # simply be another alternative.
-%ifarch x86_64 ppc64 sparc64
+%ifarch %{multilib_arches}
 %define syslibdir       %{_prefix}/lib64
 %define _libdir         %{_prefix}/lib
 %define archname        %{name}.%{_arch}
@@ -88,7 +86,7 @@
 
 # Standard JPackage directories and symbolic links.
 # Make 64-bit JDKs just another alternative on 64-bit architectures.
-%ifarch x86_64 ppc64 sparc64
+%ifarch %{multilib_arches}
 %define sdklnk          java-%{javaver}-%{origin}.%{_arch}
 %define jrelnk          jre-%{javaver}-%{origin}.%{_arch}
 %define sdkdir          %{name}-%{version}.%{_arch}
@@ -100,7 +98,7 @@
 %define jredir          %{sdkdir}/jre
 %define sdkbindir       %{_jvmdir}/%{sdklnk}/bin
 %define jrebindir       %{_jvmdir}/%{jrelnk}/bin
-%ifarch x86_64 ppc64 sparc64
+%ifarch %{multilib_arches}
 %define jvmjardir       %{_jvmjardir}/%{name}-%{version}.%{_arch}
 %else
 %define jvmjardir       %{_jvmjardir}/%{name}-%{version}
@@ -111,7 +109,7 @@
 
 Name:    java-%{javaver}-%{origin}
 Version: %{javaver}.%{buildver}
-Release: 0.15.%{openjdkver}%{?dist}
+Release: 0.16.%{openjdkver}%{?dist}
 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
 # and this change was brought into RHEL-4.  java-1.5.0-ibm packages
 # also included the epoch in their virtual provides.  This created a
@@ -185,7 +183,7 @@
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
 # Zero-assembler build requirement.
-%ifnarch x86_64 %{ix86}
+%ifnarch %{jit_arches}
 BuildRequires: libffi-devel
 %endif
 
@@ -361,10 +359,17 @@
   cp -a gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext
 popd
 
+%if %{runtests}
 # Run jtreg test suite.
 {
   echo ====================JTREG TESTING========================
+  export DISPLAY=:20
+  Xvfb :20 -screen 0 1x1x24 -ac&
+  echo $! > Xvfb.pid
   make jtregcheck -k | tee jtreg_output
+  kill -9 `cat Xvfb.pid`
+  unset DISPLAY
+  rm -f Xvfb.pid
   echo ====================JTREG TESTING END====================
 } || :
 
@@ -385,6 +390,7 @@
     echo ====================MAUVE TESTING END====================
   popd
 } || :
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -860,10 +866,12 @@
 %defattr(-,root,root,-)
 %doc README.src
 %{_jvmdir}/%{sdkdir}/src.zip
+%if %{runtests}
 # FIXME: put these in a separate testresults subpackage.
 %doc mauve_tests
 %doc mauve-%{mauvedate}/mauve_output
 %doc jtreg_output
+%endif
 
 %files javadoc
 %defattr(-,root,root,-)
@@ -875,6 +883,12 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Tue Jun  3 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.16.b09
+- Add runtests define.
+- Provide Xvfb instance to jtreg.
+- Run test suites on JIT architectures only.
+- Clean up arch handling.
+
 * Fri May 30 2008 Thomas Fitzsimmons <fitzsim at redhat.com> - 1:1.6.0.0-0.15.b09
 - Remove jhat patch.