125386 2013-12-07 09:07:34 -0800 [GTK] Run each gtest subtest separately instead of in one go 2013-12-07 09:36:47 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 gustavo gustavo oldest_to_newest 957514 0 gustavo 2013-12-07 09:07:34 -0800 [GTK] Run each gtest subtest separately instead of in one go 957515 1 218657 gustavo 2013-12-07 09:09:04 -0800 Created attachment 218657 Patch 957516 2 218657 mrobinson 2013-12-07 09:16:08 -0800 Comment on attachment 218657 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=218657&action=review Looks good. Just a few nit-picking code organization suggestions... > Tools/Scripts/run-gtk-tests:327 > def _run_test_google(self, test_program): Maybe rename this to _run_google_test_suite? > Tools/Scripts/run-gtk-tests:345 > + try: > + output = subprocess.check_output([test_program, '--gtest_list_tests']) > + except subprocess.CalledProcessError: > + sys.stderr.write("ERROR: could not list available tests for binary %s.\n" % (test_program)) > + sys.stderr.flush() > + return 1 > > - return self._run_test_command(tester_command, self._options.timeout) > + available_tests = [] > + prefix = None > + for line in output.split('\n'): > + if not line.startswith(' '): > + prefix = line > + continue > + else: > + available_tests.append(prefix + line.strip()) > + > + skipped_test_cases = self._test_cases_to_skip(test_program) > + Do you mind splitting this off into a helper method? > Tools/Scripts/run-gtk-tests:352 > + if not test in skipped_test_cases: > + test_command = [test_program, '--gtest_filter=%s' % (test)] > + retcode = self._run_test_command(test_command, self._options.timeout) > + if retcode: > + return retcode > + And then this can be split off into a helper called run_google_test 957518 3 gustavo 2013-12-07 09:36:47 -0800 Committed r160274: <http://trac.webkit.org/changeset/160274> 218657 2013-12-07 09:09:04 -0800 2013-12-07 09:16:08 -0800 Patch bug-125386-20131207180902.patch text/plain 2745 gustavo U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwMjcwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzNhYjU4ZWZjMmVlYWQxMzJkNTNjMGExZjMyMTczMDEz Nzg4NTNiZS4uNzI1NDk3Njk0YzJhNGYwZDlmMzQ4MjlhOWVlNDM1NDNkZGU4ZTI2ZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDEzLTEyLTA3ICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxnbnNAZ25vbWUub3JnPgor CisgICAgICAgIFtHVEtdIFJ1biBlYWNoIGd0ZXN0IHN1YnRlc3Qgc2VwYXJhdGVseSBpbnN0ZWFk IG9mIGluIG9uZSBnbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTI1Mzg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgVGhpcyBpcyB3aGF0IG90aGVyIHBvcnRzIGFyZSBkb2luZyAoZXhjZXB0IHRoZXkgYnVp bGQgZWFjaCB0ZXN0IGFzIGEgc2VwYXJhdGUgYmluYXJ5KQorICAgICAgICBhbmQgd2lsbCBoZWxw IHdpdGggdGhlIHRpbWVvdXRzIHdlIHNvbWV0aW1lcyBoaXQgYmVjYXVzZSBpdCBhcHBsaWVzIHRv IHRoZSBmdWxsIHRlc3QKKyAgICAgICAgcnVuLgorCisgICAgICAgICogU2NyaXB0cy9ydW4tZ3Rr LXRlc3RzOgorICAgICAgICAoVGVzdFJ1bm5lci5fcnVuX3Rlc3RfZ29vZ2xlKTogZ2V0IGEgbGlz dCBvZiBhdmFpbGFibGUgc3ViLXRlc3RzLCBhbmQgY2FsbCB0aGUgYmluYXJ5CisgICAgICAgIG9u Y2UgcGVyIHRlc3QuCisKIDIwMTMtMTItMDYgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNv bT4KIAogICAgICAgICBbTWFjXSBNaW5pQnJvd3NlciBEZWJ1ZyBidWlsZHMgYXJlIGNvbXBpbGVk IHdpdGggLU9zCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3J1bi1ndGstdGVzdHMgYi9Ub29s cy9TY3JpcHRzL3J1bi1ndGstdGVzdHMKaW5kZXggNjJlMzg4Mjk1OTAzNWM2ZmZhODEwNzBkN2Q2 Mjk0ZTIzZDIxN2UyYy4uYjc3OTZlZjJjZTg3ZjdlMjI2NmZkMzE3MDgxYTljNTQzN2Q3NmIxZCAx MDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9ydW4tZ3RrLXRlc3RzCisrKyBiL1Rvb2xzL1Njcmlw dHMvcnVuLWd0ay10ZXN0cwpAQCAtMzI1LDEyICszMjUsMzIgQEAgY2xhc3MgVGVzdFJ1bm5lcjoK ICAgICAgICAgcmV0dXJuIHNlbGYuX3J1bl90ZXN0X2NvbW1hbmQodGVzdGVyX2NvbW1hbmQsIHNl bGYuX29wdGlvbnMudGltZW91dCkKIAogICAgIGRlZiBfcnVuX3Rlc3RfZ29vZ2xlKHNlbGYsIHRl c3RfcHJvZ3JhbSk6Ci0gICAgICAgIHRlc3Rlcl9jb21tYW5kID0gW3Rlc3RfcHJvZ3JhbV0KLSAg ICAgICAgc2tpcHBlZF90ZXN0c19jYXNlcyA9IHNlbGYuX3Rlc3RfY2FzZXNfdG9fc2tpcCh0ZXN0 X3Byb2dyYW0pCi0gICAgICAgIGlmIHNraXBwZWRfdGVzdHNfY2FzZXM6Ci0gICAgICAgICAgICB0 ZXN0ZXJfY29tbWFuZC5hcHBlbmQoIi0tZ3Rlc3RfZmlsdGVyPS0lcyIgJSAiOiIuam9pbihza2lw cGVkX3Rlc3RzX2Nhc2VzKSkKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgb3V0cHV0ID0gc3Vi cHJvY2Vzcy5jaGVja19vdXRwdXQoW3Rlc3RfcHJvZ3JhbSwgJy0tZ3Rlc3RfbGlzdF90ZXN0cydd KQorICAgICAgICBleGNlcHQgc3VicHJvY2Vzcy5DYWxsZWRQcm9jZXNzRXJyb3I6CisgICAgICAg ICAgICBzeXMuc3RkZXJyLndyaXRlKCJFUlJPUjogY291bGQgbm90IGxpc3QgYXZhaWxhYmxlIHRl c3RzIGZvciBiaW5hcnkgJXMuXG4iICUgKHRlc3RfcHJvZ3JhbSkpCisgICAgICAgICAgICBzeXMu c3RkZXJyLmZsdXNoKCkKKyAgICAgICAgICAgIHJldHVybiAxCiAKLSAgICAgICAgcmV0dXJuIHNl bGYuX3J1bl90ZXN0X2NvbW1hbmQodGVzdGVyX2NvbW1hbmQsIHNlbGYuX29wdGlvbnMudGltZW91 dCkKKyAgICAgICAgYXZhaWxhYmxlX3Rlc3RzID0gW10KKyAgICAgICAgcHJlZml4ID0gTm9uZQor ICAgICAgICBmb3IgbGluZSBpbiBvdXRwdXQuc3BsaXQoJ1xuJyk6CisgICAgICAgICAgICBpZiBu b3QgbGluZS5zdGFydHN3aXRoKCcgICcpOgorICAgICAgICAgICAgICAgIHByZWZpeCA9IGxpbmUK KyAgICAgICAgICAgICAgICBjb250aW51ZQorICAgICAgICAgICAgZWxzZToKKyAgICAgICAgICAg ICAgICBhdmFpbGFibGVfdGVzdHMuYXBwZW5kKHByZWZpeCArIGxpbmUuc3RyaXAoKSkKKworICAg ICAgICBza2lwcGVkX3Rlc3RfY2FzZXMgPSBzZWxmLl90ZXN0X2Nhc2VzX3RvX3NraXAodGVzdF9w cm9ncmFtKQorCisgICAgICAgIGZvciB0ZXN0IGluIGF2YWlsYWJsZV90ZXN0czoKKyAgICAgICAg ICAgIGlmIG5vdCB0ZXN0IGluIHNraXBwZWRfdGVzdF9jYXNlczoKKyAgICAgICAgICAgICAgICB0 ZXN0X2NvbW1hbmQgPSBbdGVzdF9wcm9ncmFtLCAnLS1ndGVzdF9maWx0ZXI9JXMnICUgKHRlc3Qp XQorICAgICAgICAgICAgICAgIHJldGNvZGUgPSBzZWxmLl9ydW5fdGVzdF9jb21tYW5kKHRlc3Rf Y29tbWFuZCwgc2VsZi5fb3B0aW9ucy50aW1lb3V0KQorICAgICAgICAgICAgICAgIGlmIHJldGNv ZGU6CisgICAgICAgICAgICAgICAgICAgIHJldHVybiByZXRjb2RlCisKKyAgICAgICAgcmV0dXJu IDAKIAogICAgIGRlZiBfcnVuX3Rlc3Qoc2VsZiwgdGVzdF9wcm9ncmFtKToKICAgICAgICAgaWYg InVuaXR0ZXN0cyIgaW4gdGVzdF9wcm9ncmFtIG9yICJXZWJLaXQyQVBJVGVzdHMiIGluIHRlc3Rf cHJvZ3JhbToK