Revert "Fiddle with 602-deoptimizable for adding debug info when it fails."

This reverts commit a42f4e68fe679d74f07fd31818c55c656aa43c48.

Reason for revert: fails on target.

Change-Id: Ib5119b5aecabe1105d4aab2f127138de3d19c8fc

3 files changed, 3 insertions, 42 deletions

diff --git a/test/602-deoptimizeable/check b/test/602-deoptimizeable/check
deleted file mode 100755
index dceb6b5508..0000000000
--- a/test/602-deoptimizeable/check
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2018 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.
-
-# We ignore the output. The test will exit with an error code if it fails.
diff --git a/test/602-deoptimizeable/run b/test/602-deoptimizeable/run
deleted file mode 100644
index e30133621e..0000000000
--- a/test/602-deoptimizeable/run
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2017 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.
-
-# Add some output to ease debugging.
-"${RUN}" "$@" --runtime-option -verbose:deopt --external-log-tags
diff --git a/test/602-deoptimizeable/src/Main.java b/test/602-deoptimizeable/src/Main.java
index f7ce32a42a..d995923f88 100644
--- a/test/602-deoptimizeable/src/Main.java
+++ b/test/602-deoptimizeable/src/Main.java
@@ -77,7 +77,7 @@ public class Main {
                 assertIsManaged();  // Only single frame is deoptimized.
                 if (res != 79) {
                     System.out.println("Failure 1!");
-                    System.exit(1);
+                    System.exit(0);
                 }
             }
         });
@@ -96,7 +96,7 @@ public class Main {
                     assertIsManaged();  // Only single frame is deoptimized.
                     if (res != 79.3d) {
                         System.out.println("Failure 2!");
-                        System.exit(2);
+                        System.exit(0);
                     }
                 } catch (Exception e) {
                     e.printStackTrace(System.out);
@@ -112,7 +112,7 @@ public class Main {
                 assertIsInterpreted();  // Every deoptimizeable method is deoptimized.
                 if (res != 0.034f) {
                     System.out.println("Failure 3!");
-                    System.exit(3);
+                    System.exit(0);
                 }
             }
         });
@@ -136,11 +136,9 @@ public class Main {
 
         if (!DummyObject.sHashCodeInvoked) {
             System.out.println("hashCode() method not invoked!");
-            System.exit(4);
         }
         if (map.get(new DummyObject(10)) != 100) {
             System.out.println("Wrong hashmap value!");
-            System.exit(5);
         }
         System.out.println("Finishing");
     }
@@ -165,7 +163,6 @@ public class Main {
         }
         if (!caught) {
             System.out.println("Expected exception");
-            System.exit(6);
         }
         assertIsInterpreted();
         return 79;
@@ -191,7 +188,6 @@ public class Main {
         }
         if (!caught) {
             System.out.println("Expected exception");
-            System.exit(7);
         }
         assertIsInterpreted();
         return 79.3d;