Add m-esr52 at 52.6.0

3 files changed, 34 insertions, 0 deletions

diff --git a/media/webrtc/trunk/tools/gyp/test/arflags/gyptest-arflags.py b/media/webrtc/trunk/tools/gyp/test/arflags/gyptest-arflags.py
new file mode 100644
index 000000000..a5cbcac77
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/arflags/gyptest-arflags.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2014 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 that building a target with invalid arflags fails.
+"""
+
+import os
+import sys
+import TestGyp
+
+if sys.platform == 'darwin':
+  print "This test is currently disabled: https://crbug.com/483696."
+  sys.exit(0)
+
+
+test = TestGyp.TestGyp(formats=['ninja'])
+test.run_gyp('test.gyp')
+expected_status = 0 if sys.platform in ['darwin', 'win32'] else 1
+test.build('test.gyp', target='lib', status=expected_status)
+test.pass_test()
diff --git a/media/webrtc/trunk/tools/gyp/test/arflags/lib.cc b/media/webrtc/trunk/tools/gyp/test/arflags/lib.cc
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/arflags/lib.cc
diff --git a/media/webrtc/trunk/tools/gyp/test/arflags/test.gyp b/media/webrtc/trunk/tools/gyp/test/arflags/test.gyp
new file mode 100644
index 000000000..f7430fae2
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/arflags/test.gyp
@@ -0,0 +1,10 @@
+{
+  'targets': [
+    {
+      'target_name': 'lib',
+      'type': 'static_library',
+      'sources': ['lib.cc'],
+      'arflags': ['--nonexistent'],
+    },
+  ],
+}