summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authornsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-10 18:47:39 +0000
committernsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-10 18:47:39 +0000
commitee0aab23de5bdc7c597faa5fd5dbf62fb17f4da4 (patch)
tree2718f4601857d2ed7935f83d6186d8e6c92ead2d /build
parentd2f2e494291d1eccb2be7b1886afbbf3c4fb3b77 (diff)
downloadchromium_src-ee0aab23de5bdc7c597faa5fd5dbf62fb17f4da4.zip
chromium_src-ee0aab23de5bdc7c597faa5fd5dbf62fb17f4da4.tar.gz
chromium_src-ee0aab23de5bdc7c597faa5fd5dbf62fb17f4da4.tar.bz2
Revert 28558 because this is clearly responsible for
breaking the interactive ui tests. It just needs a clobber. It looks like 2 parts of the code don't agree on the number of buttons on the bookmark bar. Maybe because part of the code is compiled with CHROME_PERSONALIZATION = 1 while the test is compiled with CHROME_PERSONALIZATION = 0. Maybe this new gyp change broke the define propagation. This is really easy to replicate, and should also be easy to debug. Original Log: Relanding the interactive UI tests GYP factor out, as it turns out it is not responsible for breaking the interactive ui tests. Review URL: http://codereview.chromium.org/271046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28668 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/all.gyp3
1 files changed, 1 insertions, 2 deletions
diff --git a/build/all.gyp b/build/all.gyp
index d78b362..7fbd745 100644
--- a/build/all.gyp
+++ b/build/all.gyp
@@ -12,7 +12,6 @@
'../app/app.gyp:*',
'../base/base.gyp:*',
'../chrome/chrome.gyp:*',
- '../chrome/test/interactive_ui/interactive_ui_test.gyp:*',
'../ipc/ipc.gyp:*',
'../media/media.gyp:*',
'../net/net.gyp:*',
@@ -159,6 +158,7 @@
'dependencies': [
'../app/app.gyp:app_unittests',
'../chrome/chrome.gyp:browser_tests',
+ '../chrome/chrome.gyp:interactive_ui_tests',
'../chrome/chrome.gyp:memory_test',
'../chrome/chrome.gyp:page_cycler_tests',
'../chrome/chrome.gyp:plugin_tests',
@@ -173,7 +173,6 @@
# mini_installer_tests depends on mini_installer. This should be
# defined in installer.gyp.
'../chrome/installer/mini_installer.gyp:mini_installer',
- '../chrome/test/interactive_ui/interactive_ui_test.gyp:interactive_ui_tests',
'../courgette/courgette.gyp:courgette_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../media/media.gyp:media_unittests',