From 5f8de423f190bbb79a62f804151bc24824fa32d8 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 2 Feb 2018 04:16:08 -0500 Subject: Add m-esr52 at 52.6.0 --- .../target_platform/configurations.gyp | 58 ++++++++++++++++++++++ .../test/configurations/target_platform/front.c | 8 +++ .../target_platform/gyptest-target_platform.py | 40 +++++++++++++++ .../gyp/test/configurations/target_platform/left.c | 3 ++ .../test/configurations/target_platform/right.c | 3 ++ 5 files changed, 112 insertions(+) create mode 100644 media/webrtc/trunk/tools/gyp/test/configurations/target_platform/configurations.gyp create mode 100644 media/webrtc/trunk/tools/gyp/test/configurations/target_platform/front.c create mode 100755 media/webrtc/trunk/tools/gyp/test/configurations/target_platform/gyptest-target_platform.py create mode 100644 media/webrtc/trunk/tools/gyp/test/configurations/target_platform/left.c create mode 100644 media/webrtc/trunk/tools/gyp/test/configurations/target_platform/right.c (limited to 'media/webrtc/trunk/tools/gyp/test/configurations/target_platform') diff --git a/media/webrtc/trunk/tools/gyp/test/configurations/target_platform/configurations.gyp b/media/webrtc/trunk/tools/gyp/test/configurations/target_platform/configurations.gyp new file mode 100644 index 000000000..d15429f4e --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/configurations/target_platform/configurations.gyp @@ -0,0 +1,58 @@ +# Copyright (c) 2009 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. + +{ + 'target_defaults': { + 'configurations': { + 'Debug_Win32': { + 'msvs_configuration_platform': 'Win32', + }, + 'Debug_x64': { + 'msvs_configuration_platform': 'x64', + }, + }, + }, + 'targets': [ + { + 'target_name': 'left', + 'type': 'static_library', + 'sources': [ + 'left.c', + ], + 'configurations': { + 'Debug_Win32': { + 'msvs_target_platform': 'x64', + }, + }, + }, + { + 'target_name': 'right', + 'type': 'static_library', + 'sources': [ + 'right.c', + ], + }, + { + 'target_name': 'front_left', + 'type': 'executable', + 'dependencies': ['left'], + 'sources': [ + 'front.c', + ], + 'configurations': { + 'Debug_Win32': { + 'msvs_target_platform': 'x64', + }, + }, + }, + { + 'target_name': 'front_right', + 'type': 'executable', + 'dependencies': ['right'], + 'sources': [ + 'front.c', + ], + }, + ], +} diff --git a/media/webrtc/trunk/tools/gyp/test/configurations/target_platform/front.c b/media/webrtc/trunk/tools/gyp/test/configurations/target_platform/front.c new file mode 100644 index 000000000..7a91689ff --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/configurations/target_platform/front.c @@ -0,0 +1,8 @@ +#include + +const char *message(void); + +int main(void) { + printf("%s\n", message()); + return 0; +} diff --git a/media/webrtc/trunk/tools/gyp/test/configurations/target_platform/gyptest-target_platform.py b/media/webrtc/trunk/tools/gyp/test/configurations/target_platform/gyptest-target_platform.py new file mode 100755 index 000000000..ae4e9e5a2 --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/configurations/target_platform/gyptest-target_platform.py @@ -0,0 +1,40 @@ +#!/usr/bin/env python + +# Copyright (c) 2009 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. + +""" +Tests the msvs specific msvs_target_platform option. +""" + +import TestGyp +import TestCommon + + +def RunX64(exe, stdout): + try: + test.run_built_executable(exe, stdout=stdout) + except WindowsError, e: + # Assume the exe is 64-bit if it can't load on 32-bit systems. + # Both versions of the error are required because different versions + # of python seem to return different errors for invalid exe type. + if e.errno != 193 and '[Error 193]' not in str(e): + raise + + +test = TestGyp.TestGyp(formats=['msvs']) + +test.run_gyp('configurations.gyp') + +test.set_configuration('Debug|x64') +test.build('configurations.gyp', rebuild=True) +RunX64('front_left', stdout=('left\n')) +RunX64('front_right', stdout=('right\n')) + +test.set_configuration('Debug|Win32') +test.build('configurations.gyp', rebuild=True) +RunX64('front_left', stdout=('left\n')) +test.run_built_executable('front_right', stdout=('right\n')) + +test.pass_test() diff --git a/media/webrtc/trunk/tools/gyp/test/configurations/target_platform/left.c b/media/webrtc/trunk/tools/gyp/test/configurations/target_platform/left.c new file mode 100644 index 000000000..1ce2ea122 --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/configurations/target_platform/left.c @@ -0,0 +1,3 @@ +const char *message(void) { + return "left"; +} diff --git a/media/webrtc/trunk/tools/gyp/test/configurations/target_platform/right.c b/media/webrtc/trunk/tools/gyp/test/configurations/target_platform/right.c new file mode 100644 index 000000000..b1578492f --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/configurations/target_platform/right.c @@ -0,0 +1,3 @@ +const char *message(void) { + return "right"; +} -- cgit v1.2.3