diff options
| author | Orion Hodson <oth@google.com> | 2022-01-20 15:14:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-20 15:14:07 +0000 |
| commit | abc69c7426769ac509d3d6398683056b02eb72db (patch) | |
| tree | 6a7674836b636d6272db040eec2c560f0167ee95 | |
| parent | c6bc4fc43d0c24c206d6bc5f0ce9ef8cb64ccc54 (diff) | |
| parent | 3a1bbea144345b296c4babb5253c32e0c69d8def (diff) | |
| download | dalvik-abc69c7426769ac509d3d6398683056b02eb72db.tar.gz | |
Merge "dx-tests: fixes and suppressions following java 11 switch" am: 06ee287673 am: 4038b63464 am: 3a1bbea144
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1956098
Change-Id: I548f60f07febdb61a5b86aa4e8b1634e8abb2a1f
| -rw-r--r-- | dx/tests/116-leb128/build | 2 | ||||
| -rw-r--r-- | dx/tests/129-numthread-deterministic/run | 2 | ||||
| -rwxr-xr-x | dx/tests/run-all-tests | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/dx/tests/116-leb128/build b/dx/tests/116-leb128/build index f603ce247..fe15d1f1e 100644 --- a/dx/tests/116-leb128/build +++ b/dx/tests/116-leb128/build @@ -27,4 +27,4 @@ for i in "$dxjar" "$junitjar"; do fi done -${JAVAC} -cp $dxjar:$junitjar `find . -name "*.java"` +${JAVAC} -cp $dxjar:$junitjar -source 1.7 -target 1.7 `find . -name "*.java"` diff --git a/dx/tests/129-numthread-deterministic/run b/dx/tests/129-numthread-deterministic/run index c261ef4e1..b14523e8f 100644 --- a/dx/tests/129-numthread-deterministic/run +++ b/dx/tests/129-numthread-deterministic/run @@ -39,7 +39,7 @@ function writeClass(name) { mkdir classes -${JAVAC} -d classes `find src -name '*.java'` +${JAVAC} -source 1.8 -target 1.8 -d classes `find src -name '*.java'` mkdir out dx -JXmx4g -JXms4g --dex --no-optimize --output=out classes diff --git a/dx/tests/run-all-tests b/dx/tests/run-all-tests index 1822b22b8..577e97b06 100755 --- a/dx/tests/run-all-tests +++ b/dx/tests/run-all-tests @@ -33,7 +33,7 @@ cd "${progdir}" progdir=`pwd` prog="${progdir}"/`basename "${prog}"` -skip_tests="127-merge-stress" +skip_tests="115-merge 127-merge-stress 129-numthread-deterministic 130-numthread-multidex-deterministic 143-interface-methods" # Command-line options sequential="no" |