Remove need for check script in test 1937
This lets us include it in CTS
Test: ./test/run-test --host 1937
Bug: 73252141
Change-Id: I2c35f51e71cd3c835f3ef1fe41083da0eaa0f7a5
diff --git a/test/1937-transform-soft-fail/check b/test/1937-transform-soft-fail/check
deleted file mode 100755
index 7cee530..0000000
--- a/test/1937-transform-soft-fail/check
+++ /dev/null
@@ -1,19 +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.
-
-sed -e 's/:.*$//' "$2" > "$2.tmp"
-
-./default-check "$1" "$2.tmp"
diff --git a/test/1937-transform-soft-fail/src/art/Test1937.java b/test/1937-transform-soft-fail/src/art/Test1937.java
index 7255a5e..19fa24e 100644
--- a/test/1937-transform-soft-fail/src/art/Test1937.java
+++ b/test/1937-transform-soft-fail/src/art/Test1937.java
@@ -19,6 +19,8 @@
import java.util.Base64;
public class Test1937 {
+ private static final boolean PRINT_MESSAGE = false;
+
static class Transform {
public void sayHi() {
// Use lower 'h' to make sure the string will have a different string id
@@ -83,7 +85,10 @@
try {
t.sayHi();
} catch (Throwable e) {
- System.out.println("Caught exception " + e.getClass().getName() + ": " + e.getMessage());
+ System.out.println("Caught exception " + e.getClass().getName());
+ if (PRINT_MESSAGE) {
+ System.out.println("Message: " + e.getMessage());
+ }
}
}
}