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

     1.1 --- a/test/runtime/NMT/ShutdownTwice.java	Wed Aug 27 08:19:12 2014 -0400
     1.2 +++ b/test/runtime/NMT/ShutdownTwice.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   * @summary Run shutdown twice
    1.13   * @library /testlibrary
    1.14 + * @ignore
    1.15   * @run main/othervm -XX:NativeMemoryTracking=detail ShutdownTwice
    1.16   */
    1.17  
    1.18 @@ -45,12 +46,12 @@
    1.19      output = new OutputAnalyzer(pb.start());
    1.20  
    1.21      // Verify that jcmd reports that NMT is shutting down
    1.22 -    output.shouldContain("Shutdown is in progress, it will take a few moments to completely shutdown");
    1.23 +    output.shouldContain("Native memory tracking has been turned off");
    1.24  
    1.25      // Run shutdown again
    1.26      output = new OutputAnalyzer(pb.start());
    1.27  
    1.28      // Verify that jcmd reports that NMT has been shutdown already
    1.29 -    output.shouldContain("Native memory tracking has been shutdown by user");
    1.30 +    output.shouldContain("Native memory tracking has been shutdown");
    1.31    }
    1.32  }