Mercurial > hg > icedtea9

changeset 2372:bb4033154745

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update patches/boot/test_gamma.patch to skip test_gamma for Shark
author Omair Majid <omajid@redhat.com>
date Tue, 19 Apr 2011 16:38:18 -0400
parents 8f9c35e54e17
children a4851a2bf343
files ChangeLog patches/boot/test_gamma.patch
diffstat 2 files changed, 13 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Apr 19 15:35:23 2011 +0100
+++ b/ChangeLog	Tue Apr 19 16:38:18 2011 -0400
@@ -1,3 +1,7 @@
+2011-04-19  Omair Majid  <omajid@redhat.com>
+
+	* patches/boot/test_gamma.patch: Skip test_gamma for shark too.
+
 2011-04-19  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/patches/boot/test_gamma.patch	Tue Apr 19 15:35:23 2011 +0100
+++ b/patches/boot/test_gamma.patch	Tue Apr 19 16:38:18 2011 -0400
@@ -1,7 +1,7 @@
 diff -Nru ../openjdk.orig/openjdk-boot/hotspot/make/linux/Makefile openjdk-boot/hotspot/make/linux/Makefile
 --- ../openjdk.orig/openjdk-boot/hotspot/make/linux/Makefile	2009-10-30 17:37:07.000000000 +0000
 +++ openjdk-boot/hotspot/make/linux/Makefile	2009-10-30 17:45:40.000000000 +0000
-@@ -287,35 +287,30 @@
+@@ -287,42 +287,36 @@
  
  $(TARGETS_C2):  $(SUBDIRS_C2)
  	cd $(OSNAME)_$(BUILDARCH)_compiler2/$@ && $(MAKE) $(MFLAGS)
@@ -37,3 +37,11 @@
  ifdef INSTALL
  	cd $(OSNAME)_$(VARIANTARCH)_zero/$(patsubst %zero,%,$@) && $(MAKE) $(MFLAGS) install
  endif
+ 
+ $(TARGETS_SHARK):  $(SUBDIRS_SHARK)
+    cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS)
+-   cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && ./test_gamma
+ ifdef INSTALL
+    cd $(OSNAME)_$(VARIANTARCH)_shark/$(patsubst %shark,%,$@) && $(MAKE) $(MFLAGS) install
+ endif
+