Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/test/runtime/NMT/ThreadedMallocTestType.java	Wed Aug 27 08:19:12 2014 -0400
     1.2 +++ b/test/runtime/NMT/ThreadedMallocTestType.java	Wed Aug 27 08:35:03 2014 -0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -26,6 +26,7 @@
    1.11   * @key nmt jcmd
    1.12   * @library /testlibrary /testlibrary/whitebox
    1.13   * @build ThreadedMallocTestType
    1.14 + * @ignore
    1.15   * @run main ClassFileInstaller sun.hotspot.WhiteBox
    1.16   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedMallocTestType
    1.17   */
    1.18 @@ -58,11 +59,6 @@
    1.19      allocThread.start();
    1.20      allocThread.join();
    1.21  
    1.22 -    // Use WB API to ensure that all data has been merged before we continue
    1.23 -    if (!wb.NMTWaitForDataMerge()) {
    1.24 -      throw new Exception("Call to WB API NMTWaitForDataMerge() failed");
    1.25 -    }
    1.26 -
    1.27      // Run 'jcmd <pid> VM.native_memory summary'
    1.28      pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), pid, "VM.native_memory", "summary"});
    1.29      output = new OutputAnalyzer(pb.start());
    1.30 @@ -80,11 +76,6 @@
    1.31      freeThread.start();
    1.32      freeThread.join();
    1.33  
    1.34 -    // Use WB API to ensure that all data has been merged before we continue
    1.35 -    if (!wb.NMTWaitForDataMerge()) {
    1.36 -      throw new Exception("Call to WB API NMTWaitForDataMerge() failed");
    1.37 -    }
    1.38 -
    1.39      output = new OutputAnalyzer(pb.start());
    1.40      output.shouldNotContain("Test (reserved=");
    1.41    }