diff options
Diffstat (limited to 'deps/gyp/test/msvs/shared_output')
-rw-r--r-- | deps/gyp/test/msvs/shared_output/common.gypi | 17 | ||||
-rw-r--r-- | deps/gyp/test/msvs/shared_output/gyptest-shared_output.py | 41 | ||||
-rw-r--r-- | deps/gyp/test/msvs/shared_output/hello.c | 12 | ||||
-rw-r--r-- | deps/gyp/test/msvs/shared_output/hello.gyp | 21 | ||||
-rw-r--r-- | deps/gyp/test/msvs/shared_output/there/there.c | 12 | ||||
-rw-r--r-- | deps/gyp/test/msvs/shared_output/there/there.gyp | 16 |
6 files changed, 0 insertions, 119 deletions
diff --git a/deps/gyp/test/msvs/shared_output/common.gypi b/deps/gyp/test/msvs/shared_output/common.gypi deleted file mode 100644 index c6fa341d68..0000000000 --- a/deps/gyp/test/msvs/shared_output/common.gypi +++ /dev/null @@ -1,17 +0,0 @@ -# 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. - -{ - 'target_defaults': { - 'default_configuration': 'Baz', - 'configurations': { - 'Baz': { - 'msvs_configuration_attributes': { - 'OutputDirectory': '<(DEPTH)/foo', - 'IntermediateDirectory': '$(OutDir)/bar', - }, - }, - }, - }, -} diff --git a/deps/gyp/test/msvs/shared_output/gyptest-shared_output.py b/deps/gyp/test/msvs/shared_output/gyptest-shared_output.py deleted file mode 100644 index 270b280e6b..0000000000 --- a/deps/gyp/test/msvs/shared_output/gyptest-shared_output.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/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. - -""" -Test checking that IntermediateDirectory can be defined in terms of -OutputDirectory. We previously had emitted the definition of -IntermediateDirectory before the definition of OutputDirectory. -This is required so that $(IntDir) can be based on $(OutDir). -""" - -import TestGyp -import os - -# NOTE: This test really is vcbuild/msbuild specific (not applicable to windows -# ninja), as it is testing the msvs output location when opening an .sln -# other than all.sln. -test = TestGyp.TestGyp(workdir='workarea_shared_output', formats=['msvs']) - -test.run_gyp('hello.gyp') -test.set_configuration('Baz') - -test.build('there/there.gyp', test.ALL) -test.must_exist(os.path.join(test.workdir, 'foo', 'there.exe')) -test.must_exist(os.path.join(test.workdir, 'foo', 'bar', 'there.obj')) - -test.build('hello.gyp', test.ALL) -test.must_exist(os.path.join(test.workdir, 'foo', 'hello.exe')) -test.must_exist(os.path.join(test.workdir, 'foo', 'bar', 'hello.obj')) - -if test.format == 'msvs': - if test.uses_msbuild: - test.must_contain('pull_in_there.vcxproj', - '<IntDir>$(OutDir)bar\\</IntDir>') - else: - test.must_contain('pull_in_there.vcproj', - 'IntermediateDirectory="$(OutDir)bar\\"') - -test.pass_test() diff --git a/deps/gyp/test/msvs/shared_output/hello.c b/deps/gyp/test/msvs/shared_output/hello.c deleted file mode 100644 index 698e4fd36c..0000000000 --- a/deps/gyp/test/msvs/shared_output/hello.c +++ /dev/null @@ -1,12 +0,0 @@ -/* - * 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. - */ - -#include <stdio.h> - -int main(void) { - printf("Hello, world!\n"); - return 0; -} diff --git a/deps/gyp/test/msvs/shared_output/hello.gyp b/deps/gyp/test/msvs/shared_output/hello.gyp deleted file mode 100644 index f80e5cfca1..0000000000 --- a/deps/gyp/test/msvs/shared_output/hello.gyp +++ /dev/null @@ -1,21 +0,0 @@ -# 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. - -{ - 'includes': ['common.gypi'], - 'targets': [ - { - 'target_name': 'pull_in_there', - 'type': 'none', - 'dependencies': ['there/there.gyp:*'], - }, - { - 'target_name': 'hello', - 'type': 'executable', - 'sources': [ - 'hello.c', - ], - }, - ], -} diff --git a/deps/gyp/test/msvs/shared_output/there/there.c b/deps/gyp/test/msvs/shared_output/there/there.c deleted file mode 100644 index 698e4fd36c..0000000000 --- a/deps/gyp/test/msvs/shared_output/there/there.c +++ /dev/null @@ -1,12 +0,0 @@ -/* - * 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. - */ - -#include <stdio.h> - -int main(void) { - printf("Hello, world!\n"); - return 0; -} diff --git a/deps/gyp/test/msvs/shared_output/there/there.gyp b/deps/gyp/test/msvs/shared_output/there/there.gyp deleted file mode 100644 index 56feff326c..0000000000 --- a/deps/gyp/test/msvs/shared_output/there/there.gyp +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -{ - 'includes': ['../common.gypi'], - 'targets': [ - { - 'target_name': 'there', - 'type': 'executable', - 'sources': [ - 'there.c', - ], - }, - ], -} |