archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-23 04:24:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7194035: update tests for upcoming changes for jtreg

Browse source 
Reviewed-by: alanb, sspitsyn
This commit is contained in:
Jonathan Gibbons 2012-08-28 10:31:27 +01:00
parent e4326b6cc5
commit 3edec130c3
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
jdk/test/sun/tools/common/ApplicationSetup.sh
View file

@ -1,7 +1,7 @@
#!/bin/sh #!/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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -43,7 +43,7 @@ startApplication()
{ {
appOutput="${TESTCLASSES}/Application.out" appOutput="${TESTCLASSES}/Application.out"
${JAVA} -XX:+UsePerfData -classpath "${TESTCLASSES}" "$@" > "$appOutput" 2>&1 & ${JAVA} -XX:+UsePerfData -classpath "${TESTCLASSPATH:-${TESTCLASSES}}" "$@" > "$appOutput" 2>&1 &
appJavaPid="$!" appJavaPid="$!"
appOtherPid= appOtherPid=
appPidList="$appJavaPid" appPidList="$appJavaPid"
@ -131,7 +131,7 @@ startApplication()
# #
stopApplication() stopApplication()
{ {
$JAVA -XX:+UsePerfData -classpath "${TESTCLASSES}" ShutdownSimpleApplication $1 $JAVA -XX:+UsePerfData -classpath "${TESTCLASSPATH:-${TESTCLASSES}}" ShutdownSimpleApplication $1
} }

4
jdk/test/sun/tools/jps/jps-Vvml_2.sh
View file

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -51,7 +51,7 @@ JAVA="${TESTJAVA}/bin/java"
# and we can not set -XX:+UsePerfData as that invalidates the test premise of # and we can not set -XX:+UsePerfData as that invalidates the test premise of
# there being no jvm flags # there being no jvm flags
${JAVA} -cp ${TESTCLASSES} Sleeper & ${JAVA} -cp ${TESTCLASSPATH:-${TESTCLASSES}} Sleeper &
SLEEPER_PID=$! SLEEPER_PID=$!
${JPS} -J-XX:Flags=${TESTSRC}/vmflags -Vvml | awk -f ${TESTSRC}/jps-Vvml_Output2.awk ${JPS} -J-XX:Flags=${TESTSRC}/vmflags -Vvml | awk -f ${TESTSRC}/jps-Vvml_Output2.awk

4
jdk/test/sun/tools/jps/jps-m_2.sh
View file

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -46,7 +46,7 @@ JAVA="${TESTJAVA}/bin/java"
# any args to Sleeper.main(), as we need to inspect jps output # any args to Sleeper.main(), as we need to inspect jps output
# for the no args condition. # for the no args condition.
# #
${JAVA} -XX:+UsePerfData -cp ${TESTCLASSES} Sleeper & ${JAVA} -XX:+UsePerfData -cp ${TESTCLASSPATH:-${TESTCLASSES}} Sleeper &
SLEEPER_PID=$! SLEEPER_PID=$!
${JPS} -J-XX:+UsePerfData -m | awk -f ${TESTSRC}/jps-m_Output2.awk ${JPS} -J-XX:+UsePerfData -m | awk -f ${TESTSRC}/jps-m_Output2.awk