Add failure case for manifest file testing.

chrome/test/data/nacl/manifest_file/irt_manifest_file_test.cc

 /*
  * Copyright 2014 The Chromium Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 //
 // Test for resource open before PPAPI initialization.
 //
 
 #include <stdio.h>
 #include <string.h>
 
+#include <sstream>
 #include <string>
-#include <sstream>
+#include <vector>
 
 #include "native_client/src/untrusted/irt/irt.h"
 #include "native_client/src/untrusted/nacl/nacl_irt.h"
 
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/var.h"
+#include "ppapi/cpp/var_array.h"
 #include "ppapi/native_client/src/shared/ppapi_proxy/ppruntime.h"
 
-std::string str;
 
-void load_manifest(TYPE_nacl_irt_query *query_func) {
+std::vector<std::string> result;
+
+std::string LoadManifestSuccess(TYPE_nacl_irt_query *query_func) {
   struct nacl_irt_resource_open nacl_irt_resource_open;
   if (sizeof(nacl_irt_resource_open) !=
       (*query_func)(
           NACL_IRT_RESOURCE_OPEN_v0_1,
           &nacl_irt_resource_open,
           sizeof(nacl_irt_resource_open))) {
-    str = "irt manifest api not found";
-    return;
+    return "irt manifest api not found";
   }
   int desc;
   int error;
   error = nacl_irt_resource_open.open_resource("test_file", &desc);
   if (0 != error) {
-    str = "Can't open file";
     printf("Can't open file, error=%d", error);
-    return;
+    return "Can't open file";
   }
 
-  str = "File Contents:\n";
+  std::string str = "File Contents:\n";
 
   char buffer[4096];
   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.
     //
     // Note that CR LF is the default end-of-line style for Windows.
     // Furthermore, when the test_file (input data, which happens to
     // be the nmf file) is initially created in a change list, the
@@ skipping 17 matching lines @@
     int len = strlen(buffer);
     if (len >= 2 && buffer[len-1] == '\n' && buffer[len-2] == '\r') {
       buffer[len-2] = '\n';
       buffer[len-1] = '\0';
     }
     // Null terminate.
     buffer[len] = 0;
     str += buffer;
   }
   printf("file loaded: %s\n", str.c_str());
-  return;
+  return str;
+}
+
+std::string LoadManifestNonExistentEntry(
+    TYPE_nacl_irt_query *query_func) {
+  struct nacl_irt_resource_open nacl_irt_resource_open;
+  if (sizeof(nacl_irt_resource_open) !=
+      (*query_func)(
+          NACL_IRT_RESOURCE_OPEN_v0_1,
+          &nacl_irt_resource_open,
+          sizeof(nacl_irt_resource_open))) {
+    return "irt manifest api not found";
+  }
+
+  int desc;
+  int error = nacl_irt_resource_open.open_resource("non_existent_entry", &desc);
+  char buf[80];
+  snprintf(buf, sizeof(buf), "open_resource() result: %d", error);

[Mark Seaborn, 2014/05/29 16:55:48]

Rather than always formatting the numeric errno message, how about checking it
here?  Something like:

if (errno != EINVAL) {
  // Format failure message: snprintf etc...
  return buf;
}
return "passed";

[hidehiko, 2014/05/30 04:49:58]

Done.

+  return std::string(buf);
+}
+
+std::string LoadManifestNonExistentFile(
+    TYPE_nacl_irt_query *query_func) {
+  struct nacl_irt_resource_open nacl_irt_resource_open;
+  if (sizeof(nacl_irt_resource_open) !=
+      (*query_func)(
+          NACL_IRT_RESOURCE_OPEN_v0_1,
+          &nacl_irt_resource_open,
+          sizeof(nacl_irt_resource_open))) {
+    return "irt manifest api not found";
+  }
+
+  int desc;
+  int error = nacl_irt_resource_open.open_resource("dummy_test_file", &desc);
+  char buf[80];
+  snprintf(buf, sizeof(buf), "open_resource() result: %d", error);

[Mark Seaborn, 2014/05/29 16:55:48]

Same here

[hidehiko, 2014/05/30 04:49:58]

Done.

+  return std::string(buf);
 }
 
 class TestInstance : public pp::Instance {
  public:
   explicit TestInstance(PP_Instance instance) : pp::Instance(instance) {}
   virtual ~TestInstance() {}
   virtual void HandleMessage(const pp::Var& var_message) {
     if (!var_message.is_string()) {
       return;
     }
     if (var_message.AsString() != "hello") {
       return;
     }
-    pp::Var reply = pp::Var(str);
+    pp::VarArray reply = pp::VarArray();
+    for (size_t i = 0; i < result.size(); ++i) {
+      reply.Set(i, pp::Var(result[i]));
+    }
     PostMessage(reply);
   }
 };
 
 class TestModule : public pp::Module {
  public:
   TestModule() : pp::Module() {}
   virtual ~TestModule() {}
 
   virtual pp::Instance* CreateInstance(PP_Instance instance) {
     return new TestInstance(instance);
   }
 };
 
 namespace pp {
 Module* CreateModule() {
   return new TestModule();
 }
 }
 
 int main() {
-  load_manifest(&__nacl_irt_query);
+  result.push_back(LoadManifestSuccess(&__nacl_irt_query));
+  result.push_back(LoadManifestNonExistentEntry(&__nacl_irt_query));
+  result.push_back(LoadManifestNonExistentFile(&__nacl_irt_query));
   return PpapiPluginMain();
 }
-