diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-10-23 10:29:33 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-10-23 10:30:30 +0100 |
| commit | f1fd898fa05aa864475227245659d58e71c05226 (patch) | |
| tree | 7ee2775c32536466f63e18123cee2a20c08300c1 /test/800-smali | |
| parent | b08f4dcf90215ed49e0b796ab3e609bd605be8ba (diff) | |
| download | art-f1fd898fa05aa864475227245659d58e71c05226.zip art-f1fd898fa05aa864475227245659d58e71c05226.tar.gz art-f1fd898fa05aa864475227245659d58e71c05226.tar.bz2 | |
Use the shared smali test infrastructure for 800-smali.
No need for a special build file now.
Change-Id: I7f6813553548b48fb5f54640506d1a361d9db3c1
Diffstat (limited to 'test/800-smali')
| -rw-r--r-- | test/800-smali/build | 32 | ||||
| -rw-r--r-- | test/800-smali/info.txt | 2 | ||||
| -rw-r--r-- | test/800-smali/smali/b_17790197.smali (renamed from test/800-smali/src/b_17790197.smali) | 0 |
3 files changed, 1 insertions, 33 deletions
diff --git a/test/800-smali/build b/test/800-smali/build deleted file mode 100644 index 1b5a4e3..0000000 --- a/test/800-smali/build +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2014 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Stop if something fails. -set -e - -# Compile Java classes -mkdir classes -${JAVAC} -d classes `find src -name '*.java'` -${DX} -JXmx256m --debug --dex --output=java_classes.dex classes - -# Compile Smali classes -${SMALI} -JXmx256m --output smali_classes.dex `find src -name '*.smali'` - -# Combine files. -${DXMERGER} classes.dex java_classes.dex smali_classes.dex - -# Zip up output. -zip $TEST_NAME.jar classes.dex diff --git a/test/800-smali/info.txt b/test/800-smali/info.txt index cfcc230..3022962 100644 --- a/test/800-smali/info.txt +++ b/test/800-smali/info.txt @@ -1,4 +1,4 @@ Smali-based tests. -Will compile and run all the smali files in src/ and run the test cases mentioned in src/Main.java. +Will compile and run all the smali files in smali/ and run the test cases mentioned in src/Main.java. Obviously needs to run under Dalvik or ART. diff --git a/test/800-smali/src/b_17790197.smali b/test/800-smali/smali/b_17790197.smali index 7560fcf..7560fcf 100644 --- a/test/800-smali/src/b_17790197.smali +++ b/test/800-smali/smali/b_17790197.smali |