8008095: TEST_BUG: JDK-8002048 one more testcase failure on Solaris
Fixed couple of more Solaris shell incompatibilities Reviewed-by: chegar
This commit is contained in:
parent
fdcad628a4
commit
403e23ec70
@ -1,4 +1,4 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh -x
|
||||||
|
|
||||||
# Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved.
|
# Copyright (c) 2011, 2012 Oracle and/or its affiliates. All rights reserved.
|
||||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||||
@ -51,7 +51,7 @@ _do_compile(){
|
|||||||
# sun.* packages is not included to symbol file lib/ct.sym so we have
|
# sun.* packages is not included to symbol file lib/ct.sym so we have
|
||||||
# to ignore it
|
# to ignore it
|
||||||
|
|
||||||
if [ ! -f ${_testclasses} ]
|
if [ ! -d ${_testclasses} ]
|
||||||
then
|
then
|
||||||
mkdir -p ${_testclasses}
|
mkdir -p ${_testclasses}
|
||||||
fi
|
fi
|
||||||
@ -295,12 +295,12 @@ do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ ${_compile} = "yes" ]
|
if [ "${_compile}" = "yes" ]
|
||||||
then
|
then
|
||||||
_do_compile
|
_do_compile
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ${_jtreg} = "yes" ]
|
if [ "${_jtreg}" = "yes" ]
|
||||||
then
|
then
|
||||||
_testclasses=${TESTCLASSES}
|
_testclasses=${TESTCLASSES}
|
||||||
_testsrc=${TESTSRC}
|
_testsrc=${TESTSRC}
|
||||||
@ -309,7 +309,7 @@ fi
|
|||||||
|
|
||||||
# Make sure _tesclasses is absolute path
|
# Make sure _tesclasses is absolute path
|
||||||
tt=`echo ${_testclasses} | sed -e 's,/,,'`
|
tt=`echo ${_testclasses} | sed -e 's,/,,'`
|
||||||
if [ ${tt} = ${_testclasses} ]
|
if [ "${tt}" = "${_testclasses}" ]
|
||||||
then
|
then
|
||||||
_testclasses="${_pwd}/${_testclasses}"
|
_testclasses="${_pwd}/${_testclasses}"
|
||||||
fi
|
fi
|
||||||
@ -319,7 +319,7 @@ _policyname="${_testclasses}/policy"
|
|||||||
rm -f ${_logname}
|
rm -f ${_logname}
|
||||||
rm -f ${_policyname}
|
rm -f ${_policyname}
|
||||||
|
|
||||||
if [ -e ${_testsrc}/policy.tpl ]
|
if [ -f ${_testsrc}/policy.tpl ]
|
||||||
then
|
then
|
||||||
|
|
||||||
cat ${_testsrc}/policy.tpl | \
|
cat ${_testsrc}/policy.tpl | \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user