Add m-esr52 at 52.6.0

4 files changed, 64 insertions, 0 deletions

diff --git a/media/webrtc/trunk/tools/gyp/test/same-target-name/gyptest-same-target-name.py b/media/webrtc/trunk/tools/gyp/test/same-target-name/gyptest-same-target-name.py
new file mode 100755
index 000000000..bfe5540f3
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/same-target-name/gyptest-same-target-name.py
@@ -0,0 +1,18 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2010 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.
+
+"""
+Check that duplicate targets in a directory gives an error.
+"""
+
+import TestGyp
+
+test = TestGyp.TestGyp()
+
+# Require that gyp files with duplicate targets spit out an error.
+test.run_gyp('all.gyp', chdir='src', status=1, stderr=None)
+
+test.pass_test()
diff --git a/media/webrtc/trunk/tools/gyp/test/same-target-name/src/all.gyp b/media/webrtc/trunk/tools/gyp/test/same-target-name/src/all.gyp
new file mode 100644
index 000000000..ac16976da
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/same-target-name/src/all.gyp
@@ -0,0 +1,16 @@
+# Copyright (c) 2010 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': 'all_exes',
+      'type': 'none',
+      'dependencies': [
+        'executable1.gyp:*',
+        'executable2.gyp:*',
+      ],
+    },
+  ],
+}
diff --git a/media/webrtc/trunk/tools/gyp/test/same-target-name/src/executable1.gyp b/media/webrtc/trunk/tools/gyp/test/same-target-name/src/executable1.gyp
new file mode 100644
index 000000000..3c492c1b3
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/same-target-name/src/executable1.gyp
@@ -0,0 +1,15 @@
+# Copyright (c) 2010 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': 'program',
+      'type': 'executable',
+      'sources': [
+        'main1.cc',
+      ],
+    },
+  ],
+}
diff --git a/media/webrtc/trunk/tools/gyp/test/same-target-name/src/executable2.gyp b/media/webrtc/trunk/tools/gyp/test/same-target-name/src/executable2.gyp
new file mode 100644
index 000000000..41e84a61c
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/same-target-name/src/executable2.gyp
@@ -0,0 +1,15 @@
+# Copyright (c) 2010 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': 'program',
+      'type': 'executable',
+      'sources': [
+        'main2.cc',
+      ],
+    },
+  ],
+}