From 0ce11260722cc30395f5ce39526daa2ffa8625e4 Mon Sep 17 00:00:00 2001 From: acorn Date: Fri, 10 Sep 2010 12:36:47 -0400 Subject: [PATCH] 6942092: Loader-constraint test is failing Summary: Fix test string compare to match source update Reviewed-by: dcubed, phh --- test/runtime/6626217/Test6626217.sh | 32 ++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/test/runtime/6626217/Test6626217.sh b/test/runtime/6626217/Test6626217.sh index 6bc57a7be..88c3c5bf5 100644 --- a/test/runtime/6626217/Test6626217.sh +++ b/test/runtime/6626217/Test6626217.sh @@ -1,9 +1,27 @@ -# -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. -# SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. -# - -# +# +# Copyright (c) 1998, 2010, Oracle and/or its affiliates. All rights reserved. +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# This code is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. +# +# This code is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + + # @test @(#)Test6626217.sh # @bug 6626217 # @summary Loader-constraint table allows arrays instead of only the base-classes @@ -96,6 +114,6 @@ ${MV} many_loader.impl1 many_loader.class ${RM} many_loader.java ${JAVA} ${BIT_FLAG} -Xverify -Xint -cp . bug_21227 >test.out 2>&1 -grep "violates loader constraints" test.out +grep "loader constraint" test.out exit $? -- GitLab