| Index: master.cfg
|
| ===================================================================
|
| --- master.cfg (revision 48414)
|
| +++ master.cfg (working copy)
|
| @@ -182,6 +182,9 @@
|
|
|
| valgrind_gyp_defines = chromium_factory.ChromiumFactory.MEMORY_TOOLS_GYP_DEFINES
|
|
|
| +# Running out of address space on 10.5... try to buy some time.
|
| +valgrind_mac_gyp_defines = valgrind_gyp_defines + ' enable_svg=0'
|
| +
|
| heapcheck_gyp_defines = (
|
| 'linux_use_tcmalloc=1 '
|
| 'linux_use_heapchecker=1 '
|
| @@ -303,7 +306,7 @@
|
| target = 'Debug',
|
| factory_properties={
|
| 'needs_valgrind' : True,
|
| - 'gclient_env': {'GYP_DEFINES' : valgrind_gyp_defines} },
|
| + 'gclient_env': {'GYP_DEFINES' : valgrind_mac_gyp_defines} },
|
| tests=['valgrind_app',
|
| 'valgrind_base',
|
| 'valgrind_googleurl',
|
| @@ -318,7 +321,7 @@
|
| target='Debug',
|
| factory_properties={
|
| 'needs_valgrind' : True,
|
| - 'gclient_env': {'GYP_DEFINES' : valgrind_gyp_defines} },
|
| + 'gclient_env': {'GYP_DEFINES' : valgrind_mac_gyp_defines} },
|
| tests=['tsan_base',
|
| 'tsan_googleurl',
|
| 'tsan_net',
|
| @@ -336,7 +339,7 @@
|
| target='Debug',
|
| factory_properties={
|
| 'needs_valgrind' : True,
|
| - 'gclient_env': { 'GYP_DEFINES' : valgrind_gyp_defines}},
|
| + 'gclient_env': { 'GYP_DEFINES' : valgrind_mac_gyp_defines}},
|
| options=['--', '-project', '../chrome/chrome.xcodeproj',
|
| '-target', 'ui_tests'])
|
|
|
| @@ -346,7 +349,7 @@
|
| target='Debug',
|
| factory_properties={
|
| 'needs_valgrind' : True,
|
| - 'gclient_env': { 'GYP_DEFINES' : valgrind_gyp_defines}},
|
| + 'gclient_env': { 'GYP_DEFINES' : valgrind_mac_gyp_defines}},
|
| options=['--', '-project', '../chrome/chrome.xcodeproj',
|
| '-target', 'ui_tests'])
|
|
|
| @@ -356,7 +359,7 @@
|
| target='Debug',
|
| factory_properties={
|
| 'needs_valgrind' : True,
|
| - 'gclient_env': { 'GYP_DEFINES' : valgrind_gyp_defines}},
|
| + 'gclient_env': { 'GYP_DEFINES' : valgrind_mac_gyp_defines}},
|
| options=['--', '-project', '../chrome/chrome.xcodeproj',
|
| '-target', 'ui_tests'])
|
|
|
| @@ -366,7 +369,7 @@
|
| target='Debug',
|
| factory_properties={
|
| 'needs_valgrind' : True,
|
| - 'gclient_env': { 'GYP_DEFINES' : valgrind_gyp_defines}},
|
| + 'gclient_env': { 'GYP_DEFINES' : valgrind_mac_gyp_defines}},
|
| options=['--', '-project', '../chrome/chrome.xcodeproj',
|
| '-target', 'ui_tests'])
|
|
|
| @@ -374,7 +377,7 @@
|
| 'webkit-rel-mac-valgrind',
|
| factory_properties={
|
| 'needs_valgrind' : True,
|
| - 'gclient_env': { 'GYP_DEFINES' : valgrind_gyp_defines } },
|
| + 'gclient_env': { 'GYP_DEFINES' : valgrind_mac_gyp_defines } },
|
| tests=['valgrind_test_shell'],
|
| options=['--', '-project',
|
| '../webkit/webkit.xcodeproj'])
|
|
|