test/runtime/6626217/Test6626217.sh

*** 1,7 ****
  # 
! #  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.
--- 1,7 ----
  # 
! #  Copyright (c) 1998, 2012, 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.
*** 44,55 ****
  then
    echo "TESTCLASSES not set.  Test cannot execute.  Failed."
    exit 1
  fi
  
- BIT_FLAG=""
- 
  # set platform-dependent variables
  OS=`uname -s`
  case "$OS" in
    SunOS | Linux )
      NULL=/dev/null
--- 44,53 ----
*** 56,71 ****
      PS=":"
      FS="/"
      RM=/bin/rm
      CP=/bin/cp
      MV=/bin/mv
-     ## for solaris, linux it's HOME
-     FILE_LOCATION=$HOME
-     if [ -f ${FILE_LOCATION}${FS}JDK64BIT -a ${OS} = "SunOS" ]
-     then
-         BIT_FLAG=`cat ${FILE_LOCATION}${FS}JDK64BIT`
-     fi
      ;;
    Windows_* )
      NULL=NUL
      PS=";"
      FS="\\"
--- 54,63 ----
*** 85,95 ****
  THIS_DIR=`pwd`
  
  JAVA=${TESTJAVA}${FS}bin${FS}java
  JAVAC=${TESTJAVA}${FS}bin${FS}javac
  
! ${JAVA} ${BIT_FLAG} -version
  
  # Current directory is scratch directory, copy all the test source there
  # (for the subsequent moves to work).
  ${CP} ${TESTSRC}${FS}*  ${THIS_DIR}
  
--- 77,87 ----
  THIS_DIR=`pwd`
  
  JAVA=${TESTJAVA}${FS}bin${FS}java
  JAVAC=${TESTJAVA}${FS}bin${FS}javac
  
! ${JAVA} ${TESTVMOPTS} -version
  
  # Current directory is scratch directory, copy all the test source there
  # (for the subsequent moves to work).
  ${CP} ${TESTSRC}${FS}*  ${THIS_DIR}
  
*** 111,119 ****
  # Rename the class file, so the custom loader (and not the system loader) will find it
  ${MV} many_loader.class many_loader.impl2
  ${MV} many_loader.impl1 many_loader.class
  ${RM} many_loader.java
  
! ${JAVA} ${BIT_FLAG} -Xverify -Xint -cp . bug_21227 >test.out 2>&1
  grep "loader constraint" test.out
  exit $?
  
--- 103,111 ----
  # Rename the class file, so the custom loader (and not the system loader) will find it
  ${MV} many_loader.class many_loader.impl2
  ${MV} many_loader.impl1 many_loader.class
  ${RM} many_loader.java
  
! ${JAVA} ${TESTVMOPTS} -Xverify -Xint -cp . bug_21227 >test.out 2>&1
  grep "loader constraint" test.out
  exit $?