diff options
| author | Andreas Gampe <agampe@google.com> | 2015-11-07 02:35:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-07 02:35:25 +0000 |
| commit | 68fd0c98394da92ed9d3e3f1d6e780051d209818 (patch) | |
| tree | 17f08ac73a9d3e616871a1b7c43bd9946e400e41 | |
| parent | e32ce4fbbadd65ef3d3dc98c3fd8045744603617 (diff) | |
| parent | a16d31787a6413d3c637ea29903a2ff53214d3f4 (diff) | |
| download | dalvik-68fd0c98394da92ed9d3e3f1d6e780051d209818.tar.gz | |
Merge "DX: Fix tests 029, 033, 116, 117" am: 474556575e
am: a16d31787a
* commit 'a16d31787a6413d3c637ea29903a2ff53214d3f4':
DX: Fix tests 029, 033, 116, 117
| -rw-r--r-- | dx/tests/029-unit-Bits/run | 8 | ||||
| -rw-r--r-- | dx/tests/033-unit-IntList/run | 8 | ||||
| -rw-r--r-- | dx/tests/116-leb128/run | 5 | ||||
| -rw-r--r-- | 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!" |