summaryrefslogtreecommitdiffstats
path: root/chrome/test/interactive_ui/interactive_ui.vcproj
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-02 22:06:44 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-02 22:06:44 +0000
commit729065e3cfedd4db3db21d4b485527be2eff4d3e (patch)
treeb4d58c0608b129b67555ba62dcc7f45d2fed5f4c /chrome/test/interactive_ui/interactive_ui.vcproj
parent493c0a196a653dd6ead30a8cc8e45df54ca3b997 (diff)
downloadchromium_src-729065e3cfedd4db3db21d4b485527be2eff4d3e.zip
chromium_src-729065e3cfedd4db3db21d4b485527be2eff4d3e.tar.gz
chromium_src-729065e3cfedd4db3db21d4b485527be2eff4d3e.tar.bz2
Moves the bookmark bar view test into the interactive tests. To get
this to work I changed the interactive ui tests to link with everything the unit tests do. I did this by way of clicking on the dependencies dialog in VS. Let me know if that wasn't right. I also had to slightly tweak BookmarkBarModel and BookmarkStorage to deal with changes I did a while back. These changes only matter during testing (background thread is NULL). BUG=1318942 TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1659 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/interactive_ui/interactive_ui.vcproj')
-rw-r--r--chrome/test/interactive_ui/interactive_ui.vcproj28
1 files changed, 26 insertions, 2 deletions
diff --git a/chrome/test/interactive_ui/interactive_ui.vcproj b/chrome/test/interactive_ui/interactive_ui.vcproj
index 7be44ab..5449a05 100644
--- a/chrome/test/interactive_ui/interactive_ui.vcproj
+++ b/chrome/test/interactive_ui/interactive_ui.vcproj
@@ -17,7 +17,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="1"
- InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;..\..\tools\build\win\precompiled_wtl.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;..\..\tools\build\win\unit_test.vsprops;..\..\tools\build\win\ui_test.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops"
+ InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;..\..\tools\build\win\precompiled_wtl.vsprops;..\..\tools\build\win\unit_test.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;..\..\..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;..\..\third_party\hunspell\using_hunspell.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -77,7 +77,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="1"
- InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;..\..\tools\build\win\unit_test.vsprops;..\..\tools\build\win\ui_test.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops"
+ InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;..\..\tools\build\win\unit_test.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;..\..\..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;..\..\third_party\hunspell\using_hunspell.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -167,6 +167,14 @@
>
</File>
<File
+ RelativePath="..\testing_profile.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\testing_profile.h"
+ >
+ </File>
+ <File
RelativePath="..\ui\ui_test.cc"
>
</File>
@@ -178,6 +186,22 @@
RelativePath="..\ui\ui_test_suite.cc"
>
</File>
+ <File
+ RelativePath=".\view_event_test_base.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\view_event_test_base.h"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="TestBookmarkBarView"
+ >
+ <File
+ RelativePath="..\..\browser\views\bookmark_bar_view_test.cc"
+ >
+ </File>
</Filter>
<Filter
Name="TestFindInPage"