summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sorin Basca <sorinbasca@google.com> 2022-03-12 10:02:29 +0000
committer Sorin Basca <sorinbasca@google.com> 2022-03-12 10:02:29 +0000
commit7107a3e74e29f3da151a556286fb0fe7ecafa2ca (patch)
tree4d9e6555d0a4764d4be3456b07f2665b4e336b41
parent18049481c675929cc13c6fbdba25de406e6e616f (diff)
Remove early stop log for VarHandle concurrency test
Bug: 208156527 Test: art/test/testrunner/testrunner.py -t 719-varhandle-concurrency Change-Id: I3c31bad238cb92e76158b183da471d4c8386c259
-rwxr-xr-xtest/719-varhandle-concurrency/check27
-rw-r--r--test/719-varhandle-concurrency/src/Main.java1
2 files changed, 0 insertions, 28 deletions
diff --git a/test/719-varhandle-concurrency/check b/test/719-varhandle-concurrency/check
deleted file mode 100755
index 4adf349fa5..0000000000
--- a/test/719-varhandle-concurrency/check
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2022 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.
-
-# Inputs:
-# $1: Test's expected standard output
-# $2: Test's actual standard output
-# $3: Test's expected standard error
-# $4: Test's actual standard error
-
-# Test failures are reported through stderr. If a test is running for too long,
-# then it would stop early and report on stdout the number of iterations it ran.
-# Therefore, don't diff stdout with the expected one.
-
-diff --strip-trailing-cr -q "$3" "$4" >/dev/null
diff --git a/test/719-varhandle-concurrency/src/Main.java b/test/719-varhandle-concurrency/src/Main.java
index a4e1ecd2a5..1c2135bf7d 100644
--- a/test/719-varhandle-concurrency/src/Main.java
+++ b/test/719-varhandle-concurrency/src/Main.java
@@ -62,7 +62,6 @@ public class Main {
concurrentProcessingTestIteration(factory, i, testName);
Duration now = Duration.ofNanos(System.nanoTime());
if (0 < now.compareTo(endTs)) {
- System.out.println("Test timed out after " + i + " iterations");
break;
}
}