rpms/java-1.7.0-icedtea/devel java-1.7.0-icedtea.spec,1.7,1.8

[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-serv32683

Modified Files:
	java-1.7.0-icedtea.spec 
Log Message:
* Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
- Fixed running of Xvfb so it does not terminate after a successful test.
- Fixed mauve and jtreg test runs to not break the build when an error is thrown





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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- java-1.7.0-icedtea.spec	25 Sep 2007 16:30:06 -0000	1.7
+++ java-1.7.0-icedtea.spec	25 Sep 2007 20:36:29 -0000	1.8
@@ -300,16 +300,20 @@
   ./configure 
   make
   echo ====================MAUVE TESTING========================
-  $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
+  %{expand: 
+     $JAVA_HOME/bin/java Harness -vm $JAVA_HOME/bin/java -file %{SOURCE7} \
 	 -showpasses -debug -timeout 30000 2>&1
+   } || :
   echo ====================MAUVE TESTING END====================
 popd
 pushd jtreg
   echo ====================JTREG TESTING========================
   Xvfb :1 &
   export DISPLAY=:1.0
-  ./linux/bin/jtreg -v -a -testjdk:$JAVA_HOME \
-	$(pwd)/../openjdk/j2se/test/ 2>&1
+  %{expand: 
+     ./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====================
@@ -745,6 +749,7 @@
 %changelog
 * Mon Sep 25 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Fixed running of Xvfb so it does not terminate after a successful test.
+- Fixed mauve and jtreg test runs to not break the build when an error is thrown
 
 * Mon Sep 24 2007 Lillian Angel <langel at redhat.com> - 1.7.0.0-0.15.b18.snapshot
 - Added JTreg zip as source