From 8e100c12013af2d9d91848d03f66021fe8a986d6 Mon Sep 17 00:00:00 2001
From: "binji@chromium.org"
<binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 3 Oct 2012 20:28:00 +0000
Subject: [NaCl SDK] Fix PRESUBMIT.py on Windows.
The blacklist on the test directory didn't check for Windows paths.
BUG=none
R=sbc@chromium.org
TBR=binji@chromium.org
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11048024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159965 0039d316-1c4b-4281-b951-d872f2087c98
---
native_client_sdk/PRESUBMIT.py | 4 +---
native_client_sdk/src/build_tools/build_sdk.py | 3 +++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/native_client_sdk/PRESUBMIT.py b/native_client_sdk/PRESUBMIT.py
index c6e613d..5faf369 100644
--- a/native_client_sdk/PRESUBMIT.py
+++ b/native_client_sdk/PRESUBMIT.py
@@ -18,9 +18,7 @@ def CommonChecks(input_api, output_api):
'E1103', # subprocess.communicate() generates these :(
'R0201', # method could be function (doesn't reference self)
]
- black_list = [r'src/build_tools/tests/.*',
- r'src/site_scons/.*',
- ]
+ black_list = [r'src[\\\/]build_tools[\\\/]tests[\\\/].*']
canned = input_api.canned_checks
output.extend(canned.RunPylint(input_api, output_api, black_list=black_list,
disabled_warnings=disabled_warnings))
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 6dc346a..14890bf 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -236,6 +236,9 @@ def BuildStepUntarToolchains(pepperdir, platform, arch, toolchains):
buildbot_common.MakeDir(compiler_dir)
buildbot_common.CopyFile(wrapper, compiler_dir)
+ # Module 'os' has no 'symlink' member (on Windows).
+ # pylint: disable=E1101
+
os.symlink('compiler-wrapper.py',
os.path.join(compiler_dir, 'i686-nacl-g++'))
os.symlink('compiler-wrapper.py',
--
cgit v1.1