Mercurial > jdk8-mips64-public > hotspot / changeset

     1.1 --- a/src/share/vm/compiler/compileBroker.cpp	Fri Oct 25 12:40:10 2013 -0700
     1.2 +++ b/src/share/vm/compiler/compileBroker.cpp	Fri Oct 25 22:57:13 2013 +0200
     1.3 @@ -780,6 +780,10 @@
     1.4  void CompileBroker::compilation_init() {
     1.5    _last_method_compiled[0] = '\0';
     1.6  
     1.7 +  // No need to initialize compilation system if we do not use it.
     1.8 +  if (!UseCompiler) {
     1.9 +    return;
    1.10 +  }
    1.11  #ifndef SHARK
    1.12    // Set the interface to the current compiler(s).
    1.13    int c1_count = CompilationPolicy::policy()->compiler_count(CompLevel_simple);

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/compiler/startup/StartupOutput.java	Fri Oct 25 22:57:13 2013 +0200
     2.3 @@ -0,0 +1,44 @@
     2.4 +/*
     2.5 + * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + *
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + *
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + *
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + *
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/*
    2.28 + * @test
    2.29 + * @bug 8026949
    2.30 + * @summary Test ensures correct VM output during startup
    2.31 + * @library ../../testlibrary
    2.32 + *
    2.33 + */
    2.34 +import com.oracle.java.testlibrary.*;
    2.35 +
    2.36 +public class StartupOutput {
    2.37 +  public static void main(String[] args) throws Exception {
    2.38 +    ProcessBuilder pb;
    2.39 +    OutputAnalyzer out;
    2.40 +
    2.41 +    pb = ProcessTools.createJavaProcessBuilder("-Xint", "-XX:+DisplayVMOutputToStdout", "-version");
    2.42 +    out = new OutputAnalyzer(pb.start());
    2.43 +    out.shouldNotContain("no space to run compilers");
    2.44 +
    2.45 +    out.shouldHaveExitValue(0);
    2.46 +  }
    2.47 +}