Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 6139:46126bc51bb8
7194035: update tests for upcoming changes for jtreg
Reviewed-by: alanb, sspitsyn
author | jjg |
---|---|
date | Tue, 28 Aug 2012 10:31:27 +0100 |
parents | 2506caa34870 |
children | a0853a216bd3 |
files | test/sun/tools/common/ApplicationSetup.sh test/sun/tools/jps/jps-Vvml_2.sh test/sun/tools/jps/jps-m_2.sh |
diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/test/sun/tools/common/ApplicationSetup.sh Tue Aug 28 10:29:30 2012 +0100 +++ b/test/sun/tools/common/ApplicationSetup.sh Tue Aug 28 10:31:27 2012 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 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 @@ -43,7 +43,7 @@ { appOutput="${TESTCLASSES}/Application.out" - ${JAVA} -XX:+UsePerfData -classpath "${TESTCLASSES}" "$@" > "$appOutput" 2>&1 & + ${JAVA} -XX:+UsePerfData -classpath "${TESTCLASSPATH:-${TESTCLASSES}}" "$@" > "$appOutput" 2>&1 & appJavaPid="$!" appOtherPid= appPidList="$appJavaPid" @@ -131,7 +131,7 @@ # stopApplication() { - $JAVA -XX:+UsePerfData -classpath "${TESTCLASSES}" ShutdownSimpleApplication $1 + $JAVA -XX:+UsePerfData -classpath "${TESTCLASSPATH:-${TESTCLASSES}}" ShutdownSimpleApplication $1 }
--- a/test/sun/tools/jps/jps-Vvml_2.sh Tue Aug 28 10:29:30 2012 +0100 +++ b/test/sun/tools/jps/jps-Vvml_2.sh Tue Aug 28 10:31:27 2012 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 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 @@ -51,7 +51,7 @@ # and we can not set -XX:+UsePerfData as that invalidates the test premise of # there being no jvm flags -${JAVA} -cp ${TESTCLASSES} Sleeper & +${JAVA} -cp ${TESTCLASSPATH:-${TESTCLASSES}} Sleeper & SLEEPER_PID=$! ${JPS} -J-XX:Flags=${TESTSRC}/vmflags -Vvml | awk -f ${TESTSRC}/jps-Vvml_Output2.awk
--- a/test/sun/tools/jps/jps-m_2.sh Tue Aug 28 10:29:30 2012 +0100 +++ b/test/sun/tools/jps/jps-m_2.sh Tue Aug 28 10:31:27 2012 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 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 @@ -46,7 +46,7 @@ # any args to Sleeper.main(), as we need to inspect jps output # for the no args condition. # -${JAVA} -XX:+UsePerfData -cp ${TESTCLASSES} Sleeper & +${JAVA} -XX:+UsePerfData -cp ${TESTCLASSPATH:-${TESTCLASSES}} Sleeper & SLEEPER_PID=$! ${JPS} -J-XX:+UsePerfData -m | awk -f ${TESTSRC}/jps-m_Output2.awk