Merge "DX: Fix tests 115, 119, 125" am: 50b3c25c

am: 47d5a85f

* commit '47d5a85f':
  DX: Fix tests 115, 119, 125

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!"

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!"

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!"