diff options
author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-03-12 11:09:13 +0100 |
---|---|---|
committer | Jean-Marie Henaff <jmhenaff@google.com> | 2015-03-12 11:15:31 +0100 |
commit | b4483b580e7704ce4676b5438f7a5280adbb7f6e (patch) | |
tree | 7fb738cf29f2ed3abb6e6f4e2c780e3be475e962 /jack-tests/src/com/android/jack | |
parent | b7c37a56dc717023a4646072ca98649856cdf577 (diff) | |
download | toolchain_jack-b4483b580e7704ce4676b5438f7a5280adbb7f6e.tar.gz toolchain_jack-b4483b580e7704ce4676b5438f7a5280adbb7f6e.tar.bz2 toolchain_jack-b4483b580e7704ce4676b5438f7a5280adbb7f6e.zip |
Support spaces in runtime.list property of test configuration
Change-Id: I19d1c47d79306646d6352a51762656982e30d117
Diffstat (limited to 'jack-tests/src/com/android/jack')
-rw-r--r-- | jack-tests/src/com/android/jack/test/toolchain/AbstractTestTools.java | 8 |
1 files changed, 6 insertions, 2 deletions
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<String, File> runtimeEnvironmentLocations = new HashMap<String, File>(); + @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<RuntimeRunner> result = new ArrayList<RuntimeRunner>(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)); } } |