[packages/chromium-browser/dev-27] update test compilet patch from https://codereview.chromium.org/14813020/
glen
glen at pld-linux.org
Sat May 11 11:08:35 CEST 2013
commit 2e3573515b23ac09a20fcdec335374dd916824b3
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sat May 11 12:07:57 2013 +0300
update test compilet patch from https://codereview.chromium.org/14813020/
system-ffmpeg.patch | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
---
diff --git a/system-ffmpeg.patch b/system-ffmpeg.patch
index 0bf19a1..d9358f5 100644
--- a/system-ffmpeg.patch
+++ b/system-ffmpeg.patch
@@ -1,10 +1,25 @@
---- chromium-browser-27.0.1453.3/tools/compile_test/compile_test.py~ 2013-03-27 03:14:02.000000000 +0200
-+++ chromium-browser-27.0.1453.3/tools/compile_test/compile_test.py 2013-03-27 23:48:09.802791538 +0200
-@@ -40,6 +40,7 @@
+Index: tools/compile_test/compile_test.py
+diff --git a/tools/compile_test/compile_test.py b/tools/compile_test/compile_test.py
+index 79371a1fd05d2e03e098340527fc897faadad54c..bbda4abfe54f327aabede26f400bebd5e1376d82 100755
+--- a/tools/compile_test/compile_test.py
++++ b/tools/compile_test/compile_test.py
+@@ -30,7 +30,9 @@ def DoMain(argv):
+ if not options.code:
+ parser.error('Missing required --code switch.')
+
+- cxx = os.environ.get('CXX', 'g++')
++ # The environment variable might expand to a string with spaces,
++ # e.g. "ccache g++". Convert it to a list suitable for argv.
++ cxx = os.environ.get('CXX', 'g++').split()
+
+ tmpdir = tempfile.mkdtemp()
+ try:
+@@ -41,7 +41,7 @@
+
o_path = os.path.join(tmpdir, 'test.o')
- cxx_popen = subprocess.Popen([cxx, cxx_path, '-o', o_path, '-c'],
-+ shell=True,
+- cxx_popen = subprocess.Popen([cxx, cxx_path, '-o', o_path, '-c'],
++ cxx_popen = subprocess.Popen(cxx + [cxx_path, '-o', o_path, '-c'],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
cxx_stdout, cxx_stderr = cxx_popen.communicate()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/2e3573515b23ac09a20fcdec335374dd916824b3
More information about the pld-cvs-commit
mailing list