Mercurial > hg > truffle

diff src/share/vm/prims/jni.cpp @ 12873:4e7f99b70d9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author adlertz
date Wed, 09 Oct 2013 05:03:34 -0700
parents 03f493ce3a71
children cefad50507d8 f9be370a7d54
line wrap: on
line diff
--- a/src/share/vm/prims/jni.cpp	Wed Oct 09 13:00:20 2013 +0200
+++ b/src/share/vm/prims/jni.cpp	Wed Oct 09 05:03:34 2013 -0700
@@ -5046,7 +5046,10 @@
 void TestReservedSpace_test();
 void TestReserveMemorySpecial_test();
 void TestVirtualSpace_test();
-void MetaspaceAux_test();
+void TestMetaspaceAux_test();
+#if INCLUDE_ALL_GCS
+void TestG1BiasedArray_test();
+#endif
 
 void execute_internal_vm_tests() {
   if (ExecuteInternalVMTests) {
@@ -5054,7 +5057,7 @@
     run_unit_test(TestReservedSpace_test());
     run_unit_test(TestReserveMemorySpecial_test());
     run_unit_test(TestVirtualSpace_test());
-    run_unit_test(MetaspaceAux_test());
+    run_unit_test(TestMetaspaceAux_test());
     run_unit_test(GlobalDefinitions::test_globals());
     run_unit_test(GCTimerAllTest::all());
     run_unit_test(arrayOopDesc::test_max_array_length());
@@ -5066,6 +5069,7 @@
     run_unit_test(VMStructs::test());
 #endif
 #if INCLUDE_ALL_GCS
+    run_unit_test(TestG1BiasedArray_test());
     run_unit_test(HeapRegionRemSet::test_prt());
 #endif
     tty->print_cr("All internal VM tests passed");