Update from https://crrev.com/317530

mojo/tools/get_test_list.py

 #!/usr/bin/env python
 # 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.
 
 """Central list of tests to run (as appropriate for a given config). Add tests
 to run by modifying this file.
 
 Note that this file is both imported (by mojob.py) and run directly (via a
 recipe)."""
@@ skipping 162 matching lines @@
                   build_dir, "mojob_test_successes"])
     AddXvfbEntry("Dart App tests",
                  [os.path.join("mojo", "tools", "apptest_runner.py"),
                   os.path.join("mojo", "tools", "data", "dart_apptests"),
                   build_dir])
 
   # NaCl tests:
   if ShouldRunTest("nacl"):
     AddEntry("NaCl tests",
              [os.path.join(build_dir, "monacl_shell"),
-              os.path.join(build_dir, "irt_" + config.target_arch,
+              os.path.join(build_dir, "irt_" + config.target_cpu,
                            "irt_mojo.nexe"),
-              os.path.join(build_dir, "clang_newlib_" + config.target_arch,
+              os.path.join(build_dir, "clang_newlib_" + config.target_cpu,
                            "monacl_test.nexe")])
 
   # ----------------------------------------------------------------------------
 
   return test_list
 
 
 def main():
   parser = argparse.ArgumentParser(description="Gets tests to execute.")
   parser.add_argument("config_file", metavar="config.json",
                       type=argparse.FileType("rb"),
                       help="Input JSON file with test configuration.")
   parser.add_argument("test_list_file", metavar="test_list.json", nargs="?",
                       type=argparse.FileType("wb"), default=sys.stdout,
                       help="Output JSON file with test list.")
   args = parser.parse_args()
 
   config = Config(**json.load(args.config_file))
   test_list = GetTestList(config)
   json.dump(test_list, args.test_list_file, indent=2)
   args.test_list_file.write("\n")
 
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())