rpms/java-1.7.0-icedtea/devel .cvsignore, 1.6, 1.7 java-1.7.0-icedtea.spec, 1.5, 1.6 sources, 1.5, 1.6

[Lillian Angel (langel)]

Author: langel

Update of /cvs/pkgs/rpms/java-1.7.0-icedtea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30794

Modified Files:
	.cvsignore java-1.7.0-icedtea.spec sources 
Log Message:
* Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
- Added JTreg zip as source
- Run JTreg tests after build for smoke testing.
- Added Xvfb as build requirement.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	21 Sep 2007 20:15:25 -0000	1.6
+++ .cvsignore	24 Sep 2007 20:51:55 -0000	1.7
@@ -2,3 +2,4 @@
 java-access-bridge-1.19.2.tar.gz
 openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 mauve-2007-09-12.tar.gz
+jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip


Index: java-1.7.0-icedtea.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/java-1.7.0-icedtea.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- java-1.7.0-icedtea.spec	21 Sep 2007 20:10:50 -0000	1.5
+++ java-1.7.0-icedtea.spec	24 Sep 2007 20:51:55 -0000	1.6
@@ -20,6 +20,7 @@
 %define openjdkurl %{openjdkurlbase}%{openjdkver}/
 %define openjdkzip openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}.zip
 %define fedorazip  openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}-fedora.zip
+%define jtregzip jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip
 
 %define mauvedate 2007-09-12
 
@@ -113,6 +114,7 @@
 Source5:  README.plugin
 Source6:  mauve-%{mauvedate}.tar.gz
 Source7:  mauve_tests
+Source8:  %{jtregzip}
 Patch0:   java-1.7.0-icedtea-makefile.patch
 Patch1:   java-1.7.0-icedtea-jhat.patch
 Patch2:   java-1.7.0-icedtea-win32.patch
@@ -146,6 +148,8 @@
 BuildRequires: firefox-devel
 BuildRequires: glib2-devel
 BuildRequires: gtk2-devel
+# jtreg testing requirements.
+BuildRequires: xorg-x11-server-Xvfb
 
 # Require /etc/pki/tls/certs/ca-bundle.crt instead of generating
 # cacerts.
@@ -264,6 +268,7 @@
 %prep
 %setup -q -n icedtea-%{icedteaver}
 %setup -q -n icedtea-%{icedteaver} -T -D -a 6
+%setup -q -n icedtea-%{icedteaver} -T -D -a 8
 %setup -q -n icedtea-%{icedteaver} -T -D -a 2
 %patch0
 cp %{SOURCE4} .
@@ -294,10 +299,20 @@
 pushd mauve-%{mauvedate}
   ./configure 
   make
-  echo ====================TESTING========================
+  echo ====================MAUVE TESTING========================
   $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
 	 -showpasses -debug -timeout 30000 2>&1
-  echo ====================TESTING END====================
+  echo ====================MAUVE TESTING END====================
+popd
+pushd jtreg
+  echo ====================JTREG TESTING========================
+  Xvfb :1 -screen 1 1280x1024x24 -ac -terminate &
+  export DISPLAY=:1.1
+  ./linux/bin/jtreg -v -a -testjdk:$JAVA_HOME \
+	$(pwd)/../openjdk/j2se/test/ 2>&1
+  killall -9 Xvfb
+  export DISPLAY=:0.0
+  echo ====================JTREG TESTING END====================
 popd
 
 %install
@@ -728,6 +743,11 @@
 %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
 
 %changelog
+* Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
+- Added JTreg zip as source
+- Run JTreg tests after build for smoke testing.
+- Added Xvfb as build requirement.
+
 * Wed Sep 12 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Added Mauve tarball as source.
 - Added mauve_tests as source.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.7.0-icedtea/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Sep 2007 20:13:00 -0000	1.5
+++ sources	24 Sep 2007 20:51:55 -0000	1.6
@@ -3,3 +3,4 @@
 d079f800f86f018240a2a943f86093bb  openjdk-7-ea-src-b19-30_aug_2007-fedora.zip
 68932798db6c0e167a2d54738b6dfb68  mauve_tests
 abee6aad1525bee3d45a13d0adf859c9  mauve-2007-09-12.tar.gz
+cb1d97fa19213fabb0910d4df9705e85  jtreg_bin-3.2.2_03-fcs-bin-10_sep_2007.zip