diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-14 20:48:50 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-14 20:48:50 +0000 |
| commit | 01b8a993bb58adac8329ff6b5a6240f716d4096a (patch) | |
| tree | cd3cd113398139096f6e8b1942b7665f4129a32b /native_client_sdk | |
| parent | 4e3840589491f818018b06a136ac8b2998e4f0d2 (diff) | |
| download | chromium_src-01b8a993bb58adac8329ff6b5a6240f716d4096a.zip chromium_src-01b8a993bb58adac8329ff6b5a6240f716d4096a.tar.gz chromium_src-01b8a993bb58adac8329ff6b5a6240f716d4096a.tar.bz2 | |
[NaCl SDK] Fix bug in test_projects when deciding if a test is disabled.
BUG=none
R=sbc@chromium.org
Review URL: https://codereview.chromium.org/23007010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@217636 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/test_projects.py | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/native_client_sdk/src/build_tools/test_projects.py b/native_client_sdk/src/build_tools/test_projects.py index a742923..7abd8e0 100755 --- a/native_client_sdk/src/build_tools/test_projects.py +++ b/native_client_sdk/src/build_tools/test_projects.py @@ -181,10 +181,17 @@ def GetTestName(desc, toolchain, config): def IsTestDisabled(desc, toolchain, config): def AsList(value): - if type(value) in (list, tuple): - return (value,) + if type(value) not in (list, tuple): + return [value] return value + def TestMatchesDisabled(test_values, disabled_test): + for key in test_values: + if key in disabled_test: + if test_values[key] not in AsList(disabled_test[key]): + return False + return True + test_values = { 'name': desc['NAME'], 'toolchain': toolchain, @@ -193,10 +200,8 @@ def IsTestDisabled(desc, toolchain, config): } for disabled_test in DISABLED_TESTS: - for key in test_values: - if key in disabled_test: - if test_values[key] in AsList(disabled_test[key]): - return True + if TestMatchesDisabled(test_values, disabled_test): + return True return False |