From 1211391ccce2e0ea7fd6d510212a0233d655a6b7 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Wed, 2 Mar 2022 15:32:18 +0000 Subject: Avoid throwing when --exclude-filters are given Bug: 213284403 Fix: 229204853 Test: Observed the new log when running the command cts-tradefed run commandAndExit cts -m CtsIcu4cTestCases --module-arg CtsIcu4cTestCases:set-option:exclude-filter:cintltst.tsutil.ucptrietest.TrieTestSet1 Change-Id: Icbb8f05429d5fca8a8d19bc9e059b3fdbfa042e2 Merged-In:: Icbb8f05429d5fca8a8d19bc9e059b3fdbfa042e2 (cherry picked from commit c9947d8bc8c0dd85818319b102dacf416ec9460e) --- .../src/com/android/icu/tradefed/testtype/ICU4CTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/testing/test_harness/src/com/android/icu/tradefed/testtype/ICU4CTest.java b/tools/testing/test_harness/src/com/android/icu/tradefed/testtype/ICU4CTest.java index 5b2c302c8..387c34b4e 100644 --- a/tools/testing/test_harness/src/com/android/icu/tradefed/testtype/ICU4CTest.java +++ b/tools/testing/test_harness/src/com/android/icu/tradefed/testtype/ICU4CTest.java @@ -39,6 +39,7 @@ import com.google.common.annotations.VisibleForTesting; import java.io.File; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.LinkedHashSet; import java.util.List; import java.util.LinkedList; @@ -398,7 +399,9 @@ public class ICU4CTest testPath, mDevice.getSerialNumber())); } if (!mExcludeFilters.isEmpty()) { - throw new IllegalStateException("ICU4C test suites do not support exclude filters"); + // Log a message instead of throwing IllegalStateException. http://b/213284403 + CLog.w("ICU4C test suites do not support exclude filters: %s", + Arrays.toString(mExcludeFilters.toArray())); } runTest(mDevice, testPath, listener); } -- cgit v1.2.3