diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/149-suspend-all-stress/check | 18 | ||||
| -rw-r--r-- | test/149-suspend-all-stress/expected.txt | 1 | ||||
| -rw-r--r-- | test/149-suspend-all-stress/src/Main.java | 2 | ||||
| -rw-r--r-- | test/149-suspend-all-stress/suspend_all.cc | 2 |
4 files changed, 20 insertions, 3 deletions
diff --git a/test/149-suspend-all-stress/check b/test/149-suspend-all-stress/check new file mode 100755 index 0000000000..d30b8888ca --- /dev/null +++ b/test/149-suspend-all-stress/check @@ -0,0 +1,18 @@ +#!/bin/bash +# +# Copyright (C) 2016 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. + +# Only compare the last line. +tail -n 1 "$2" | diff --strip-trailing-cr -q "$1" - >/dev/null
\ No newline at end of file diff --git a/test/149-suspend-all-stress/expected.txt b/test/149-suspend-all-stress/expected.txt index f993efcdad..134d8d0b47 100644 --- a/test/149-suspend-all-stress/expected.txt +++ b/test/149-suspend-all-stress/expected.txt @@ -1,2 +1 @@ -JNI_OnLoad called Finishing diff --git a/test/149-suspend-all-stress/src/Main.java b/test/149-suspend-all-stress/src/Main.java index aa94fc9f1a..6a27c4b12d 100644 --- a/test/149-suspend-all-stress/src/Main.java +++ b/test/149-suspend-all-stress/src/Main.java @@ -17,7 +17,7 @@ import java.util.Map; public class Main implements Runnable { - static final int numberOfThreads = 4; + static final int numberOfThreads = 8; public static void main(String[] args) throws Exception { System.loadLibrary(args[0]); diff --git a/test/149-suspend-all-stress/suspend_all.cc b/test/149-suspend-all-stress/suspend_all.cc index de479a50bb..5d2be08daa 100644 --- a/test/149-suspend-all-stress/suspend_all.cc +++ b/test/149-suspend-all-stress/suspend_all.cc @@ -22,7 +22,7 @@ namespace art { extern "C" JNIEXPORT void JNICALL Java_Main_suspendAndResume(JNIEnv*, jclass) { static constexpr size_t kInitialSleepUS = 100 * 1000; // 100ms. - static constexpr size_t kIterations = 500; + static constexpr size_t kIterations = 250; usleep(kInitialSleepUS); // Leave some time for threads to get in here before we start suspending. enum Operation { kOPSuspendAll, |