From e9f26d4d61f8c936a2067f18bc26778a33561054 Mon Sep 17 00:00:00 2001
From: Andreas Gampe <agampe@google.com>
Date: Fri, 6 Nov 2015 17:29:36 -0800
Subject: DX: Fix tests 029, 033, 116, 117

Fix the junit tests.

Bug: 25567784
Change-Id: I17df7644b938c55a7a6b0fd39be535c59b71b0f7
---
 dx/tests/029-unit-Bits/run     | 8 +++++++-
 dx/tests/033-unit-IntList/run  | 8 +++++++-
 dx/tests/116-leb128/run        | 5 +++--
 dx/tests/117-modified-utf8/run | 5 +++--
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/dx/tests/029-unit-Bits/run b/dx/tests/029-unit-Bits/run
index 9937ce5b4..73c3dd6a0 100644
--- a/dx/tests/029-unit-Bits/run
+++ b/dx/tests/029-unit-Bits/run
@@ -14,7 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-dx --junit com.android.dx.util._tests._Bits > unit-out.txt
+prog=`which dx`
+progdir=`dirname "${prog}"`
+dxjar=$progdir/../framework/dx.jar
+dxtestsjar=$progdir/../framework/dx-tests.jar
+junitjar=$progdir/../framework/junit.jar
+
+java -cp $dxtestsjar:$dxjar:$junitjar junit.textui.TestRunner com.android.dx.util.BitsTest > unit-out.txt 2>&1
 
 if [ "$?" = "0" ]; then
     echo "Yay!"
diff --git a/dx/tests/033-unit-IntList/run b/dx/tests/033-unit-IntList/run
index 16ca6fb8c..92071b157 100644
--- a/dx/tests/033-unit-IntList/run
+++ b/dx/tests/033-unit-IntList/run
@@ -14,7 +14,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-dx --junit com.android.dx.util._tests._IntList > unit-out.txt
+prog=`which dx`
+progdir=`dirname "${prog}"`
+dxjar=$progdir/../framework/dx.jar
+dxtestsjar=$progdir/../framework/dx-tests.jar
+junitjar=$progdir/../framework/junit.jar
+
+java -cp $dxtestsjar:$dxjar:$junitjar junit.textui.TestRunner com.android.dx.util.IntListTest > unit-out.txt 2>&1
 
 if [ "$?" = "0" ]; then
     echo "Yay!"
diff --git a/dx/tests/116-leb128/run b/dx/tests/116-leb128/run
index 5f36cd985..53a7ee30a 100644
--- a/dx/tests/116-leb128/run
+++ b/dx/tests/116-leb128/run
@@ -18,9 +18,10 @@
 prog=`which dx`
 progdir=`dirname "${prog}"`
 dxjar=$progdir/../framework/dx.jar
+junitjar=$progdir/../framework/junit.jar
 
-javac -cp $dxjar `find . -name "*.java"`
-java -classpath $dxjar:. junit.textui.TestRunner com.android.dx.util.Leb128UtilsTest > unit-out.txt
+javac -cp $dxjar:$junitjar `find . -name "*.java"`
+java -classpath $dxjar:$junitjar:. junit.textui.TestRunner com.android.dx.util.Leb128UtilsTest > unit-out.txt 2>&1
 
 if [ "$?" = "0" ]; then
     echo "Yay!"
diff --git a/dx/tests/117-modified-utf8/run b/dx/tests/117-modified-utf8/run
index a4c202ef4..7199349f6 100644
--- a/dx/tests/117-modified-utf8/run
+++ b/dx/tests/117-modified-utf8/run
@@ -18,9 +18,10 @@
 prog=`which dx`
 progdir=`dirname "${prog}"`
 dxjar=$progdir/../framework/dx.jar
+junitjar=$progdir/../framework/junit.jar
 
-javac -cp $dxjar `find . -name "*.java"`
-java -classpath $dxjar:. junit.textui.TestRunner com.android.dx.util.Mutf8Test > unit-out.txt
+javac -cp $dxjar:$junitjar `find . -name "*.java"`
+java -classpath $dxjar:$junitjar:. junit.textui.TestRunner com.android.dx.util.Mutf8Test > unit-out.txt 2>&1
 
 if [ "$?" = "0" ]; then
     echo "Yay!"
-- 
cgit v1.2.3