提交 ee6c30c9 编写于 作者: S sla

8036132: Tab characters in test/com/sun/jdi files

Reviewed-by: alanb, mikael
上级 3d4e8b49
......@@ -35,44 +35,44 @@ createJavaFile()
cat <<EOF > $classname.java.1
public class $classname {
public void bark(int i) {
System.out.println(" bark: " + i);
switch (i) {
case 0:
throw new IllegalArgumentException("IllegalArgumentException");
case 1:
throw new ArithmeticException("ArithmeticException");
case 2:
throw new IllegalMonitorStateException("IllegalMonitorStateException");
case 3:
throw new IndexOutOfBoundsException("IndexOutOfBoundsException");
default:
throw new Error("should not happen");
}
System.out.println(" bark: " + i);
switch (i) {
case 0:
throw new IllegalArgumentException("IllegalArgumentException");
case 1:
throw new ArithmeticException("ArithmeticException");
case 2:
throw new IllegalMonitorStateException("IllegalMonitorStateException");
case 3:
throw new IndexOutOfBoundsException("IndexOutOfBoundsException");
default:
throw new Error("should not happen");
}
}
public void loop(int max) {
for (int i = 0; i <= max; i++) {
try {
bark(i);
} catch(RuntimeException re) {
System.out.println(" loop: " + re.getMessage() +
" caught and ignored.");
}
}
for (int i = 0; i <= max; i++) {
try {
bark(i);
} catch(RuntimeException re) {
System.out.println(" loop: " + re.getMessage() +
" caught and ignored.");
}
}
}
public void partOne() {
loop(2);
System.out.println("partOne completed");
System.out.println("partOne completed");
}
public void partTwo() {
loop(3);
System.out.println("partTwo completed");
System.out.println("partTwo completed");
}
public static void main(String[] args) {
System.out.println("Howdy!");
System.out.println("Howdy!");
$classname my = new $classname();
my.partOne();
my.partTwo();
System.out.println("Goodbye from $classname!");
my.partOne();
my.partTwo();
System.out.println("Goodbye from $classname!");
}
}
EOF
......
......@@ -39,12 +39,12 @@ createJavaFile()
public class GetLocalVariables4Targ {
public static void main(String[] args) {
System.out.println("Howdy!");
int i = 0;
try {
i = 16 / i;
} catch(Exception e) {
System.out.println("e should be visible"); // @1 breakpoint
}
int i = 0;
try {
i = 16 / i;
} catch(Exception e) {
System.out.println("e should be visible"); // @1 breakpoint
}
System.out.println("Goodbye from GetLocalVariables4Targ!");
}
}
......
......@@ -219,7 +219,7 @@ if [ ! -r c:/ ] ; then
echo "Unable to make file unreadable, so test will fail. chmod: $HOME/jdb.ini"
if grep -q "uid=0" $HOME/jdb.ini ; then
echo "The test is running as root. Fix infrastructure!"
fi
fi
fi
doit
failIfNot 1 "open: $HOME/jdb.ini"
......
......@@ -40,10 +40,10 @@ public class badscope {
public static final void main(String args[]) {
try {
System.out.println("hi!"); // @1 breakpoint
} catch (Exception e) {
} catch (Exception e) {
e.printStackTrace();
} finally {
System.out.println("done");
System.out.println("done");
}
}
}
......@@ -54,11 +54,11 @@ EOF
dojdbCmds()
{
#set -x
cmd stop at badscope:4 ; $sleepcmd
runToBkpt ; $sleepcmd
cmd next ; $sleepcmd
cmd next ; $sleepcmd
cmd locals ; $sleepcmd
cmd stop at badscope:4 ; $sleepcmd
runToBkpt ; $sleepcmd
cmd next ; $sleepcmd
cmd next ; $sleepcmd
cmd locals ; $sleepcmd
cmd cont
}
......@@ -71,7 +71,7 @@ mysetup()
for ii in . $TESTSRC $TESTSRC/.. ; do
if [ -r "$ii/ShellScaffold.sh" ] ; then
. $ii/ShellScaffold.sh
. $ii/ShellScaffold.sh
break
fi
done
......
......@@ -67,9 +67,9 @@ if [ -z "${TESTJAVA}" ] ; then
# is given on the command line, tell the user that and use a default.
# THIS IS THE JDK BEING TESTED.
if [ -n "$1" ] ; then
TESTJAVA=$1
TESTJAVA=$1
else
TESTJAVA=$JAVA_HOME
TESTJAVA=$JAVA_HOME
fi
TESTSRC=.
TESTCLASSES=.
......
......@@ -42,15 +42,15 @@ createJavaFile()
public final class $1 {
public int m1(int i) {
// @1 uncomment System.out.println("I'm here");
return m2(i, 1000);
// @1 uncomment System.out.println("I'm here");
return m2(i, 1000);
}
public int m2(int i, int j) {
if (i < 0 || j < 0) { // @1 breakpoint
if (i < 0 || j < 0) { // @1 breakpoint
throw new IllegalArgumentException();
}
return i+j;
}
return i+j;
}
$1() {
......@@ -59,7 +59,7 @@ public final class $1 {
}
public static void main(String args[]) {
new $1();
new $1();
}
}
EOF
......
......@@ -44,18 +44,18 @@ public final class $1 {
public long m1(int i) {
long r=0;
r = m2(i * 2); // @1 commentout
// @1 uncomment r =m2(i * 2L);
// @1 uncomment r =m2(i * 2L);
return r;
}
public long m2(int j) {
System.out.println(System.getProperty("line.separator") +
System.out.println(System.getProperty("line.separator") +
"**** public long m2(int j) with value: " + j);
return j;
}
public long m2(long j) {
System.out.println(System.getProperty("line.separator") +
System.out.println(System.getProperty("line.separator") +
"**** public long m2(long j) with value: " + j);
return j;
}
......@@ -66,7 +66,7 @@ public final class $1 {
r1 = m1(1000);
r2 = 0; // @1 breakpoint
r2 = m1(1000);
if (r1 != r2) { // @1 breakpoint
if (r1 != r2) { // @1 breakpoint
throw new Exception("FAILURE: Expected value: " + r1 + " Actual value: " + r2);
} else {
System.out.println("SUCCESS: Expected value: " + r1 + " Actual value: " + r2);
......@@ -74,7 +74,7 @@ public final class $1 {
}
public static void main(String args[]) throws Exception {
new $1().doit();
new $1().doit();
}
}
EOF
......
......@@ -23,7 +23,7 @@
# questions.
#
# @test @(#)StringConvertTest.sh 1.6 03/04/09
# @test
# @bug 4511950 4843082
# @summary 1. jdb's expression evaluation doesn't perform string conversion properly
# 2. TTY: run on expression evaluation
......
......@@ -68,9 +68,9 @@ if [ -z "${TESTJAVA}" ] ; then
# is given on the command line, tell the user that and use a default.
# THIS IS THE JDK BEING TESTED.
if [ -n "$1" ] ; then
TESTJAVA=$1
TESTJAVA=$1
else
TESTJAVA=$JAVA_HOME
TESTJAVA=$JAVA_HOME
fi
TESTSRC=.
TESTCLASSES=.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册