8006212: javac, convert jtreg tests from shell script to java

Reviewed-by: jjg
This commit is contained in:
Vicente Romero 2013-02-19 17:53:16 +00:00
parent 6e097b8776
commit 68a3295c8b
88 changed files with 2675 additions and 3237 deletions

View file

@ -0,0 +1,97 @@
/*
* Copyright (c) 2013, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/*
* @test
* @bug 6271292
* @summary Verify that javap prints StackMapTable attribute contents
* @library /tools/javac/lib
* @build ToolBox
* @run main StackmapTest
*/
import java.util.Arrays;
import java.util.List;
//original test: test/tools/javap/stackmap/T6271292.sh
public class StackmapTest {
private static final String TestSrc =
"public class Test extends SuperClass {\n" +
" public static void main(String[] args) {\n" +
" new SuperClass((args[0].equals(\"0\")) ? 0 : 1)\n" +
" .test();\n" +
" }\n" +
" Test(boolean b) {\n" +
" super(b ? 1 : 2);\n" +
" }\n" +
"}\n" +
"class SuperClass {\n" +
" double d;\n" +
" SuperClass(double dd) { d = dd; }\n" +
" double test() {\n" +
" if (d == 0)\n" +
" return d;\n" +
" else\n" +
" return d > 0 ? d++ : d--;\n" +
" }\n" +
"}\n";
private static final String goldenOut =
"frame_type = 255 /* full_frame */\n" +
"frame_type = 255 /* full_frame */\n" +
"frame_type = 73 /* same_locals_1_stack_item */\n" +
"frame_type = 255 /* full_frame */\n" +
"offset_delta = 19\n" +
"offset_delta = 0\n" +
"offset_delta = 2\n" +
"stack = [ uninitialized 0, uninitialized 0 ]\n" +
"stack = [ uninitialized 0, uninitialized 0, double ]\n" +
"stack = [ this ]\n" +
"stack = [ this, double ]\n" +
"locals = [ class \"[Ljava/lang/String;\" ]\n" +
"locals = [ class \"[Ljava/lang/String;\" ]\n" +
"locals = [ this, int ]\n";
public static void main(String[] args) throws Exception {
// @compile T6271292.java
ToolBox.JavaToolArgs javacParams =
new ToolBox.JavaToolArgs().setSources(TestSrc);
ToolBox.javac(javacParams);
// "${TESTJAVA}${FS}bin${FS}javap" ${TESTTOOLVMOPTS} -classpath "${TESTCLASSES}" -verbose T6271292 > "${JAVAPFILE}"
ToolBox.JavaToolArgs javapParams =
new ToolBox.JavaToolArgs()
.setAllArgs("-v", "Test.class");
String out = ToolBox.javap(javapParams);
List<String> grepResult = ToolBox.grep("frame_type", out);
grepResult.addAll(ToolBox.grep("offset_delta", out));
grepResult.addAll(ToolBox.grep("stack = ", out));
grepResult.addAll(ToolBox.grep("locals = ", out));
List<String> goldenList = Arrays.asList(goldenOut.split("\n"));
// diff -w "${OUTFILE}" "${TESTSRC}${FS}T6271292.out"
ToolBox.compareLines(goldenList, grepResult, true);
}
}

View file

@ -1,49 +0,0 @@
/*
* Copyright (c) 2005, 2007, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
public class T6271292 extends SuperClass {
public static void main(String[] args) {
SuperClass s = new SuperClass((args[0].equals("0")) ? 0 : 1);
s.test();
}
T6271292(boolean b) {
super(b ? 1 : 2);
}
}
class SuperClass {
double d;
SuperClass(double dd) { d = dd; }
double test() {
if (d == 0) {
return d;
} else if (d > 0) {
return d++;
} else {
return d--;
}
}
}

View file

@ -1,14 +0,0 @@
frame_type = 255 /* full_frame */
frame_type = 255 /* full_frame */
frame_type = 73 /* same_locals_1_stack_item */
frame_type = 255 /* full_frame */
offset_delta = 19
offset_delta = 0
offset_delta = 2
stack = [ uninitialized 0, uninitialized 0 ]
stack = [ uninitialized 0, uninitialized 0, double ]
stack = [ this ]
stack = [ this, double ]
locals = [ class "[Ljava/lang/String;" ]
locals = [ class "[Ljava/lang/String;" ]
locals = [ this, int ]

View file

@ -1,88 +0,0 @@
#!/bin/sh
#
# Copyright (c) 2005, 2009, 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
# under the terms of the GNU General Public License version 2 only, as
# published by the Free Software Foundation.
#
# This code is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# version 2 for more details (a copy is included in the LICENSE file that
# accompanied this code).
#
# You should have received a copy of the GNU General Public License version
# 2 along with this work; if not, write to the Free Software Foundation,
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
#
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
# or visit www.oracle.com if you need additional information or have any
# questions.
#
# @test
# @bug 6271292
# @compile T6271292.java
# @run shell T6271292.sh
# @summary Verify that javap prints StackMapTable attribute contents
# @author Wei Tao
if [ "${TESTSRC}" = "" ]
then
echo "TESTSRC not set. Test cannot execute. Failed."
exit 1
fi
printf 'TESTSRC="%s"' "${TESTSRC}" >&2 ; echo >&2
if [ "${TESTJAVA}" = "" ]
then
echo "TESTJAVA not set. Test cannot execute. Failed."
exit 1
fi
printf 'TESTJAVA="%s"' "${TESTJAVA}" >&2 ; echo >&2
if [ "${TESTCLASSES}" = "" ]
then
echo "TESTCLASSES not set. Test cannot execute. Failed."
exit 1
fi
printf 'TESTCLASSES="%s"' "${TESTCLASSES}" >&2 ; echo >&2
printf 'CLASSPATH="%s"' "${CLASSPATH}" >&2 ; echo >&2
# set platform-dependent variables
OS=`uname -s`
case "$OS" in
Windows* )
FS="\\"
;;
* )
FS="/"
;;
esac
JAVAPFILE=T6271292.javap
OUTFILE=outfile
"${TESTJAVA}${FS}bin${FS}javap" ${TESTTOOLVMOPTS} -classpath "${TESTCLASSES}" -verbose T6271292 > "${JAVAPFILE}"
result="$?"
if [ "$result" -ne 0 ]
then
exit "$result"
fi
grep "frame_type" "${JAVAPFILE}" > "${OUTFILE}"
grep "offset_delta" "${JAVAPFILE}" >> "${OUTFILE}"
grep "stack = " "${JAVAPFILE}" >> "${OUTFILE}"
grep "locals = " "${JAVAPFILE}" >> "${OUTFILE}"
diff -w "${OUTFILE}" "${TESTSRC}${FS}T6271292.out"
result="$?"
if [ "$result" -eq 0 ]
then
echo "Passed"
else
echo "Failed"
fi
exit "$result"