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

Unified Diff: ppapi/tests/testing_instance.cc

Issue 7049021: Adjust PPAPI tests so they can also be run in the NaCl build using PyAuto. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 months 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
« no previous file with comments | « ppapi/tests/test_utils.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/tests/testing_instance.cc
===================================================================
--- ppapi/tests/testing_instance.cc (revision 86338)
+++ ppapi/tests/testing_instance.cc (working copy)
@@ -53,7 +53,10 @@
}
pp::Var TestingInstance::GetInstanceObject() {
- return current_case_->GetTestObject();
+ if (current_case_)
+ return current_case_->GetTestObject();
+
+ return pp::Var(this, NULL);
}
void TestingInstance::HandleMessage(const pp::Var& message_data) {
@@ -115,6 +118,10 @@
errors_.append("FAIL: Only listed tests");
} else {
current_case_->RunTest();
+ // Automated PyAuto tests rely on finding the exact strings below.
+ LogHTML(errors_.empty() ?
+ "<span class=\"pass\">[SHUTDOWN]</span> All tests passed." :
+ "<span class=\"fail\">[SHUTDOWN]</span> Some tests failed.");
}
// Declare we're done by setting a cookie to either "PASS" or the errors.
« no previous file with comments | « ppapi/tests/test_utils.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698