6 files changed, 0 insertions, 103 deletions
diff --git a/test/004-SignalTest2/expected.txt b/test/004-SignalTest2/expected.txt
deleted file mode 100644
index 6a3072c..0000000
--- a/test/004-SignalTest2/expected.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-init signal test
-Caught NullPointerException
-signal caught
-Signal test OK
diff --git a/test/004-SignalTest2/info.txt b/test/004-SignalTest2/info.txt
deleted file mode 100644
index 00b0d9a..0000000
--- a/test/004-SignalTest2/info.txt
+++ /dev/null
@@ -1 +0,0 @@
-Imported from oat tests.
diff --git a/test/004-SignalTest2/signaltest.cc b/test/004-SignalTest2/signaltest.cc
deleted file mode 100644
index 4d0ee11..0000000
--- a/test/004-SignalTest2/signaltest.cc
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- */
-
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include "jni.h"
-
-#include <sys/ucontext.h>
-
-#if defined(__APPLE__)
-#define sighandler_t sig_t
-#endif
-
-static int signal_count;
-static const int kMaxSignal = 2;
-
-static void signalhandler(int sig) {
-  printf("signal caught\n");
-  ++signal_count;
-  if (signal_count > kMaxSignal) {
-     printf("too many signals\n");
-     abort();
-  }
-  printf("Signal test OK\n");
-  exit(0);
-}
-
-sighandler_t oldsignal;
-
-extern "C" JNIEXPORT void JNICALL Java_Main_initSignalTest2(JNIEnv*, jclass) {
-  oldsignal = signal(SIGSEGV, reinterpret_cast<sighandler_t>(signalhandler));
-}
-
-// Prevent the compiler being a smart-alec and optimizing out the assignment
-// to nullptr.
-char *go_away_compiler2 = nullptr;
-
-extern "C" JNIEXPORT void JNICALL Java_Main_testSignal2(JNIEnv*, jclass) {
-  *go_away_compiler2 = 'a';
-}
-
diff --git a/test/004-SignalTest2/src/Main.java b/test/004-SignalTest2/src/Main.java
deleted file mode 100644
index 1537091..0000000
--- a/test/004-SignalTest2/src/Main.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.
- */
-
-public class Main {
-    private static native void initSignalTest2();
-    private static native void testSignal2();
-
-    public static void main(String[] args) {
-        System.loadLibrary("arttest");
-
-        System.out.println("init signal test");
-        initSignalTest2();
-        try {
-            Object o = null;
-            int hash = o.hashCode();
-
-            // Should never get here.
-            System.out.println("hash: " + hash);
-            throw new AssertionError();
-        } catch (NullPointerException e) {
-            System.out.println("Caught NullPointerException");
-        }
-        // Test that a signal in native code works.
-        testSignal2();
-    }
-}
diff --git a/test/Android.libarttest.mk b/test/Android.libarttest.mk
index 1054203..2d139a6 100644
--- a/test/Android.libarttest.mk
+++ b/test/Android.libarttest.mk
@@ -21,7 +21,6 @@ include art/build/Android.common_build.mk
 LIBARTTEST_COMMON_SRC_FILES := \
   004-JniTest/jni_test.cc \
   004-SignalTest/signaltest.cc \
-  004-SignalTest2/signaltest.cc \
   004-ReferenceMap/stack_walk_refmap_jni.cc \
   004-StackWalk/stack_walk_jni.cc \
   004-UnsafeTest/unsafe_test.cc \
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk
index 0b6b27a..e4ee4a7 100644
--- a/test/Android.run-test.mk
+++ b/test/Android.run-test.mk
@@ -189,7 +189,6 @@ TEST_ART_BROKEN_NO_PREBUILD_TESTS :=
 # Tests that are broken with tracing.
 TEST_ART_BROKEN_TRACE_RUN_TESTS := \
   004-SignalTest \
-  004-SignalTest2 \
   018-stack-overflow \
   097-duplicate-method \
   107-int-math2