Commit af584710 authored by dpranke@chromium.org's avatar dpranke@chromium.org

TestWebKitAPI isn't being built on chromium bots any more

https://bugs.webkit.org/show_bug.cgi?id=77563

Reviewed by Dimitri Glazkov.

I accidentally dropped it in the refactoring in r105449.

Source/WebKit/chromium:

* All.gyp:

Tools:

* TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp: Added.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106481 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5dd72ec9
......@@ -65,6 +65,13 @@ Tools/DumpRenderTree/DumpRenderTree.gyp/*.ninja
Tools/DumpRenderTree/DumpRenderTree.gyp/*.sln
Tools/DumpRenderTree/DumpRenderTree.gyp/*.vcproj*
Tools/DumpRenderTree/DumpRenderTree.gyp/*.xcodeproj*
Tools/TestWebKitAPI/TestWebKitAPI.gyp/*.Makefile
Tools/TestWebKitAPI/TestWebKitAPI.gyp/*.mk
Tools/TestWebKitAPI/TestWebKitAPI.gyp/*.ninja
Tools/TestWebKitAPI/TestWebKitAPI.gyp/*.sln
Tools/TestWebKitAPI/TestWebKitAPI.gyp/*.vcproj*
Tools/TestWebKitAPI/TestWebKitAPI.gyp/*.xcodeproj*
# Ignore status files that manage Chromium dependencies.
Source/WebKit/chromium/.gclient
......
......@@ -34,7 +34,7 @@
],
'targets': [
{
# These two targets should be sufficient to cause everything
# These targets should be sufficient to cause everything
# else to build (incl. webkit); if they aren't, we have our
# dependencies wrong.
'target_name': 'all_webkit',
......@@ -42,6 +42,7 @@
'dependencies': [
'WebKitUnitTests.gyp:webkit_unit_tests',
'../../../Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree',
'../../../Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp:TestWebKitAPI',
],
}
],
......
2012-02-01 Dirk Pranke <dpranke@chromium.org>
TestWebKitAPI isn't being built on chromium bots any more
https://bugs.webkit.org/show_bug.cgi?id=77563
Reviewed by Dimitri Glazkov.
I accidentally dropped it in the refactoring in r105449.
* All.gyp:
2012-02-01 Hans Wennborg <hans@chromium.org>
Rename WebSpeechInputResult::set() to assign()
2012-02-01 Dirk Pranke <dpranke@chromium.org>
TestWebKitAPI isn't being built on chromium bots any more
https://bugs.webkit.org/show_bug.cgi?id=77563
Reviewed by Dimitri Glazkov.
I accidentally dropped it in the refactoring in r105449.
* TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp: Added.
2012-02-01 Hans Wennborg <hans@chromium.org>
Rename WebSpeechInputResult::set() to assign()
#
# Copyright (C) 2012 Google Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
# met:
#
# * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# * Redistributions in binary form must reproduce the above
# copyright notice, this list of conditions and the following disclaimer
# in the documentation and/or other materials provided with the
# distribution.
# * Neither the name of Google Inc. nor the names of its
# contributors may be used to endorse or promote products derived from
# this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
{
'variables': {
'tools_dir': '../..',
'source_dir': '../../../Source',
'conditions': [
# Location of the chromium src directory and target type is different
# if webkit is built inside chromium or as standalone project.
['inside_chromium_build==0', {
# Webkit is being built outside of the full chromium project.
# e.g. via build-webkit --chromium
'chromium_src_dir': '<(source_dir)/WebKit/chromium',
},{
# WebKit is checked out in src/chromium/third_party/WebKit
'chromium_src_dir': '<(tools_dir)/../../..',
}],
],
},
'includes': [
'../TestWebKitAPI.gypi',
'../../../Source/WebKit/chromium/features.gypi',
],
'targets': [
{
'target_name': 'TestWebKitAPI',
'type': 'executable',
'dependencies': [
'<(source_dir)/WebKit/chromium/WebKit.gyp:webkit',
'<(source_dir)/WebCore/WebCore.gyp/WebCore.gyp:webcore',
'<(chromium_src_dir)/base/base.gyp:test_support_base',
'<(chromium_src_dir)/testing/gtest.gyp:gtest',
'<(chromium_src_dir)/testing/gmock.gyp:gmock',
'<(chromium_src_dir)/webkit/support/webkit_support.gyp:webkit_support',
],
'include_dirs': [
'<(tools_dir)/TestWebKitAPI',
# Needed by tests/RunAllTests.cpp, as well as ChromiumCurrentTime.cpp and
# ChromiumThreading.cpp in chromium shared library configuration.
'<(source_dir)/WebKit/chromium/public',
],
'sources': [
# Reuse the same testing driver of Chromium's webkit_unit_tests.
'<(source_dir)/WebKit/chromium/tests/RunAllTests.cpp',
'<@(TestWebKitAPI_files)',
],
'conditions': [
['inside_chromium_build==1 and component=="shared_library"', {
'sources': [
# To satisfy linking of WTF::currentTime() etc. in shared library configuration,
# as the symbols are not exported from the DLLs.
'<(source_dir)/WebKit/chromium/src/ChromiumCurrentTime.cpp',
'<(source_dir)/WebKit/chromium/src/ChromiumThreading.cpp',
],
}],
],
},
], # targets
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment