Merge "Revert "Sort LocalVariableList""
diff --git a/dx/junit-tests/Android.mk b/dx/junit-tests/Android.mk
index f999c92..b6dc00f 100644
--- a/dx/junit-tests/Android.mk
+++ b/dx/junit-tests/Android.mk
@@ -3,7 +3,7 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-subdir-java-files)
-LOCAL_JAVA_LIBRARIES := dx junit
+LOCAL_JAVA_LIBRARIES := dx junit-host
LOCAL_MODULE_TAGS := tests
LOCAL_MODULE:= dx-tests
include $(BUILD_HOST_JAVA_LIBRARY)
diff --git a/dx/tests/029-unit-Bits/run b/dx/tests/029-unit-Bits/run
index 73c3dd6..c7dbe12 100644
--- a/dx/tests/029-unit-Bits/run
+++ b/dx/tests/029-unit-Bits/run
@@ -18,7 +18,7 @@
progdir=`dirname "${prog}"`
dxjar=$progdir/../framework/dx.jar
dxtestsjar=$progdir/../framework/dx-tests.jar
-junitjar=$progdir/../framework/junit.jar
+junitjar=$progdir/../framework/junit-host.jar
java -cp $dxtestsjar:$dxjar:$junitjar junit.textui.TestRunner com.android.dx.util.BitsTest > unit-out.txt 2>&1
diff --git a/dx/tests/033-unit-IntList/run b/dx/tests/033-unit-IntList/run
index 92071b1..a4d7587 100644
--- a/dx/tests/033-unit-IntList/run
+++ b/dx/tests/033-unit-IntList/run
@@ -18,7 +18,7 @@
progdir=`dirname "${prog}"`
dxjar=$progdir/../framework/dx.jar
dxtestsjar=$progdir/../framework/dx-tests.jar
-junitjar=$progdir/../framework/junit.jar
+junitjar=$progdir/../framework/junit-host.jar
java -cp $dxtestsjar:$dxjar:$junitjar junit.textui.TestRunner com.android.dx.util.IntListTest > unit-out.txt 2>&1
diff --git a/dx/tests/042-dex-ignore-result/run b/dx/tests/042-dex-ignore-result/run
index d035d09..9fe7dc9 100644
--- a/dx/tests/042-dex-ignore-result/run
+++ b/dx/tests/042-dex-ignore-result/run
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --output=blort.dex Blort.class
if [ -r blort.dex ]; then
echo Good!
diff --git a/dx/tests/043-dex-two-classes/run b/dx/tests/043-dex-two-classes/run
index 41d3a0b..87163fd 100644
--- a/dx/tests/043-dex-two-classes/run
+++ b/dx/tests/043-dex-two-classes/run
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java Zorch.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java Zorch.java
dx --debug --verbose --dex --output=blort.dex *.class
if [ -r blort.dex ]; then
echo Good!
diff --git a/dx/tests/044-dex-math-ops/run b/dx/tests/044-dex-math-ops/run
index d8d4273..38d00ba 100644
--- a/dx/tests/044-dex-math-ops/run
+++ b/dx/tests/044-dex-math-ops/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.blort *.class
diff --git a/dx/tests/045-dex-switch-ops/run b/dx/tests/045-dex-switch-ops/run
index 8d1b65e..0776ffe 100644
--- a/dx/tests/045-dex-switch-ops/run
+++ b/dx/tests/045-dex-switch-ops/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.switchTest'*' *.class
diff --git a/dx/tests/046-dex-exceptions/run b/dx/tests/046-dex-exceptions/run
index 8c821b6..d759cdd 100644
--- a/dx/tests/046-dex-exceptions/run
+++ b/dx/tests/046-dex-exceptions/run
@@ -14,5 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --no-optimize --positions=none --no-locals --dump-method=Blort.exTest'*' *.class
diff --git a/dx/tests/047-dex-wide-args/run b/dx/tests/047-dex-wide-args/run
index 52f1131..83c011b 100644
--- a/dx/tests/047-dex-wide-args/run
+++ b/dx/tests/047-dex-wide-args/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' *.class
diff --git a/dx/tests/048-dex-new-array/run b/dx/tests/048-dex-new-array/run
index 9927f1a..095a911 100644
--- a/dx/tests/048-dex-new-array/run
+++ b/dx/tests/048-dex-new-array/run
@@ -14,5 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --positions=none --no-locals --dump-method=Blort.test *.class
diff --git a/dx/tests/049-dex-instanceof/run b/dx/tests/049-dex-instanceof/run
index 7578321..d07f882 100644
--- a/dx/tests/049-dex-instanceof/run
+++ b/dx/tests/049-dex-instanceof/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test *.class
diff --git a/dx/tests/050-dex-checkcast/run b/dx/tests/050-dex-checkcast/run
index 7578321..d07f882 100644
--- a/dx/tests/050-dex-checkcast/run
+++ b/dx/tests/050-dex-checkcast/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test *.class
diff --git a/dx/tests/051-dex-explicit-null/run b/dx/tests/051-dex-explicit-null/run
index 52f1131..83c011b 100644
--- a/dx/tests/051-dex-explicit-null/run
+++ b/dx/tests/051-dex-explicit-null/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' *.class
diff --git a/dx/tests/052-dex-static-var-access/run b/dx/tests/052-dex-static-var-access/run
index 52f1131..83c011b 100644
--- a/dx/tests/052-dex-static-var-access/run
+++ b/dx/tests/052-dex-static-var-access/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' *.class
diff --git a/dx/tests/053-dex-instance-var-access/run b/dx/tests/053-dex-instance-var-access/run
index 52f1131..83c011b 100644
--- a/dx/tests/053-dex-instance-var-access/run
+++ b/dx/tests/053-dex-instance-var-access/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' *.class
diff --git a/dx/tests/054-dex-high16/run b/dx/tests/054-dex-high16/run
index a2c7458..065c42b 100644
--- a/dx/tests/054-dex-high16/run
+++ b/dx/tests/054-dex-high16/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --positions=none --no-locals \
--dump-method=Blort.test'*' *.class
diff --git a/dx/tests/055-dex-explicit-throw/run b/dx/tests/055-dex-explicit-throw/run
index 52f1131..83c011b 100644
--- a/dx/tests/055-dex-explicit-throw/run
+++ b/dx/tests/055-dex-explicit-throw/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' *.class
diff --git a/dx/tests/056-dex-call-interface/run b/dx/tests/056-dex-call-interface/run
index 1076ae1..4d306ae 100644
--- a/dx/tests/056-dex-call-interface/run
+++ b/dx/tests/056-dex-call-interface/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test Blort.class
diff --git a/dx/tests/057-dex-call-virtual/run b/dx/tests/057-dex-call-virtual/run
index 1076ae1..4d306ae 100644
--- a/dx/tests/057-dex-call-virtual/run
+++ b/dx/tests/057-dex-call-virtual/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test Blort.class
diff --git a/dx/tests/058-dex-call-direct/run b/dx/tests/058-dex-call-direct/run
index 1076ae1..4d306ae 100644
--- a/dx/tests/058-dex-call-direct/run
+++ b/dx/tests/058-dex-call-direct/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test Blort.class
diff --git a/dx/tests/059-dex-call-super/run b/dx/tests/059-dex-call-super/run
index e5eb509..f95815a 100644
--- a/dx/tests/059-dex-call-super/run
+++ b/dx/tests/059-dex-call-super/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' Blort.class
diff --git a/dx/tests/060-dex-call-static/run b/dx/tests/060-dex-call-static/run
index 346856c..33c9cd7 100644
--- a/dx/tests/060-dex-call-static/run
+++ b/dx/tests/060-dex-call-static/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --positions=none --no-locals \
--dump-method=Blort.test Blort.class
diff --git a/dx/tests/061-dex-try-catch/run b/dx/tests/061-dex-try-catch/run
index e5eb509..f95815a 100644
--- a/dx/tests/061-dex-try-catch/run
+++ b/dx/tests/061-dex-try-catch/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' Blort.class
diff --git a/dx/tests/062-dex-synch-method/run b/dx/tests/062-dex-synch-method/run
index e5eb509..f95815a 100644
--- a/dx/tests/062-dex-synch-method/run
+++ b/dx/tests/062-dex-synch-method/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' Blort.class
diff --git a/dx/tests/063-dex-empty-switch/run b/dx/tests/063-dex-empty-switch/run
index e5eb509..f95815a 100644
--- a/dx/tests/063-dex-empty-switch/run
+++ b/dx/tests/063-dex-empty-switch/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' Blort.class
diff --git a/dx/tests/064-dex-array-access/run b/dx/tests/064-dex-array-access/run
index e5eb509..f95815a 100644
--- a/dx/tests/064-dex-array-access/run
+++ b/dx/tests/064-dex-array-access/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' Blort.class
diff --git a/dx/tests/065-dex-new-array/run b/dx/tests/065-dex-new-array/run
index e5eb509..f95815a 100644
--- a/dx/tests/065-dex-new-array/run
+++ b/dx/tests/065-dex-new-array/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' Blort.class
diff --git a/dx/tests/066-dex-try-catch-rethrow/run b/dx/tests/066-dex-try-catch-rethrow/run
index e5eb509..f95815a 100644
--- a/dx/tests/066-dex-try-catch-rethrow/run
+++ b/dx/tests/066-dex-try-catch-rethrow/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' Blort.class
diff --git a/dx/tests/067-dex-switch-and-try/run b/dx/tests/067-dex-switch-and-try/run
index e5eb509..f95815a 100644
--- a/dx/tests/067-dex-switch-and-try/run
+++ b/dx/tests/067-dex-switch-and-try/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' Blort.class
diff --git a/dx/tests/068-dex-infinite-loop/run b/dx/tests/068-dex-infinite-loop/run
index 3fe95cc..b2d93d0 100644
--- a/dx/tests/068-dex-infinite-loop/run
+++ b/dx/tests/068-dex-infinite-loop/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --positions=none --no-locals \
--dump-method=Blort.test'*' Blort.class
diff --git a/dx/tests/069-dex-source-position/run b/dx/tests/069-dex-source-position/run
index 98c2630..fe448a2 100644
--- a/dx/tests/069-dex-source-position/run
+++ b/dx/tests/069-dex-source-position/run
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' Blort.class
dx --debug --dex --no-optimize --positions=important --no-locals \
diff --git a/dx/tests/070-dex-multianewarray/run b/dx/tests/070-dex-multianewarray/run
index e5eb509..f95815a 100644
--- a/dx/tests/070-dex-multianewarray/run
+++ b/dx/tests/070-dex-multianewarray/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' Blort.class
diff --git a/dx/tests/072-dex-switch-edge-cases/run b/dx/tests/072-dex-switch-edge-cases/run
index 52f1131..83c011b 100644
--- a/dx/tests/072-dex-switch-edge-cases/run
+++ b/dx/tests/072-dex-switch-edge-cases/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' *.class
diff --git a/dx/tests/073-dex-null-array-refs/run b/dx/tests/073-dex-null-array-refs/run
index 52f1131..83c011b 100644
--- a/dx/tests/073-dex-null-array-refs/run
+++ b/dx/tests/073-dex-null-array-refs/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' *.class
diff --git a/dx/tests/074-dex-form35c-edge-case/run b/dx/tests/074-dex-form35c-edge-case/run
index 7578321..d07f882 100644
--- a/dx/tests/074-dex-form35c-edge-case/run
+++ b/dx/tests/074-dex-form35c-edge-case/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test *.class
diff --git a/dx/tests/075-dex-cat2-value-merge/run b/dx/tests/075-dex-cat2-value-merge/run
index 7578321..d07f882 100644
--- a/dx/tests/075-dex-cat2-value-merge/run
+++ b/dx/tests/075-dex-cat2-value-merge/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test *.class
diff --git a/dx/tests/076-dex-synch-and-stack/run b/dx/tests/076-dex-synch-and-stack/run
index 7578321..d07f882 100644
--- a/dx/tests/076-dex-synch-and-stack/run
+++ b/dx/tests/076-dex-synch-and-stack/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test *.class
diff --git a/dx/tests/077-dex-code-alignment/run b/dx/tests/077-dex-code-alignment/run
index f311dbf..e5e44a7 100644
--- a/dx/tests/077-dex-code-alignment/run
+++ b/dx/tests/077-dex-code-alignment/run
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
# The awk script below attempts to filter out everything but the
# essentials: That methods justReturn1() and justReturn2() contain
diff --git a/dx/tests/078-dex-local-variable-table/run b/dx/tests/078-dex-local-variable-table/run
index 426f1e6..b2cec4c 100644
--- a/dx/tests/078-dex-local-variable-table/run
+++ b/dx/tests/078-dex-local-variable-table/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -g -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -g -d . Blort.java
dx --debug --dex --no-optimize --positions=none --dump-method=Blort.test'*' \
*.class
diff --git a/dx/tests/079-dex-local-variable-renumbering/run b/dx/tests/079-dex-local-variable-renumbering/run
index 426f1e6..b2cec4c 100644
--- a/dx/tests/079-dex-local-variable-renumbering/run
+++ b/dx/tests/079-dex-local-variable-renumbering/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -g -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -g -d . Blort.java
dx --debug --dex --no-optimize --positions=none --dump-method=Blort.test'*' \
*.class
diff --git a/dx/tests/080-dex-exception-tables/run b/dx/tests/080-dex-exception-tables/run
index 3acfcfd..bb2308d 100644
--- a/dx/tests/080-dex-exception-tables/run
+++ b/dx/tests/080-dex-exception-tables/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -g -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -g -d . Blort.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' *.class
diff --git a/dx/tests/081-dex-throws-list/run b/dx/tests/081-dex-throws-list/run
index 2236cf2..8157dd4 100644
--- a/dx/tests/081-dex-throws-list/run
+++ b/dx/tests/081-dex-throws-list/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -g -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -g -d . Blort.java
dx --debug --dex --positions=none --no-locals --dump-method=Blort.test'*' \
*.class | grep 'Blort\|Throws'
diff --git a/dx/tests/082-dex-throws-list-sharing/run b/dx/tests/082-dex-throws-list-sharing/run
index 6eed9bd..075a8dc 100644
--- a/dx/tests/082-dex-throws-list-sharing/run
+++ b/dx/tests/082-dex-throws-list-sharing/run
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -g -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -g -d . Blort.java
dx --debug --dex --positions=none --no-locals --dump-to=- --dump-width=200 \
*.class | grep '^[0-9a-f].*value.*Exception' \
| sed -e 's/^[^{]*{//g' -e 's/}//g'
diff --git a/dx/tests/083-ssa-phi-placement/run b/dx/tests/083-ssa-phi-placement/run
index ddcb597..4c89ca8 100644
--- a/dx/tests/083-ssa-phi-placement/run
+++ b/dx/tests/083-ssa-phi-placement/run
@@ -14,5 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --dump --ssa-blocks --ssa-step=phi-placement Blort.class
diff --git a/dx/tests/084-dex-high-register-moves/run b/dx/tests/084-dex-high-register-moves/run
index 3acfcfd..bb2308d 100644
--- a/dx/tests/084-dex-high-register-moves/run
+++ b/dx/tests/084-dex-high-register-moves/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -g -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -g -d . Blort.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' *.class
diff --git a/dx/tests/086-ssa-edge-split/run b/dx/tests/086-ssa-edge-split/run
index 914deb1..2510250 100644
--- a/dx/tests/086-ssa-edge-split/run
+++ b/dx/tests/086-ssa-edge-split/run
@@ -14,5 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --dump --width=1000 --ssa-blocks --ssa-step=edge-split Blort.class
diff --git a/dx/tests/087-ssa-local-vars/run b/dx/tests/087-ssa-local-vars/run
index ae97c15..3a621e3 100644
--- a/dx/tests/087-ssa-local-vars/run
+++ b/dx/tests/087-ssa-local-vars/run
@@ -14,5 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -g -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -g -d . Blort.java
dx --dump --ssa-blocks Blort.class
diff --git a/dx/tests/088-ssa-combine-blocks/run b/dx/tests/088-ssa-combine-blocks/run
index 29fe559..eb75c95 100644
--- a/dx/tests/088-ssa-combine-blocks/run
+++ b/dx/tests/088-ssa-combine-blocks/run
@@ -14,5 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java
dx --dump --width=1000 --optimize --rop-blocks Blort.class
diff --git a/dx/tests/089-dex-define-object/run b/dx/tests/089-dex-define-object/run
index e53e147..89f8087 100644
--- a/dx/tests/089-dex-define-object/run
+++ b/dx/tests/089-dex-define-object/run
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --core-library --output=blort.dex */*/*.class
if [ -r blort.dex ]; then
echo Good!
diff --git a/dx/tests/090-dex-unify-arrays/run b/dx/tests/090-dex-unify-arrays/run
index 47b709c..851b273 100644
--- a/dx/tests/090-dex-unify-arrays/run
+++ b/dx/tests/090-dex-unify-arrays/run
@@ -14,6 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test'*' Blort.class
diff --git a/dx/tests/091-ssa-const-collector/run b/dx/tests/091-ssa-const-collector/run
index aa37784..80c776e 100644
--- a/dx/tests/091-ssa-const-collector/run
+++ b/dx/tests/091-ssa-const-collector/run
@@ -14,5 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -g -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -g -d . Blort.java
dx --dump --optimize --rop-blocks Blort.class
diff --git a/dx/tests/092-ssa-cfg-edge-cases/run b/dx/tests/092-ssa-cfg-edge-cases/run
index 090a4d7..93e952a 100644
--- a/dx/tests/092-ssa-cfg-edge-cases/run
+++ b/dx/tests/092-ssa-cfg-edge-cases/run
@@ -14,5 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -g -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -g -d . Blort.java
dx --dump --optimize --rop-blocks Blort.class
diff --git a/dx/tests/093-ssa-invoke-range/run b/dx/tests/093-ssa-invoke-range/run
index aa37784..80c776e 100644
--- a/dx/tests/093-ssa-invoke-range/run
+++ b/dx/tests/093-ssa-invoke-range/run
@@ -14,5 +14,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -g -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -g -d . Blort.java
dx --dump --optimize --rop-blocks Blort.class
diff --git a/dx/tests/095-dex-const-string-jumbo/run b/dx/tests/095-dex-const-string-jumbo/run
index a1c7365..68fd6db 100644
--- a/dx/tests/095-dex-const-string-jumbo/run
+++ b/dx/tests/095-dex-const-string-jumbo/run
@@ -36,6 +36,6 @@
printf("}\n") > fileName;
}'
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Blort.test *.class
diff --git a/dx/tests/096-dex-giant-catch/run b/dx/tests/096-dex-giant-catch/run
index c81d04c..67307e9 100644
--- a/dx/tests/096-dex-giant-catch/run
+++ b/dx/tests/096-dex-giant-catch/run
@@ -35,6 +35,6 @@
printf("}\n") > fileName;
}'
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-method=Zorch.test Zorch.class | grep 'try\|catch'
diff --git a/dx/tests/097-dex-branch-offset-zero/run b/dx/tests/097-dex-branch-offset-zero/run
index 34539eb..240ed8b 100644
--- a/dx/tests/097-dex-branch-offset-zero/run
+++ b/dx/tests/097-dex-branch-offset-zero/run
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -g -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -g -d . Blort.java
dx --debug --dex --positions=none --no-locals --dump-method=Blort.test'*' \
*.class | grep '[-+][0-9]' | grep -v 'goto/32.*+00*$' | grep '// +00*$'
diff --git a/dx/tests/099-dex-core-library-error/run b/dx/tests/099-dex-core-library-error/run
index f063266..3011056 100644
--- a/dx/tests/099-dex-core-library-error/run
+++ b/dx/tests/099-dex-core-library-error/run
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --output=blort.dex java/blort/Blort.class >/dev/null 2>&1
echo "exit code: $?"
diff --git a/dx/tests/108-string-annotation/run b/dx/tests/108-string-annotation/run
index d89053f..08a1574 100644
--- a/dx/tests/108-string-annotation/run
+++ b/dx/tests/108-string-annotation/run
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . Blort.java Fizmo.java Frotz.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . Blort.java Fizmo.java Frotz.java
dx --debug --dex --no-optimize --positions=none --no-locals \
--dump-to=- *.class | cut -f 2 -d '|' | awk '
diff --git a/dx/tests/110-dex-preserve-this/run b/dx/tests/110-dex-preserve-this/run
index 9770237..43a8d87 100644
--- a/dx/tests/110-dex-preserve-this/run
+++ b/dx/tests/110-dex-preserve-this/run
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -g -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -g -d . Blort.java
dx --debug --dex --positions=none \
--dump-to=dump.txt --dump-method="Blort.test" *.class
diff --git a/dx/tests/111-use-null-as-array/run b/dx/tests/111-use-null-as-array/run
index ee89d3e..04e53dd 100644
--- a/dx/tests/111-use-null-as-array/run
+++ b/dx/tests/111-use-null-as-array/run
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -g -d . Blort.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -g -d . Blort.java
dx --debug --dex --positions=none --no-locals \
--dump-to=- --dump-method="Blort.test*" Blort.class
diff --git a/dx/tests/115-merge/run b/dx/tests/115-merge/run
index 517800d..0601dc3 100644
--- a/dx/tests/115-merge/run
+++ b/dx/tests/115-merge/run
@@ -18,7 +18,7 @@
prog=`which dx`
progdir=`dirname "${prog}"`
dxjar=$progdir/../framework/dx.jar
-junitjar=$progdir/../framework/junit.jar
+junitjar=$progdir/../framework/junit-host.jar
junitdex=$progdir/../framework/junit-hostdex.jar
javac -cp $dxjar:$junitjar `find . -name "*.java"`
diff --git a/dx/tests/116-leb128/run b/dx/tests/116-leb128/run
index 53a7ee3..e325ad5 100644
--- a/dx/tests/116-leb128/run
+++ b/dx/tests/116-leb128/run
@@ -18,7 +18,7 @@
prog=`which dx`
progdir=`dirname "${prog}"`
dxjar=$progdir/../framework/dx.jar
-junitjar=$progdir/../framework/junit.jar
+junitjar=$progdir/../framework/junit-host.jar
javac -cp $dxjar:$junitjar `find . -name "*.java"`
java -classpath $dxjar:$junitjar:. junit.textui.TestRunner com.android.dx.util.Leb128UtilsTest > unit-out.txt 2>&1
diff --git a/dx/tests/117-modified-utf8/run b/dx/tests/117-modified-utf8/run
index 7199349..304aa88 100644
--- a/dx/tests/117-modified-utf8/run
+++ b/dx/tests/117-modified-utf8/run
@@ -18,7 +18,7 @@
prog=`which dx`
progdir=`dirname "${prog}"`
dxjar=$progdir/../framework/dx.jar
-junitjar=$progdir/../framework/junit.jar
+junitjar=$progdir/../framework/junit-host.jar
javac -cp $dxjar:$junitjar `find . -name "*.java"`
java -classpath $dxjar:$junitjar:. junit.textui.TestRunner com.android.dx.util.Mutf8Test > unit-out.txt 2>&1
diff --git a/dx/tests/118-find-usages/run b/dx/tests/118-find-usages/run
index 22f38cc..a8a02bb 100644
--- a/dx/tests/118-find-usages/run
+++ b/dx/tests/118-find-usages/run
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --output=foo.dex --dex *.class
echo "StreamTokenizer.nval"
diff --git a/dx/tests/119-merge-conflict/run b/dx/tests/119-merge-conflict/run
index cac754e..c7f425d 100644
--- a/dx/tests/119-merge-conflict/run
+++ b/dx/tests/119-merge-conflict/run
@@ -18,7 +18,7 @@
prog=`which dx`
progdir=`dirname "${prog}"`
dxjar=$progdir/../framework/dx.jar
-junitjar=$progdir/../framework/junit.jar
+junitjar=$progdir/../framework/junit-host.jar
junitdex=$progdir/../framework/junit-hostdex.jar
javac -cp $dxjar:$junitjar `find . -name "*.java"`
diff --git a/dx/tests/121-sccp/run b/dx/tests/121-sccp/run
index 4f65461..0ff63a2 100644
--- a/dx/tests/121-sccp/run
+++ b/dx/tests/121-sccp/run
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --dump-method=Blort.test'*' Blort.class
-$JAVAC -g -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -g -d . *.java
dx --debug --dex --dump-method=Blort.test'*' Blort.class
diff --git a/dx/tests/122-switch-with-high-register/run b/dx/tests/122-switch-with-high-register/run
index 2b6eb66..fd7c807 100644
--- a/dx/tests/122-switch-with-high-register/run
+++ b/dx/tests/122-switch-with-high-register/run
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-$JAVAC -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -d . *.java
dx --debug --dex --dump-method=Blort.switchWithHighRegister Blort.class
-$JAVAC -g -d . *.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -g -d . *.java
dx --debug --dex --dump-method=Blort.switchWithHighRegister Blort.class
diff --git a/dx/tests/127-merge-stress/run b/dx/tests/127-merge-stress/run
index d66beb4..0458337 100755
--- a/dx/tests/127-merge-stress/run
+++ b/dx/tests/127-merge-stress/run
@@ -34,6 +34,6 @@
done
# Compile and run java merging test
-$JAVAC -cp $dxjar -d . com/android/dx/merge/MergeTest.java
+$JAVAC -Xlint:-options -source 1.7 -target 1.7 -cp $dxjar -d . com/android/dx/merge/MergeTest.java
java -cp .:$dxjar com.android.dx.merge.MergeTest $validdexes >/dev/null
