Add m-esr52 at 52.6.0

3 files changed, 50 insertions, 0 deletions

diff --git a/media/webrtc/trunk/tools/gyp/test/ninja/use-custom-environment-files/gyptest-use-custom-environment-files.py b/media/webrtc/trunk/tools/gyp/test/ninja/use-custom-environment-files/gyptest-use-custom-environment-files.py
new file mode 100644
index 000000000..0c44b1d1c
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/ninja/use-custom-environment-files/gyptest-use-custom-environment-files.py
@@ -0,0 +1,28 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2012 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.
+
+"""
+Make sure environment files can be suppressed.
+"""
+
+import TestGyp
+
+import os
+import sys
+
+if sys.platform == 'win32':
+  test = TestGyp.TestGyp(formats=['ninja'])
+
+  test.run_gyp('use-custom-environment-files.gyp',
+               '-G', 'ninja_use_custom_environment_files')
+
+  # Make sure environment files do not exist.
+  if os.path.exists(test.built_file_path('environment.x86')):
+    test.fail_test()
+  if os.path.exists(test.built_file_path('environment.x64')):
+    test.fail_test()
+
+  test.pass_test()
diff --git a/media/webrtc/trunk/tools/gyp/test/ninja/use-custom-environment-files/use-custom-environment-files.cc b/media/webrtc/trunk/tools/gyp/test/ninja/use-custom-environment-files/use-custom-environment-files.cc
new file mode 100644
index 000000000..1711567ef
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/ninja/use-custom-environment-files/use-custom-environment-files.cc
@@ -0,0 +1,7 @@
+// Copyright (c) 2012 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.
+
+int main() {
+  return 0;
+}
diff --git a/media/webrtc/trunk/tools/gyp/test/ninja/use-custom-environment-files/use-custom-environment-files.gyp b/media/webrtc/trunk/tools/gyp/test/ninja/use-custom-environment-files/use-custom-environment-files.gyp
new file mode 100644
index 000000000..dbc95a943
--- /dev/null
+++ b/media/webrtc/trunk/tools/gyp/test/ninja/use-custom-environment-files/use-custom-environment-files.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': 'test_use_custom_environment_files',
+      'type': 'executable',
+      'sources': [
+        'use-custom-environment-files.cc',
+      ],
+    },
+  ],
+}