Tweak art tests to decouple better from toolchain version.
This CL changes some nested classes to be prebuilt rather
than compiled each time the test is run so they don't
depend on javac behavior, which changed between OpenJDK 8
and OpenJDK 9. This way, the tests pass when run on either
OpenJDK 8 or 9.
The class files were generated using OpenJDK 8 javac and
converted to jasmin (.j) using ClassFileAnalyzer 0.7.0 [1]
and Jasper 1.00 [2], respectively; license headers and
comments were added to the generated .j files.
[1] http://classfileanalyzer.javaseiten.de/
[2] http://www.angelfire.com/tx4/cus/jasper/
031-class-attributes:
Unlike OpenJDK 8 javac, OpenJDK 9 javac does not consider
an anonymous class declared inside a static method to be
static. This affects ClassAttr$1.j, which is now prebuilt.
085-old-style-inner-class:
Main$1 and Main$2 relied on compilation with javac
-source 1.4 -target 1.4, which OpenJDK 9 javac doesn't
support. They are now prebuilt. The two classes are
identical in all relevant aspects; a future CL could
simplify the test by dropping one of them.
Bug: 69449021
Test: The two tests touched by this CL pass in:
EXPERIMENTAL_USE_OPENJDK9=1.8 \
art/test/testrunner/run_build_test_target.py -j40 art-interpreter
Change-Id: I72ba88eb6325a641876b7143008dfb209a16047e
6 files changed