Ignore:
Timestamp:
Feb 13, 2012, 10:07:12 PM (14 years ago)
Author:
dmik
Message:

trunk: Merged in openjdk6 b24 from branches/vendor/oracle.

Location:
trunk/openjdk
Files:
8 edited
22 copied

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • trunk/openjdk/hotspot/test/Makefile

    r278 r309  
    11#
    2 # Copyright (c) 1995, 2009, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    7979
    8080# Root of all test results
    81 ABS_BUILD_ROOT = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)
     81ifdef ALT_OUTPUTDIR
     82  ABS_BUILD_ROOT = $(ALT_OUTPUTDIR)/$(PLATFORM)-$(ARCH)
     83else
     84  ABS_BUILD_ROOT = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)
     85endif
    8286ABS_TEST_OUTPUT_DIR = $(ABS_BUILD_ROOT)/testoutput
    8387

  • trunk/openjdk/hotspot/test/compiler/6431242/Test.java

    r278 r309  
    11/*
    2  * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *

  • trunk/openjdk/hotspot/test/compiler/6603011/Test.java

    r278 r309  
    11/*
    2  * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    109109    if (quo != quo0 || rem != rem0) {
    110110      if (VERBOSE) {
    111         System.out.println("  " + dividend + " / " + divisor() + " = " +
    112                            quo + ", " + dividend + " % " + divisor() + " = " + rem);
     111        System.out.println("Computed: " + dividend + " / " + divisor() + " = " +
     112                           quo  + ", " + dividend + " % " + divisor() + " = " + rem );
     113        System.out.println("expected: " + dividend + " / " + divisor() + " = " +
     114                           quo0 + ", " + dividend + " % " + divisor() + " = " + rem0);
    113115        // Report sign of rem failure
    114116        if (rem != 0 && (rem ^ dividend) < 0) {
    … …  
    169171      for (int s = 0; s < 64; s += 4) {
    170172        total++;
    171         long dividend = i << s;
     173        long dividend = ((long)i) << s;
    172174        if (!checkL(dividend)) {
    173175          wrong++;

  • trunk/openjdk/hotspot/test/compiler/6857159/Test6857159.java

    r278 r309  
    11/*
    2  * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    5555
    5656    public static void main(String[] args) throws Exception {
    57         for (int i = 0; i < 100000; i++) {
     57        for (int i = 0; i < 20000; i++) {
    5858            Thread t = null;
    5959            switch (i % 3) {

  • trunk/openjdk/hotspot/test/compiler/6877254/Test.java

    r278 r309  
    11/*
    2  * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *

  • trunk/openjdk/hotspot/test/compiler/6895383/Test.java

    r278 r309  
    11/*
    2  * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *

  • trunk/openjdk/hotspot/test/compiler/6896727/Test.java

    r278 r309  
    11/*
    2  * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
Note: See TracChangeset for help on using the changeset viewer.