From 8995c95878ae0ebc9ba01550396f91f3a75d8624 Mon Sep 17 00:00:00 2001 From: Nigel Babu Date: Wed, 9 Sep 2015 07:20:47 +0530 Subject: [PATCH] Backed out changeset 53e7018a7b15 (bug 992983) for bustage on CLOSED TREE --- .../configs/unittests/linux_unittest.py | 16 +-------- .../configs/unittests/mac_unittest.py | 16 +-------- .../configs/unittests/win_unittest.py | 16 +-------- .../mozharness/mozilla/testing/errors.py | 6 ---- .../mozharness/scripts/desktop_unittest.py | 34 ++----------------- 5 files changed, 6 insertions(+), 82 deletions(-) diff --git a/testing/mozharness/configs/unittests/linux_unittest.py b/testing/mozharness/configs/unittests/linux_unittest.py index 65a9ba37134..eff2b7dc56f 100644 --- a/testing/mozharness/configs/unittests/linux_unittest.py +++ b/testing/mozharness/configs/unittests/linux_unittest.py @@ -40,7 +40,6 @@ config = { "reftest": "runreftest.py", "xpcshell": "runxpcshelltests.py", "cppunittest": "runcppunittests.py", - "gtest": "rungtests.py", "jittest": "jit_test.py", "mozbase": "test.py", "mozmill": "runtestlist.py", @@ -52,7 +51,6 @@ config = { "reftest": ["reftest/*", "jsreftest/*"], "xpcshell": ["xpcshell/*"], "cppunittest": ["cppunittest/*"], - "gtest": ["gtest/*"], "jittest": ["jit-test/*"], "mozbase": ["mozbase/*"], "mozmill": ["mozmill/*"], @@ -165,16 +163,7 @@ config = { ], "run_filename": "runxpcshelltests.py", "testsdir": "xpcshell" - }, - "gtest": { - "options": [ - "--xre-path=%(abs_res_dir)s", - "--cwd=%(gtest_dir)s", - "--symbols-path=%(symbols_path)s", - "%(binary_path)s", - ], - "run_filename": "rungtests.py", - }, + } }, # local mochi suites "all_mochitest_suites": { @@ -229,9 +218,6 @@ config = { "all_cppunittest_suites": { "cppunittest": ['tests/cppunittest'] }, - "all_gtest_suites": { - "gtest": [] - }, "all_jittest_suites": { "jittest": [], "jittest1": ["--total-chunks=2", "--this-chunk=1"], diff --git a/testing/mozharness/configs/unittests/mac_unittest.py b/testing/mozharness/configs/unittests/mac_unittest.py index 000eec5f8a4..6297ada8cc9 100644 --- a/testing/mozharness/configs/unittests/mac_unittest.py +++ b/testing/mozharness/configs/unittests/mac_unittest.py @@ -29,7 +29,6 @@ config = { "reftest": "runreftest.py", "xpcshell": "runxpcshelltests.py", "cppunittest": "runcppunittests.py", - "gtest": "rungtests.py", "jittest": "jit_test.py", "mozbase": "test.py", "mozmill": "runtestlist.py", @@ -41,7 +40,6 @@ config = { "reftest": ["reftest/*", "jsreftest/*"], "xpcshell": ["xpcshell/*"], "cppunittest": ["cppunittest/*"], - "gtest": ["gtest/*"], "jittest": ["jit-test/*"], "mozbase": ["mozbase/*"], "mozmill": ["mozmill/*"], @@ -132,16 +130,7 @@ config = { ], "run_filename": "runxpcshelltests.py", "testsdir": "xpcshell" - }, - "gtest": { - "options": [ - "--xre-path=%(abs_res_dir)s", - "--cwd=%(gtest_dir)s", - "--symbols-path=%(symbols_path)s", - "%(binary_path)s", - ], - "run_filename": "rungtests.py", - }, + } }, # local mochi suites "all_mochitest_suites": { @@ -188,9 +177,6 @@ config = { "all_cppunittest_suites": { "cppunittest": ['tests/cppunittest'] }, - "all_gtest_suites": { - "gtest": [] - }, "all_jittest_suites": { "jittest": [] }, diff --git a/testing/mozharness/configs/unittests/win_unittest.py b/testing/mozharness/configs/unittests/win_unittest.py index 5ad41e84418..64254f3ab71 100644 --- a/testing/mozharness/configs/unittests/win_unittest.py +++ b/testing/mozharness/configs/unittests/win_unittest.py @@ -38,7 +38,6 @@ config = { "reftest": "runreftest.py", "xpcshell": "runxpcshelltests.py", "cppunittest": "runcppunittests.py", - "gtest": "rungtests.py", "jittest": "jit_test.py", "mozbase": "test.py", "mozmill": "runtestlist.py", @@ -50,7 +49,6 @@ config = { "reftest": ["reftest/*", "jsreftest/*"], "xpcshell": ["xpcshell/*"], "cppunittest": ["cppunittest/*"], - "gtest": ["gtest/*"], "jittest": ["jit-test/*"], "mozbase": ["mozbase/*"], "mozmill": ["mozmill/*"], @@ -140,16 +138,7 @@ config = { ], "run_filename": "runxpcshelltests.py", "testsdir": "xpcshell" - }, - "gtest": { - "options": [ - "--xre-path=%(abs_res_dir)s", - "--cwd=%(gtest_dir)s", - "--symbols-path=%(symbols_path)s", - "%(binary_path)s", - ], - "run_filename": "rungtests.py", - }, + } }, # local mochi suites "all_mochitest_suites": @@ -202,9 +191,6 @@ config = { "all_cppunittest_suites": { "cppunittest": ['tests/cppunittest'] }, - "all_gtest_suites": { - "gtest": [] - }, "all_jittest_suites": { "jittest": [] }, diff --git a/testing/mozharness/mozharness/mozilla/testing/errors.py b/testing/mozharness/mozharness/mozilla/testing/errors.py index 606f2f65772..48502bd8c1a 100644 --- a/testing/mozharness/mozharness/mozilla/testing/errors.py +++ b/testing/mozharness/mozharness/mozilla/testing/errors.py @@ -60,12 +60,6 @@ TinderBoxPrintRe = { 'fail_group': "Failed", 'known_fail_group': None, }, - "gtest_summary": { - 'regex': re.compile(r'''(Passed|Failed): (\d+)'''), - 'pass_group': "Passed", - 'fail_group': "Failed", - 'known_fail_group': None, - }, "jittest_summary": { 'regex': re.compile(r'''(Passed|Failed): (\d+)'''), 'pass_group': "Passed", diff --git a/testing/mozharness/scripts/desktop_unittest.py b/testing/mozharness/scripts/desktop_unittest.py index 53ad788ee44..c7480cfc4a8 100755 --- a/testing/mozharness/scripts/desktop_unittest.py +++ b/testing/mozharness/scripts/desktop_unittest.py @@ -31,8 +31,9 @@ from mozharness.mozilla.testing.codecoverage import ( code_coverage_config_options ) from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options +from mozharness.mozilla.buildbot import TBPL_WARNING -SUITE_CATEGORIES = ['gtest', 'cppunittest', 'jittest', 'mochitest', 'reftest', 'xpcshell', 'mozbase', 'mozmill', 'webapprt'] +SUITE_CATEGORIES = ['cppunittest', 'jittest', 'mochitest', 'reftest', 'xpcshell', 'mozbase', 'mozmill', 'webapprt'] # DesktopUnittest {{{1 @@ -78,14 +79,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix "Suites are defined in the config file\n." "Examples: 'cppunittest'"} ], - [['--gtest-suite', ], { - "action": "extend", - "dest": "specified_gtest_suites", - "type": "string", - "help": "Specify which gtest suite to run. " - "Suites are defined in the config file\n." - "Examples: 'gtest'"} - ], [['--jittest-suite', ], { "action": "extend", "dest": "specified_jittest_suites", @@ -214,7 +207,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix dirs['abs_reftest_dir'] = os.path.join(dirs['abs_test_install_dir'], "reftest") dirs['abs_xpcshell_dir'] = os.path.join(dirs['abs_test_install_dir'], "xpcshell") dirs['abs_cppunittest_dir'] = os.path.join(dirs['abs_test_install_dir'], "cppunittest") - dirs['abs_gtest_dir'] = os.path.join(dirs['abs_test_install_dir'], "gtest") dirs['abs_blob_upload_dir'] = os.path.join(abs_dirs['abs_work_dir'], 'blobber_upload_dir') dirs['abs_jittest_dir'] = os.path.join(dirs['abs_test_install_dir'], "jit-test", "jit-test") dirs['abs_mozbase_dir'] = os.path.join(dirs['abs_test_install_dir'], "mozbase") @@ -347,10 +339,7 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix 'abs_res_dir': abs_res_dir, 'raw_log_file': raw_log_file, 'error_summary_file': error_summary_file, - 'gtest_dir': os.path.join(dirs['abs_test_install_dir'], - 'gtest'), } - # TestingMixin._download_and_extract_symbols() will set # self.symbols_path when downloading/extracting. if self.symbols_path: @@ -479,8 +468,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix preflight_run_method=self.preflight_xpcshell) self._run_category_suites('cppunittest', preflight_run_method=self.preflight_cppunittest) - self._run_category_suites('gtest', - preflight_run_method=self.preflight_gtest) self._run_category_suites('jittest') self._run_category_suites('mozbase') self._run_category_suites('mozmill', @@ -528,21 +515,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix for f in files: self.move(f, abs_res_dir) - def preflight_gtest(self, suites): - abs_res_dir = self.query_abs_res_dir() - abs_app_dir = self.query_abs_app_dir() - dirs = self.query_abs_dirs() - abs_gtest_dir = dirs['abs_gtest_dir'] - dirs['abs_test_bin_dir'] = os.path.join(dirs['abs_test_install_dir'], 'bin') - - files = glob.glob(os.path.join(dirs['abs_test_bin_plugins_dir'], 'gmp-*')) - files.append(os.path.join(abs_gtest_dir, 'dependentlibs.list.gtest')) - for f in files: - self.move(f, abs_res_dir) - - self.copytree(os.path.join(abs_gtest_dir, 'gtest_bin'), - os.path.join(abs_app_dir)) - def preflight_mozmill(self, suites): c = self.config dirs = self.query_abs_dirs() @@ -634,7 +606,7 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix # 3) checking to see if the return code is in success_codes success_codes = None - if self._is_windows() and suite_category != 'gtest': + if self._is_windows(): # bug 1120644 success_codes = [0, 1]