Add m-esr52 at 52.6.0

4 files changed, 82 insertions, 0 deletions

diff --git a/media/webrtc/trunk/tools/gyp/test/xcode-ninja/list_excluded/gyptest-all.py b/media/webrtc/trunk/tools/gyp/test/xcode-ninja/list_excluded/gyptest-all.py
new file mode 100644
index 000000000..2d6378a7a
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/xcode-ninja/list_excluded/gyptest-all.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""
+Verifies that excluded files are listed in sources_for_indexing.xcodeproj by
+default, and that the generator flag xcode_ninja_list_excluded_files can be
+used to override the default behavior.
+"""
+
+import os
+import TestGyp
+
+
+test = TestGyp.TestGyp()
+
+if test.format != 'xcode-ninja':
+  test.skip_test()
+
+
+# With the generator flag not set.
+test.run_gyp('hello_exclude.gyp')
+test.must_contain(
+  'sources_for_indexing.xcodeproj/project.pbxproj', 'hello_excluded.cpp')
+
+
+# With the generator flag set to 0.
+try:
+  os.environ['GYP_GENERATOR_FLAGS'] = 'xcode_ninja_list_excluded_files=0'
+  test.run_gyp('hello_exclude.gyp')
+finally:
+  del os.environ['GYP_GENERATOR_FLAGS']
+test.must_not_contain(
+  'sources_for_indexing.xcodeproj/project.pbxproj', 'hello_excluded.cpp')
+
+
+# With the generator flag explicitly set to 1.
+try:
+  os.environ['GYP_GENERATOR_FLAGS'] = 'xcode_ninja_list_excluded_files=1'
+  test.run_gyp('hello_exclude.gyp')
+finally:
+  del os.environ['GYP_GENERATOR_FLAGS']
+test.must_contain(
+  'sources_for_indexing.xcodeproj/project.pbxproj', 'hello_excluded.cpp')
+
+
+test.pass_test()
diff --git a/media/webrtc/trunk/tools/gyp/test/xcode-ninja/list_excluded/hello.cpp b/media/webrtc/trunk/tools/gyp/test/xcode-ninja/list_excluded/hello.cpp
new file mode 100644
index 000000000..cd409dabf
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/xcode-ninja/list_excluded/hello.cpp
@@ -0,0 +1,7 @@
+// Copyright (c) 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+int main() {
+  return 0;
+}
diff --git a/media/webrtc/trunk/tools/gyp/test/xcode-ninja/list_excluded/hello_exclude.gyp b/media/webrtc/trunk/tools/gyp/test/xcode-ninja/list_excluded/hello_exclude.gyp
new file mode 100644
index 000000000..f5f0e8eaf
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/xcode-ninja/list_excluded/hello_exclude.gyp
@@ -0,0 +1,19 @@
+# Copyright (c) 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'hello',
+      'type': 'executable',
+      'sources': [
+        'hello.cpp',
+        'hello_excluded.cpp',
+      ],
+      'sources!': [
+        'hello_excluded.cpp',
+      ],
+    },
+  ],
+}
diff --git a/media/webrtc/trunk/tools/gyp/test/xcode-ninja/list_excluded/hello_excluded.cpp b/media/webrtc/trunk/tools/gyp/test/xcode-ninja/list_excluded/hello_excluded.cpp
new file mode 100644
index 000000000..211552954
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/xcode-ninja/list_excluded/hello_excluded.cpp
@@ -0,0 +1,7 @@
+// Copyright (c) 2016 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+int main() {
+  return 42;
+}