Add m-esr52 at 52.6.0

3 files changed, 82 insertions, 0 deletions

diff --git a/media/webrtc/trunk/tools/gyp/test/actions-multiple-outputs/gyptest-multiple-outputs.py b/media/webrtc/trunk/tools/gyp/test/actions-multiple-outputs/gyptest-multiple-outputs.py
new file mode 100755
index 000000000..72a7040a0
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/actions-multiple-outputs/gyptest-multiple-outputs.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2015 Google Inc. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""
+Verifies actions with multiple outputs will correctly rebuild.
+"""
+
+import TestGyp
+import os
+import sys
+
+if sys.platform == 'win32':
+  print "This test is currently disabled: https://crbug.com/483696."
+  sys.exit(0)
+
+test = TestGyp.TestGyp()
+
+test.run_gyp('multiple-outputs.gyp', chdir='src')
+
+chdir = 'relocate/src'
+test.relocate('src', chdir)
+
+def build_and_check():
+  # Build + check that both outputs exist.
+  test.build('multiple-outputs.gyp', chdir=chdir)
+  test.built_file_must_exist('out1.txt', chdir=chdir)
+  test.built_file_must_exist('out2.txt', chdir=chdir)
+
+# Plain build.
+build_and_check()
+
+# Remove either + rebuild. Both should exist (again).
+os.remove(test.built_file_path('out1.txt', chdir=chdir))
+build_and_check();
+
+# Remove the other + rebuild. Both should exist (again).
+os.remove(test.built_file_path('out2.txt', chdir=chdir))
+build_and_check();
+
+test.pass_test()
diff --git a/media/webrtc/trunk/tools/gyp/test/actions-multiple-outputs/src/multiple-outputs.gyp b/media/webrtc/trunk/tools/gyp/test/actions-multiple-outputs/src/multiple-outputs.gyp
new file mode 100644
index 000000000..7a3d74b11
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/actions-multiple-outputs/src/multiple-outputs.gyp
@@ -0,0 +1,23 @@
+# Copyright (c) 2015 Google Inc. 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': 'multiple-outputs',
+      'type': 'none',
+      'actions': [
+        {
+          'action_name': 'action1',
+          'inputs': [],
+          'outputs': [
+            '<(PRODUCT_DIR)/out1.txt',
+            '<(PRODUCT_DIR)/out2.txt',
+          ],
+          'action': ['python', 'touch.py', '<@(_outputs)'],
+        },
+      ],
+    },
+  ],
+}
diff --git a/media/webrtc/trunk/tools/gyp/test/actions-multiple-outputs/src/touch.py b/media/webrtc/trunk/tools/gyp/test/actions-multiple-outputs/src/touch.py
new file mode 100644
index 000000000..bc61267f3
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/actions-multiple-outputs/src/touch.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2015 Google Inc. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import os
+import sys
+
+"""Cross-platform touch."""
+
+for fname in sys.argv[1:]:
+  if os.path.exists(fname):
+    os.utime(fname, None)
+  else:
+    open(fname, 'w').close()