Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/test/tools/javah/MissingParamClassTest.sh	Wed Sep 23 18:48:13 2009 -0700
     1.2 +++ b/test/tools/javah/MissingParamClassTest.sh	Wed Sep 23 19:15:04 2009 -0700
     1.3 @@ -77,10 +77,7 @@
     1.4  rm -f ParamClassTest.class MissingParamClassException.class ParamClassTest.h
     1.5  rm -f ${TMP1}
     1.6  
     1.7 -cp ${TESTSRC}${FS}ParamClassTest.java .
     1.8 -cp ${TESTSRC}${FS}MissingParamClassException.java .
     1.9 -
    1.10 -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . "${TESTSRC}${FS}ParamClassTest.java"
    1.11 +"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . "${TESTSRC}${FS}ParamClassTest.java" "${TESTSRC}${FS}MissingParamClassException.java"
    1.12  
    1.13  # Before running javah remove dependent class file
    1.14  rm -f MissingParamClassException.class 
    1.15 @@ -88,15 +85,12 @@
    1.16  "${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} ParamClassTest 2>${TMP1}
    1.17  
    1.18  if [ -f $GENERATED_HEADER_FILE ]; then
    1.19 -     echo "Failed"
    1.20 -     exit 1
    1.21 +     echo "1-- Failed: $GENERATED_HEADER_FILE found"
    1.22 +     rc=1
    1.23  fi
    1.24 -if [ ! -f ${TMP1} ]; then
    1.25 -     echo "Failed"
    1.26 -     exit 1
    1.27 -else
    1.28 -     echo "Passed"
    1.29 -     exit 0
    1.30 +if [ ! -s ${TMP1} ]; then
    1.31 +     echo "1-- Failed: ${TMP1} is empty"
    1.32 +     rc=1
    1.33  fi
    1.34  
    1.35  # Clean out work dir
    1.36 @@ -104,7 +98,9 @@
    1.37  rm -f $GENERATED_HEADER_FILE $TMP1 
    1.38  
    1.39  # Re-compile everything
    1.40 -"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS}  -d . ${TESTSRC}${FS}ParamClassTest.java
    1.41 +
    1.42 +"${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . "${TESTSRC}${FS}ParamClassTest.java" "${TESTSRC}${FS}MissingParamClassException.java"
    1.43 +
    1.44  
    1.45  # Before re-run of javah remove dependent class file Param.class 
    1.46  rm -f Param.class
    1.47 @@ -112,13 +108,17 @@
    1.48  "${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} ParamClassTest 2>${TMP1}
    1.49  
    1.50  if [ -f $GENERATED_HEADER_FILE ]; then
    1.51 -     echo "Failed"
    1.52 -     exit 1
    1.53 +     echo "2-- Failed: $GENERATED_HEADER_FILE found"
    1.54 +     rc=1
    1.55  fi
    1.56 -if [ ! -f ${TMP1} ]; then
    1.57 -     echo "Failed"
    1.58 -     exit 1
    1.59 +if [ ! -s ${TMP1} ]; then
    1.60 +     echo "2-- Failed: ${TMP1} is empty"
    1.61 +     rc=1
    1.62 +fi
    1.63 +
    1.64 +if [ "$rc" = "" ]; then
    1.65 +    echo Passed
    1.66  else
    1.67 -     echo "Passed"
    1.68 -     exit 0
    1.69 +    echo Failed
    1.70 +    exit 1
    1.71  fi