Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1001)

Unified Diff: scripts/master/factory/chromium_factory.py

Issue 110373008: Remove Chrome Frame tests everywhere. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/master/factory/chromium_factory.py
diff --git a/scripts/master/factory/chromium_factory.py b/scripts/master/factory/chromium_factory.py
index 894576d9e33182efac15de46bf9295a6f671dccd..45712c8ed9102f2416a72c469b4f052d5414f124 100644
--- a/scripts/master/factory/chromium_factory.py
+++ b/scripts/master/factory/chromium_factory.py
@@ -773,32 +773,6 @@ class ChromiumFactory(gclient_factory.GClientFactory):
if R('gpu_content_tests'):
f.AddGpuContentTests(fp)
- # ChromeFrame tests:
- if R('chrome_frame_perftests'):
- f.AddChromeFramePerfTests(fp)
- if R('chrome_frame'):
- # Add all major CF tests.
- f.AddGTestTestStep('chrome_frame_net_tests', fp)
- f.AddGTestTestStep('chrome_frame_unittests', fp)
- f.AddGTestTestStep('chrome_frame_tests', fp)
- elif R('chrome_frame_br'):
- f.AddBuildrunnerGTest('chrome_frame_net_tests', fp)
- f.AddBuildrunnerGTest('chrome_frame_unittests', fp)
- f.AddBuildrunnerGTest('chrome_frame_tests', fp)
- else:
- if R('chrome_frame_net_tests'):
- f.AddGTestTestStep('chrome_frame_net_tests', fp)
- if R('chrome_frame_net_tests_br'):
- f.AddBuildrunnerGTest('chrome_frame_net_tests', fp)
- if R('chrome_frame_unittests'):
- f.AddGTestTestStep('chrome_frame_unittests', fp)
- if R('chrome_frame_unittests_br'):
- f.AddBuildrunnerGTest('chrome_frame_unittests', fp)
- if R('chrome_frame_tests'):
- f.AddGTestTestStep('chrome_frame_tests', fp)
- if R('chrome_frame_tests_br'):
- f.AddBuildrunnerGTest('chrome_frame_tests', fp)
-
def S(test, prefix, add_functor, br_functor=None):
"""Find any tests with a specific prefix and add them to the build.

Powered by Google App Engine
This is Rietveld 408576698