test/java/rmi/registry/readTest/readTest.sh

*** 21,30 ****
--- 21,32 ----
  # questions.
  #
  
  # @test
  # @bug 7102369 7094468 7100592
+ # @library ../../testlibrary
+ # @build TestLibrary
  # @summary remove java.rmi.server.codebase property parsing from registyimpl
  # @run shell readTest.sh
  
  OS=`uname -s`
  case "$OS" in
*** 42,67 ****
      echo "Unrecognized system!"
      exit 1;
      ;;
  esac
  
  cp -r ${TESTSRC}${FS}* .
  ${TESTJAVA}${FS}bin${FS}javac testPkg${FS}*java
! ${TESTJAVA}${FS}bin${FS}javac readTest.java
  
  mkdir rmi_tmp
  RMIREG_OUT=rmi.out
  #start rmiregistry without any local classes on classpath
  cd rmi_tmp
! ${TESTJAVA}${FS}bin${FS}rmiregistry 7491 > ..${FS}${RMIREG_OUT} 2>&1 &
  RMIREG_PID=$!
  # allow some time to start
  sleep 3
  cd ..
  
  # trailing / after code base is important for rmi codebase property.
! ${TESTJAVA}${FS}bin${FS}java -Djava.rmi.server.codebase=${FILEURL}`pwd`/ readTest > OUT.TXT 2>&1 &
  TEST_PID=$!
  #bulk of testcase - let it run for a while
  sleep 5
  
  #we're done, kill processes first
--- 44,71 ----
      echo "Unrecognized system!"
      exit 1;
      ;;
  esac
  
+ TEST_CLASSPATH=.:$TESTCLASSES
  cp -r ${TESTSRC}${FS}* .
  ${TESTJAVA}${FS}bin${FS}javac testPkg${FS}*java
! ${TESTJAVA}${FS}bin${FS}javac -cp $TEST_CLASSPATH readTest.java
  
  mkdir rmi_tmp
  RMIREG_OUT=rmi.out
  #start rmiregistry without any local classes on classpath
  cd rmi_tmp
! # NOTE: This RMI Registry port must match TestLibrary.READTEST_REGISTRY_PORT
! ${TESTJAVA}${FS}bin${FS}rmiregistry 64005 > ..${FS}${RMIREG_OUT} 2>&1 &
  RMIREG_PID=$!
  # allow some time to start
  sleep 3
  cd ..
  
  # trailing / after code base is important for rmi codebase property.
! ${TESTJAVA}${FS}bin${FS}java -cp $TEST_CLASSPATH -Djava.rmi.server.codebase=${FILEURL}`pwd`/ readTest > OUT.TXT 2>&1 &
  TEST_PID=$!
  #bulk of testcase - let it run for a while
  sleep 5
  
  #we're done, kill processes first