rpms/java-1.6.0-openjdk/F-9 java-1.6.0-openjdk.spec,1.50,1.51

[Lillian Angel (langel)]

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12492

Modified Files:
	java-1.6.0-openjdk.spec 
Log Message:
* Wed Jul  9 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.16.b09
- Add runtests define.
- Run test suites on JIT architectures only.




Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-9/java-1.6.0-openjdk.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- java-1.6.0-openjdk.spec	8 Jul 2008 14:52:15 -0000	1.50
+++ java-1.6.0-openjdk.spec	9 Jul 2008 17:24:01 -0000	1.51
@@ -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
@@ -63,6 +66,12 @@
 %endif
 %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}
 
 %if %{gcjbootstrap}
@@ -408,6 +417,7 @@
   cp -a gnome-java-bridge.jar $JAVA_HOME/jre/lib/ext
 popd
 
+%if %{runtests}
 # Run jtreg test suite.
 {
   echo ====================JTREG TESTING========================
@@ -432,6 +442,7 @@
     echo ====================MAUVE TESTING END====================
   popd
 } || :
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -899,10 +910,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,-)
@@ -914,7 +927,11 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
-* Wed Jul 8 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.16.b09
+* Wed Jul  9 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.16.b09
+- Add runtests define.
+- Run test suites on JIT architectures only.
+
+* Tue Jul 8 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.16.b09
 - Only apply hotspot security patch of jitarches.
 
 * Wed Jul 2 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.16.b09