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

Unified Diff: chrome/test/data/nacl/manifest_file/irt_manifest_file_test.cc

Issue 133033002: Port manifest query tests from nacl_integration to browser_tests. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 6 years, 11 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
Index: chrome/test/data/nacl/manifest_file/irt_manifest_file_test.cc
diff --git a/ppapi/native_client/tests/nacl_browser/manifest_file/irt_manifest_file_test.cc b/chrome/test/data/nacl/manifest_file/irt_manifest_file_test.cc
similarity index 96%
rename from ppapi/native_client/tests/nacl_browser/manifest_file/irt_manifest_file_test.cc
rename to chrome/test/data/nacl/manifest_file/irt_manifest_file_test.cc
index 2c9ec51c10cee08cdf68b2094c888d0ae2074780..f158f3da4975621b1c2bdb3d19a6f29fcfe15dcc 100644
--- a/ppapi/native_client/tests/nacl_browser/manifest_file/irt_manifest_file_test.cc
+++ b/chrome/test/data/nacl/manifest_file/irt_manifest_file_test.cc
@@ -45,9 +45,9 @@ void load_manifest(TYPE_nacl_irt_query *query_func) {
str = "File Contents:\n";
- FILE *iob = fdopen(desc, "r");
char buffer[4096];
- while (fgets(buffer, sizeof buffer, iob) != NULL) {
+ int len;
+ while ((len = read(desc, buffer, sizeof buffer - 1)) > 0) {
// NB: fgets does not discard the newline nor any carriage return
// character before that.
//
@@ -76,10 +76,11 @@ void load_manifest(TYPE_nacl_irt_query *query_func) {
buffer[len-2] = '\n';
buffer[len-1] = '\0';
}
+ // Null terminate.
+ buffer[len] = 0;
str += buffer;
}
printf("file loaded: %s\n", str.c_str());
- fclose(iob); // closed desc
return;
}

Powered by Google App Engine
This is Rietveld 408576698