summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-11 20:49:15 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-11 20:49:15 +0000
commita2ddfba7f85925d596c7a104d056811ef5757dad (patch)
tree45e9e7f64edba69778b67f5d98054835a919a9c2 /webkit/tools/test_shell
parent1c5bf633736fa19e6e9950fc5bb4aab378803ad8 (diff)
downloadchromium_src-a2ddfba7f85925d596c7a104d056811ef5757dad.zip
chromium_src-a2ddfba7f85925d596c7a104d056811ef5757dad.tar.gz
chromium_src-a2ddfba7f85925d596c7a104d056811ef5757dad.tar.bz2
Run PasswordManagerAutocompleteTests and MultipartResponseTest test_shell_tests
on Mac. These wouldn't compile because of the include path. The generated directory that has config.h must come before JavaScriptCore, or the wrong config.h (in JavaScriptCore) will be used. Review URL: http://codereview.chromium.org/14009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6819 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell')
-rw-r--r--webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj65
1 files changed, 36 insertions, 29 deletions
diff --git a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj
index 37bc1e6..0f475e0 100644
--- a/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj
+++ b/webkit/tools/test_shell/mac/TestShell.xcodeproj/project.pbxproj
@@ -35,6 +35,8 @@
/* Begin PBXBuildFile section */
4D1638790EBFA714008F024E /* libsqlite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D1638760EBFA6F7008F024E /* libsqlite.a */; };
+ 4D4C57FC0EF1A314002CA805 /* multipart_response_delegate_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = E4506B9E0EF02C7E003BE099 /* multipart_response_delegate_unittest.cc */; };
+ 4D4C58D90EF1A6D0002CA805 /* password_autocomplete_listener_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = E4506BA00EF02C85003BE099 /* password_autocomplete_listener_unittest.cc */; };
4DB687D70EAFE7C800AB2128 /* libxslt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DB687D40EAFE79200AB2128 /* libxslt.a */; };
4DB7FA6F0E9BF33B00C66CE0 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DB7FA6E0E9BF33B00C66CE0 /* SystemConfiguration.framework */; };
4DB7FEA40E9BF92100C66CE0 /* libwebcoresysteminterface.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DB7FE760E9BF6CB00C66CE0 /* libwebcoresysteminterface.a */; };
@@ -789,30 +791,30 @@
E450637C0E4100740025A81A /* test_shell_request_context.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = test_shell_request_context.h; sourceTree = "<group>"; };
E450637D0E4100740025A81A /* test_shell_request_context.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_shell_request_context.cc; sourceTree = "<group>"; };
E45067A80EEF2776003BE099 /* test_shell_tests */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = test_shell_tests; sourceTree = BUILT_PRODUCTS_DIR; };
- E45069EE0EF017D0003BE099 /* image_decoder_unittest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = image_decoder_unittest.h; path = ../image_decoder_unittest.h; sourceTree = SOURCE_ROOT; };
- E45069EF0EF017D0003BE099 /* image_decoder_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = image_decoder_unittest.cc; path = ../image_decoder_unittest.cc; sourceTree = SOURCE_ROOT; };
- E45069FA0EF01895003BE099 /* keyboard_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = keyboard_unittest.cc; path = ../keyboard_unittest.cc; sourceTree = SOURCE_ROOT; };
- E4506A410EF021C4003BE099 /* layout_test_controller_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = layout_test_controller_unittest.cc; path = ../layout_test_controller_unittest.cc; sourceTree = SOURCE_ROOT; };
+ E45069EE0EF017D0003BE099 /* image_decoder_unittest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = image_decoder_unittest.h; sourceTree = "<group>"; };
+ E45069EF0EF017D0003BE099 /* image_decoder_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = image_decoder_unittest.cc; sourceTree = "<group>"; };
+ E45069FA0EF01895003BE099 /* keyboard_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = keyboard_unittest.cc; sourceTree = "<group>"; };
+ E4506A410EF021C4003BE099 /* layout_test_controller_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = layout_test_controller_unittest.cc; sourceTree = "<group>"; };
E4506A4A0EF022AF003BE099 /* run_all_tests.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = run_all_tests.cc; sourceTree = "<group>"; };
- E4506A590EF02402003BE099 /* text_input_controller_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = text_input_controller_unittest.cc; path = ../text_input_controller_unittest.cc; sourceTree = SOURCE_ROOT; };
- E4506B890EF02BEF003BE099 /* bookmarklet_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = bookmarklet_unittest.cc; path = ../../../glue/bookmarklet_unittest.cc; sourceTree = SOURCE_ROOT; };
- E4506B8B0EF02BFF003BE099 /* context_menu_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = context_menu_unittest.cc; path = ../../../glue/context_menu_unittest.cc; sourceTree = SOURCE_ROOT; };
- E4506B900EF02C44003BE099 /* cpp_bound_class_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cpp_bound_class_unittest.cc; path = ../../../glue/cpp_bound_class_unittest.cc; sourceTree = SOURCE_ROOT; };
- E4506B920EF02C4B003BE099 /* cpp_variant_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cpp_variant_unittest.cc; path = ../../../glue/cpp_variant_unittest.cc; sourceTree = SOURCE_ROOT; };
- E4506B940EF02C53003BE099 /* dom_operations_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dom_operations_unittest.cc; path = ../../../glue/dom_operations_unittest.cc; sourceTree = SOURCE_ROOT; };
- E4506B960EF02C5B003BE099 /* dom_serializer_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dom_serializer_unittest.cc; path = ../../../glue/dom_serializer_unittest.cc; sourceTree = SOURCE_ROOT; };
- E4506B980EF02C67003BE099 /* glue_serialize_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = glue_serialize_unittest.cc; path = ../../../glue/glue_serialize_unittest.cc; sourceTree = SOURCE_ROOT; };
- E4506B9A0EF02C6D003BE099 /* iframe_redirect_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = iframe_redirect_unittest.cc; path = ../../../glue/iframe_redirect_unittest.cc; sourceTree = SOURCE_ROOT; };
- E4506B9C0EF02C73003BE099 /* mimetype_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mimetype_unittest.cc; path = ../../../glue/mimetype_unittest.cc; sourceTree = SOURCE_ROOT; };
- E4506B9E0EF02C7E003BE099 /* multipart_response_delegate_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = multipart_response_delegate_unittest.cc; path = ../../../glue/multipart_response_delegate_unittest.cc; sourceTree = SOURCE_ROOT; };
- E4506BA00EF02C85003BE099 /* password_autocomplete_listener_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = password_autocomplete_listener_unittest.cc; path = ../../../glue/password_autocomplete_listener_unittest.cc; sourceTree = SOURCE_ROOT; };
- E4506BDB0EF03307003BE099 /* regular_expression_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = regular_expression_unittest.cc; path = ../../../glue/regular_expression_unittest.cc; sourceTree = SOURCE_ROOT; };
- E4506BDD0EF03310003BE099 /* resource_fetcher_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = resource_fetcher_unittest.cc; path = ../../../glue/resource_fetcher_unittest.cc; sourceTree = SOURCE_ROOT; };
- E4506BDF0EF03318003BE099 /* webframe_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = webframe_unittest.cc; path = ../../../glue/webframe_unittest.cc; sourceTree = SOURCE_ROOT; };
- E4506BF00EF03722003BE099 /* GKURL_unittest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GKURL_unittest.cpp; path = ../../../port/platform/GKURL_unittest.cpp; sourceTree = SOURCE_ROOT; };
- E4506BF20EF0372D003BE099 /* BMPImageDecoder_unittest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BMPImageDecoder_unittest.cpp; path = "../../../port/platform/image-decoders/bmp/BMPImageDecoder_unittest.cpp"; sourceTree = SOURCE_ROOT; };
- E4506BF40EF03736003BE099 /* ICOImageDecoder_unittest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ICOImageDecoder_unittest.cpp; path = "../../../port/platform/image-decoders/ico/ICOImageDecoder_unittest.cpp"; sourceTree = SOURCE_ROOT; };
- E4506BF60EF03740003BE099 /* XBMImageDecoder_unittest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XBMImageDecoder_unittest.cpp; path = "../../../port/platform/image-decoders/xbm/XBMImageDecoder_unittest.cpp"; sourceTree = SOURCE_ROOT; };
+ E4506A590EF02402003BE099 /* text_input_controller_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = text_input_controller_unittest.cc; sourceTree = "<group>"; };
+ E4506B890EF02BEF003BE099 /* bookmarklet_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bookmarklet_unittest.cc; sourceTree = "<group>"; };
+ E4506B8B0EF02BFF003BE099 /* context_menu_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = context_menu_unittest.cc; sourceTree = "<group>"; };
+ E4506B900EF02C44003BE099 /* cpp_bound_class_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cpp_bound_class_unittest.cc; sourceTree = "<group>"; };
+ E4506B920EF02C4B003BE099 /* cpp_variant_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cpp_variant_unittest.cc; sourceTree = "<group>"; };
+ E4506B940EF02C53003BE099 /* dom_operations_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dom_operations_unittest.cc; sourceTree = "<group>"; };
+ E4506B960EF02C5B003BE099 /* dom_serializer_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dom_serializer_unittest.cc; sourceTree = "<group>"; };
+ E4506B980EF02C67003BE099 /* glue_serialize_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = glue_serialize_unittest.cc; sourceTree = "<group>"; };
+ E4506B9A0EF02C6D003BE099 /* iframe_redirect_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = iframe_redirect_unittest.cc; sourceTree = "<group>"; };
+ E4506B9C0EF02C73003BE099 /* mimetype_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mimetype_unittest.cc; sourceTree = "<group>"; };
+ E4506B9E0EF02C7E003BE099 /* multipart_response_delegate_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = multipart_response_delegate_unittest.cc; sourceTree = "<group>"; };
+ E4506BA00EF02C85003BE099 /* password_autocomplete_listener_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = password_autocomplete_listener_unittest.cc; sourceTree = "<group>"; };
+ E4506BDB0EF03307003BE099 /* regular_expression_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = regular_expression_unittest.cc; sourceTree = "<group>"; };
+ E4506BDD0EF03310003BE099 /* resource_fetcher_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resource_fetcher_unittest.cc; sourceTree = "<group>"; };
+ E4506BDF0EF03318003BE099 /* webframe_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = webframe_unittest.cc; sourceTree = "<group>"; };
+ E4506BF00EF03722003BE099 /* GKURL_unittest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GKURL_unittest.cpp; path = platform/GKURL_unittest.cpp; sourceTree = "<group>"; };
+ E4506BF20EF0372D003BE099 /* BMPImageDecoder_unittest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BMPImageDecoder_unittest.cpp; path = "platform/image-decoders/bmp/BMPImageDecoder_unittest.cpp"; sourceTree = "<group>"; };
+ E4506BF40EF03736003BE099 /* ICOImageDecoder_unittest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ICOImageDecoder_unittest.cpp; path = "platform/image-decoders/ico/ICOImageDecoder_unittest.cpp"; sourceTree = "<group>"; };
+ E4506BF60EF03740003BE099 /* XBMImageDecoder_unittest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XBMImageDecoder_unittest.cpp; path = "platform/image-decoders/xbm/XBMImageDecoder_unittest.cpp"; sourceTree = "<group>"; };
E45449360EC9FD15000DFA6E /* test_shell.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_shell.cc; sourceTree = "<group>"; };
E456293E0E26B4FE005E4685 /* TestShell.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TestShell.app; sourceTree = BUILT_PRODUCTS_DIR; };
E45629460E26B5A7005E4685 /* net.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = net.xcodeproj; path = net/net.xcodeproj; sourceTree = "<group>"; };
@@ -1264,6 +1266,7 @@
E4506A590EF02402003BE099 /* text_input_controller_unittest.cc */,
);
name = Tests;
+ path = ..;
sourceTree = "<group>";
};
E4506B840EF02BD4003BE099 /* glue */ = {
@@ -1285,6 +1288,7 @@
E4506BDF0EF03318003BE099 /* webframe_unittest.cc */,
);
name = glue;
+ path = ../../glue;
sourceTree = "<group>";
};
E4506BE10EF03328003BE099 /* port */ = {
@@ -1296,6 +1300,7 @@
E4506BF60EF03740003BE099 /* XBMImageDecoder_unittest.cpp */,
);
name = port;
+ path = ../../port;
sourceTree = "<group>";
};
/* End PBXGroup section */
@@ -1854,7 +1859,9 @@
E45067BB0EF015CA003BE099 /* layout_test_controller.cc in Sources */,
E4506A420EF021C4003BE099 /* layout_test_controller_unittest.cc in Sources */,
E4506B9D0EF02C73003BE099 /* mimetype_unittest.cc in Sources */,
+ 4D4C57FC0EF1A314002CA805 /* multipart_response_delegate_unittest.cc in Sources */,
E4506C4A0EF04007003BE099 /* node_leak_test.cc in Sources */,
+ 4D4C58D90EF1A6D0002CA805 /* password_autocomplete_listener_unittest.cc in Sources */,
E4506BDC0EF03307003BE099 /* regular_expression_unittest.cc in Sources */,
E4506BDE0EF03310003BE099 /* resource_fetcher_unittest.cc in Sources */,
E4506A4B0EF022AF003BE099 /* run_all_tests.cc in Sources */,
@@ -2164,8 +2171,6 @@
../../../../third_party/WebKit/WebCore/rendering/style,
../../../../third_party/WebKit/WebCore/svg,
../../../../third_party/WebKit/WebKit/mac/WebCoreSupport,
- ../../../../third_party/WebKit/JavaScriptCore/wtf,
- ../../../../third_party/WebKit/JavaScriptCore,
"../../../../webkit/port/platform/image-decoders",
"../../../../webkit/port/platform/image-decoders/bmp",
"../../../../webkit/port/platform/image-decoders/png",
@@ -2175,6 +2180,8 @@
../../../../webkit/port/bindings/v8,
"$(SYMROOT)/webkit.build/$(CONFIGURATION)/generated/DerivedSources/v8/bindings",
"$(SYMROOT)/webkit.build/$(CONFIGURATION)/generated/WebCore/v8",
+ ../../../../third_party/WebKit/JavaScriptCore,
+ ../../../../third_party/WebKit/JavaScriptCore/wtf,
);
LIBRARY_SEARCH_PATHS = (
"$(LIBRARY_SEARCH_PATHS)",
@@ -2224,8 +2231,6 @@
../../../../third_party/WebKit/WebCore/rendering/style,
../../../../third_party/WebKit/WebCore/svg,
../../../../third_party/WebKit/WebKit/mac/WebCoreSupport,
- ../../../../third_party/WebKit/JavaScriptCore/wtf,
- ../../../../third_party/WebKit/JavaScriptCore,
"../../../../webkit/port/platform/image-decoders",
"../../../../webkit/port/platform/image-decoders/bmp",
"../../../../webkit/port/platform/image-decoders/png",
@@ -2235,6 +2240,8 @@
../../../../webkit/port/bindings/v8,
"$(SYMROOT)/webkit.build/$(CONFIGURATION)/generated/DerivedSources/v8/bindings",
"$(SYMROOT)/webkit.build/$(CONFIGURATION)/generated/WebCore/v8",
+ ../../../../third_party/WebKit/JavaScriptCore,
+ ../../../../third_party/WebKit/JavaScriptCore/wtf,
);
LIBRARY_SEARCH_PATHS = (
"$(LIBRARY_SEARCH_PATHS)",
@@ -2280,8 +2287,8 @@
../../../port/platform/chromium,
../../../../third_party/WebKit/WebCore,
../../../../third_party/WebKit/WebKit/mac/WebCoreSupport,
- ../../../../third_party/WebKit/JavaScriptCore,
"$(SYMROOT)/webkit.build/$(CONFIGURATION)/generated/WebCore/v8",
+ ../../../../third_party/WebKit/JavaScriptCore,
);
INFOPLIST_FILE = Info.plist;
LIBRARY_SEARCH_PATHS = (
@@ -2315,8 +2322,8 @@
../../../port/platform/chromium,
../../../../third_party/WebKit/WebCore,
../../../../third_party/WebKit/WebKit/mac/WebCoreSupport,
- ../../../../third_party/WebKit/JavaScriptCore,
"$(SYMROOT)/webkit.build/$(CONFIGURATION)/generated/WebCore/v8",
+ ../../../../third_party/WebKit/JavaScriptCore,
);
INFOPLIST_FILE = Info.plist;
LIBRARY_SEARCH_PATHS = (