changeset 12806:9855f17334d8

Merge
author dsamersoff
date Thu, 03 Oct 2013 01:12:27 +0200
parents 6f73bc5df986 (diff) 2bd38d594b9a (current diff)
children 7ae82c3a781a
files
diffstat 2 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/make/windows/makefiles/fastdebug.make	Wed Oct 02 20:58:44 2013 +0400
+++ b/make/windows/makefiles/fastdebug.make	Thu Oct 03 01:12:27 2013 +0200
@@ -38,7 +38,7 @@
 !include ../local.make
 !include compile.make
 
-CXX_FLAGS=$(CXX_FLAGS) $(FASTDEBUG_OPT_OPTION) /D "CHECK_UNHANDLED_OOPS"
+CXX_FLAGS=$(CXX_FLAGS) $(FASTDEBUG_OPT_OPTION)
 
 !include $(WorkSpace)/make/windows/makefiles/vm.make
 !include local.make
--- a/test/TEST.groups	Wed Oct 02 20:58:44 2013 +0400
+++ b/test/TEST.groups	Thu Oct 03 01:12:27 2013 +0200
@@ -65,7 +65,6 @@
   gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java \
   gc/metaspace/TestMetaspacePerfCounters.java \
   runtime/6819213/TestBootNativeLibraryPath.java \
-  runtime/6878713/Test6878713.sh \
   runtime/6925573/SortMethodsTest.java \
   runtime/7107135/Test7107135.sh \
   runtime/7158988/FieldMonitor.java \