From b4483b580e7704ce4676b5438f7a5280adbb7f6e Mon Sep 17 00:00:00 2001 From: Jean-Marie Henaff Date: Thu, 12 Mar 2015 11:09:13 +0100 Subject: Support spaces in runtime.list property of test configuration Change-Id: I19d1c47d79306646d6352a51762656982e30d117 --- .../src/com/android/jack/test/toolchain/AbstractTestTools.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'jack-tests/src/com/android/jack') diff --git a/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java b/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java index 225e5aa6..58b1547d 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java +++ b/jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java @@ -16,6 +16,7 @@ package com.android.jack.test.toolchain; +import com.google.common.base.Splitter; import com.google.common.io.Files; import com.android.jack.Sourcelist; @@ -80,6 +81,10 @@ public abstract class AbstractTestTools { @Nonnull private static final Map runtimeEnvironmentLocations = new HashMap(); + @Nonnull + private static final Splitter listSplitter = + Splitter.on(PROPERTY_VALUE_SEPARATOR).trimResults().omitEmptyStrings(); + static { @@ -555,8 +560,7 @@ public abstract class AbstractTestTools { throws SecurityException, IllegalArgumentException, RuntimeRunnerException { List result = new ArrayList(0); if (runtimeList != null) { - String[] rtList = runtimeList.split(PROPERTY_VALUE_SEPARATOR); - for (String rtName : rtList) { + for (String rtName : listSplitter.split(runtimeList)) { result.add(RuntimeRunnerFactory.create(rtName)); } } -- cgit v1.2.3