diff options
| author | Andreas Gampe <agampe@google.com> | 2015-11-07 02:35:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-07 02:35:33 +0000 |
| commit | df9d8556dfeeb38e857728b3193cbdf7297f3b11 (patch) | |
| tree | 17bf27dc9298c623785cd39bbe5bd2e76b38575b | |
| parent | 68fd0c98394da92ed9d3e3f1d6e780051d209818 (diff) | |
| parent | 47d5a85f8b82542e3f1ce4ee29c48ec17d70589f (diff) | |
| download | android_dalvik-df9d8556dfeeb38e857728b3193cbdf7297f3b11.tar.gz android_dalvik-df9d8556dfeeb38e857728b3193cbdf7297f3b11.tar.bz2 android_dalvik-df9d8556dfeeb38e857728b3193cbdf7297f3b11.zip | |
Merge "DX: Fix tests 115, 119, 125" am: 50b3c25ccf
am: 47d5a85f8b
* commit '47d5a85f8b82542e3f1ce4ee29c48ec17d70589f':
DX: Fix tests 115, 119, 125
| -rw-r--r-- | dx/tests/115-merge/run | 8 | ||||
| -rw-r--r-- | dx/tests/119-merge-conflict/run | 8 | ||||
| -rw-r--r-- | dx/tests/125-main-dex-list/run | 2 |
3 files changed, 11 insertions, 7 deletions
diff --git a/dx/tests/115-merge/run b/dx/tests/115-merge/run index 83e5b3db8..517800d7a 100644 --- a/dx/tests/115-merge/run +++ b/dx/tests/115-merge/run @@ -18,8 +18,10 @@ prog=`which dx` progdir=`dirname "${prog}"` dxjar=$progdir/../framework/dx.jar +junitjar=$progdir/../framework/junit.jar +junitdex=$progdir/../framework/junit-hostdex.jar -javac -cp $dxjar `find . -name "*.java"` +javac -cp $dxjar:$junitjar `find . -name "*.java"` dx --dex --output=test.jar com/android/dx/merge/* $dxjar # Build a resource .jar containing the .dex files to merge @@ -30,8 +32,8 @@ dx --dex --output=testdata/StaticValues.dex testdata/StaticValues* dx --dex --output=testdata/TryCatchFinally.dex testdata/TryCatchFinally* jar cfM resources.jar testdata/*.dex -dalvik -classpath test.jar:resources.jar \ - junit.textui.TestRunner com.android.dx.merge.DexMergeTest > unit-out.txt +art -classpath test.jar:$junitdex:resources.jar \ + junit.textui.TestRunner com.android.dx.merge.DexMergeTest > unit-out.txt 2>&1 if [ "$?" = "0" ]; then echo "Yay!" diff --git a/dx/tests/119-merge-conflict/run b/dx/tests/119-merge-conflict/run index 28c152d2c..cac754ea4 100644 --- a/dx/tests/119-merge-conflict/run +++ b/dx/tests/119-merge-conflict/run @@ -18,8 +18,10 @@ prog=`which dx` progdir=`dirname "${prog}"` dxjar=$progdir/../framework/dx.jar +junitjar=$progdir/../framework/junit.jar +junitdex=$progdir/../framework/junit-hostdex.jar -javac -cp $dxjar `find . -name "*.java"` +javac -cp $dxjar:$junitjar `find . -name "*.java"` dx --dex --output=test.jar com/android/dx/merge/* $dxjar # Build a resource .jar containing the .dex files to merge @@ -27,8 +29,8 @@ dx --dex --output=testdata/A.dex testdata/A.class dx --dex --output=testdata/B.dex testdata/B.class jar cfM resources.jar testdata/*.dex -dalvik -classpath test.jar:resources.jar \ - junit.textui.TestRunner com.android.dx.merge.MergeConflictTest > unit-out.txt +art -classpath test.jar:$junitdex:resources.jar \ + junit.textui.TestRunner com.android.dx.merge.MergeConflictTest > unit-out.txt 2>&1 if [ "$?" = "0" ]; then echo "Yay!" diff --git a/dx/tests/125-main-dex-list/run b/dx/tests/125-main-dex-list/run index 6cba980eb..48606252d 100644 --- a/dx/tests/125-main-dex-list/run +++ b/dx/tests/125-main-dex-list/run @@ -24,7 +24,7 @@ mkdir out dx -JXmx1024m --dex --no-optimize --multi-dex --main-dex-list=main.list --minimal-main-dex --output=out classes -dalvik -classpath test.jar com.android.dx.multidex.MainDexListTest > unit-out.txt +art -classpath test.jar com.android.dx.multidex.MainDexListTest > unit-out.txt 2>&1 if [ "$?" = "0" ]; then echo "Yay!" |