Changeset 390 for trunk/openjdk/jdk/test


Ignore:
Timestamp:
Jul 2, 2012, 3:05:26 PM (13 years ago)
Author:
dmik
Message:

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

This accompanies an incomplete r389.

Location:
trunk/openjdk/jdk/test
Files:
2 edited
13 copied

Legend:

Unmodified
Added
Removed

  • trunk/openjdk/jdk/test/java/io/Serializable/expectedStackTrace/ExpectedStackTrace.java

    r278 r390  
    11/*
    2  * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
     2 * Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
    33 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44 *
    … …  
    2323
    2424/* @test
    25  * @bug 6317435
     25 * @bug 6317435 7110700
    2626 * @summary Verify that stack trace contains a proper cause of
    2727 *          InvalidClassException (methods: checkSerialize,
    … …  
    6060
    6161    public static final void main(String[] args) throws Exception {
    62         System.err.println("\nRegression test for CR6317435");
     62        System.err.println("\nRegression test for CRs 6317435, 7110700");
    6363        checkSerializable(getObject());
    6464    }
    … …  
    100100            }
    101101            if (found) {
     102                if (ex.getCause() != null) {
     103                    throw new Error("\nTest for CR 7110700 FAILED");
     104                }
    102105                System.err.println("\nTEST PASSED");
    103106            } else {
    104                 throw new Error();
     107                throw new Error("\nTest for CR 6317435 FAILED");
    105108            }
    106109        }

  • trunk/openjdk/jdk/test/sun/tools/jstatd/jstatdExternalRegistry.sh

    r309 r390  
    11#
    2 # Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 2004, 2011, 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.