Build NaCl browser tests with GN

chrome/test/data/nacl/BUILD.gn

Index: chrome/test/data/nacl/BUILD.gn
diff --git a/chrome/test/data/nacl/BUILD.gn b/chrome/test/data/nacl/BUILD.gn
new file mode 100644
index 0000000000000000000000000000000000000000..f024c8acbb5b21aa4886160b81c180715439012c
--- /dev/null
+++ b/chrome/test/data/nacl/BUILD.gn
@@ -0,0 +1,635 @@
+# Copyright 2015 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.
+
+import("//build/config/features.gni")
+import("//build/config/nacl/config.gni")
+
+if (enable_nacl) {

[Roland McGrath, 2015/11/11 06:22:45]

Why nested if and double indentation instead of if (enable_nacl && is_nacl) ?

In fact, if !enable_nacl, there will never be an is_nacl incarnation, will
there?  So perhaps just if (is_nacl) is sufficient.  Or perhaps it would be
better to make it assert(is_nacl, "...") and no conditional on the body.  This
file shouldn't have any references to it that aren't in the right toolchain
context, should it?

[Dirk Pranke, 2015/11/11 22:19:05]

I agree that assert(is_nacl, "...") and no indentation is the way to go if
possible.

[Petr Hosek, 2015/11/13 22:18:33]

I've dropped enable_nacl but I can't drop is_nacl because the "nacl" group is
deps'ed in with a host toolchain.

[Dirk Pranke, 2015/11/13 23:00:57]

Ah, okay. 

It might be a bit clearer if you can move group("nacl") above the if block, then
(especially since the target name matches the directory name).

[Petr Hosek, 2015/11/17 01:31:58]

Done.

+  if (is_nacl) {
+    template("nacl_test_data") {
+      if (current_cpu == "pnacl") {
+        variant = "pnacl"
+      } else if (is_nacl_glibc) {
+        variant = "glibc"
+      } else {
+        variant = "newlib"
+      }
+
+      if (defined(invoker.sources)) {
+        if (defined(invoker.output_name)) {
+          base_target_name = invoker.output_name
+        } else {
+          base_target_name = target_name
+        }
+
+        if (current_cpu == "pnacl") {
+          suffix = "newlib_pnacl"
+        } else {
+          if (target_cpu == "x86") {
+            nmf_cpu = "x86"
+          } else if (target_cpu == "x64") {
+            nmf_cpu = "x86_64"
+          } else {
+            nmf_cpu = "arm"

[Roland McGrath, 2015/11/11 06:22:45]

Make it nmf_cpu = target_cpu unless you are going to assert arm.  And then you
can drop the explicit x86 if case too.

[Petr Hosek, 2015/11/13 22:18:33]

Done.

+          }
+          if (is_nacl_glibc) {
+            suffix = "glibc_${nmf_cpu}"

[Roland McGrath, 2015/11/11 06:22:45]

Could just be suffix = "${variant}_${nmf_cpu}"

In fact, target_cpu and current_cpu should always match in an is_nacl context, I
think.  And current_cpu is probably most proper to test regardless.  So the
whole thing can be:

if (current_cpu == "x64") { nmf_cpu = "x86_64" }
else { nmf_cpu = current_cpu }
suffixed_target_name = "${base_target_name}_${variant}_${nmf_cpu}"

[Petr Hosek, 2015/11/13 22:18:33]

Except that this breaks for pnacl in which case we end up with
"${base_target_name}_pnacl_pnacl".

+          } else {
+            suffix = "newlib_${nmf_cpu}"
+          }
+        }
+        suffixed_target_name = "${base_target_name}_${suffix}"
+
+        if (defined(invoker.generate_nmf)) {
+          generate_nmf = invoker.generate_nmf
+        } else {
+          generate_nmf = true
+        }
+
+        nexe_target_name = target_name + "_nexe"
+        nexe_copy_target_name = target_name + "_copy_nexe"
+        if (generate_nmf) {
+          nmf_target_name = target_name + "_nmf"
+        }
+      }
+
+      if (defined(invoker.test_files)) {
+        test_files_target_name = target_name + "_test_files"
+      }
+
+      destination_dir = "nacl_test_data"
+      if (defined(invoker.destination_dir)) {
+        destination_dir += "/${invoker.destination_dir}"
+      }
+
+      if (defined(invoker.sources)) {
+        executable(nexe_target_name) {
+          output_name = suffixed_target_name
+          sources = invoker.sources
+          if (defined(invoker.cflags)) {
+            cflags = invoker.cflags

[Roland McGrath, 2015/11/11 06:22:45]

Use forward_variables_from(invoker, ["cflags", "ldflags"]).

[Petr Hosek, 2015/11/13 22:18:33]

Done.

+          }
+          if (defined(invoker.ldflags)) {
+            ldflags = invoker.ldflags
+          }
+          deps = [
+            "//ppapi:ppapi_cpp_lib",
+            "//ppapi/native_client:ppapi_lib",
+          ]
+          if (is_nacl_glibc) {
+            libs = [ "pthread" ]

[Roland McGrath, 2015/11/11 06:22:45]

For C++, the compiler driver should take care of adding -lpthread, which needs
to come after the implicit -lstdc++ it adds.  So if you have to add anything,
it's -pthread to ldcflags (or perhaps just cflags).

[Petr Hosek, 2015/11/13 22:18:33]

Done.

+          } else {
+            deps += [
+              "//native_client/src/untrusted/nacl",
+              "//native_client/src/untrusted/pthread",
+            ]
+          }
+          if (defined(invoker.libs)) {
+            libs += invoker.libs

[Roland McGrath, 2015/11/11 06:22:45]

Without the "phtread" case if I'm right that that's not what you want, libs can
just be thrown into the forward_variables_from(...) above.

[Petr Hosek, 2015/11/13 22:18:33]

Removed as it's no longer needed.

+          }
+          if (defined(invoker.deps)) {
+            deps += invoker.deps
+          }
+        }
+
+        copy(nexe_copy_target_name) {
+          if (current_cpu == "pnacl") {
+            sources = [
+              "${root_out_dir}/${suffixed_target_name}.pexe",
+              "${root_out_dir}/${suffixed_target_name}.pexe.debug",

[Roland McGrath, 2015/11/11 06:22:45]

After a recent change to the pnacl toolchain definition, there is no longer a
.pexe.debug file.  Instead it's in exe.unstripped/foo.pexe analogous to where
the unstripped file goes for other toolchains.  But that only exists in the
is_debug case.

[Petr Hosek, 2015/11/13 22:18:33]

Done.

+            ]
+          } else {
+            sources = [
+              "${root_out_dir}/${suffixed_target_name}.nexe",

[Roland McGrath, 2015/11/11 06:22:45]

I think you can use {{output_extension}} to get .pexe or .nexe as appropriate to
the toolchain.

[Petr Hosek, 2015/11/13 22:18:33]

Unfortunately, {{output_extension}} only works within the toolchain definition.

+            ]
+          }
+          outputs = [
+            "${root_build_dir}/${destination_dir}/${variant}/{{source_file_part}}",
+          ]
+          deps = [
+            ":${nexe_target_name}",
+          ]
+        }
+      }
+
+      if (defined(invoker.sources) && generate_nmf) {
+        action(nmf_target_name) {
+          nmf = "${root_build_dir}/${destination_dir}/${variant}/${base_target_name}.nmf"
+          if (current_cpu == "pnacl") {
+            nexe = "$root_build_dir/${destination_dir}/${variant}/${suffixed_target_name}.pexe"

[Roland McGrath, 2015/11/11 06:22:45]

{{output_extension}}

[Petr Hosek, 2015/11/13 22:18:33]

ditto

+          } else {
+            nexe = "$root_build_dir/${destination_dir}/${variant}/${suffixed_target_name}.nexe"
+          }
+
+          objdump = rebase_path("${nacl_toolprefix}objdump")
+
+          script = "//native_client_sdk/src/tools/create_nmf.py"
+          sources = [
+            nexe,
+          ]
+          outputs = [
+            nmf,
+          ]
+          data = [
+            nexe,
+          ]
+          nmfflags = []
+          if (is_nacl_glibc) {

[Roland McGrath, 2015/11/11 06:22:45]

It would be nice to share all this create_nmf logic with the ppapi test BUILD.gn
code that does the same thing.  Can it be refactored into a template for a
generate_nmf action usable by all cases?

[Petr Hosek, 2015/11/13 22:18:33]

Done in https://codereview.chromium.org/1432313002/

+            nmfflags += [ "--library-path=" + rebase_path(root_out_dir) ]
+            if (current_cpu == "x86") {
+              nmfflags += [ "--library-path=" +
+                            rebase_path("${nacl_toolchain_tooldir}/lib32") ]
+              data += [ "$root_build_dir/lib32/" ]
+            }
+            if (target_cpu == "x64" || (target_cpu == "x86" && is_win)) {
+              nmfflags += [ "--library-path=" +
+                            rebase_path("${nacl_toolchain_tooldir}/lib") ]
+              data += [ "$root_build_dir/lib64/" ]
+            }
+            if (current_cpu == "arm") {
+              nmfflags += [ "--library-path=" +
+                            rebase_path("${nacl_toolchain_tooldir}/lib") ]
+              data += [ "$root_build_dir/lib/" ]
+            }
+            nmfflags += [
+              "--path-prefix=${base_target_name}_libs",
+
+              # TODO(phosek): move to a variable
+              "--stage-dependencies=" +
+                  rebase_path("${root_build_dir}/${destination_dir}/${variant}"),
+            ]
+          }
+          if (defined(invoker.nmfflags)) {
+            nmfflags += invoker.nmfflags
+          }
+          args = [
+                   "--no-default-libpath",
+                   "--objdump=" + objdump,
+                   "--output=" + rebase_path(nmf, root_build_dir),
+                 ] + nmfflags + rebase_path(sources, root_build_dir)
+          deps = [
+            ":${nexe_copy_target_name}",
+          ]
+          if (is_nacl_glibc && current_cpu == "arm") {
+            deps += [ "//native_client/src/untrusted/elf_loader:elf_loader" ]
+          }
+        }
+      }
+
+      if (defined(invoker.test_files)) {
+        copy(test_files_target_name) {
+          sources = invoker.test_files
+          outputs = [
+            "${root_build_dir}/${destination_dir}/${variant}/{{source_file_part}}",
+          ]
+          if (defined(invoker.sources)) {
+            deps = [
+              ":${nexe_target_name}",
+            ]
+          }
+        }
+      }
+
+      group(target_name) {
+        data_deps = []
+        if (defined(invoker.sources)) {
+          data_deps += [ ":${nexe_copy_target_name}" ]
+          if (generate_nmf) {
+            data_deps += [ ":${nmf_target_name}" ]
+          }
+        }
+        if (defined(invoker.test_files)) {
+          data_deps += [ ":${test_files_target_name}" ]
+        }
+      }
+    }
+
+    nacl_test_data("shared_test_files") {
+      test_files = [
+        # TODO(ncbray) move into chrome/test/data/nacl when all tests are
+        # converted.
+        "//ppapi/native_client/tools/browser_tester/browserdata/nacltest.js",
+
+        # files that aren't assosiated with any particular executable.
+        "bad/ppapi_bad.html",
+        "bad/ppapi_bad.js",
+        "bad/ppapi_bad_native.html",
+        "bad/ppapi_bad_doesnotexist.nmf",
+        "bad/ppapi_bad_magic.nmf",
+        "bad/ppapi_bad_manifest_uses_nexes.nmf",
+        "bad/ppapi_bad_manifest_bad_files.nmf",
+        "bad/ppapi_bad_manifest_nexe_arch.nmf",
+        "crash/ppapi_crash.js",
+        "crash/ppapi_crash_via_check_failure.html",
+        "crash/ppapi_crash_via_exit_call.html",
+        "crash/ppapi_crash_in_callback.html",
+        "crash/ppapi_crash_ppapi_off_main_thread.html",
+        "crash/ppapi_crash_off_main_thread.html",
+        "load_util.js",
+        "manifest_file/test_file.txt",
+        "progress_event_listener.js",
+        "simple_cc.js",
+      ]
+    }
+
+    nacl_test_data("simple_test") {
+      output_name = "simple"
+      sources = [
+        "simple.cc",
+      ]
+      test_files = [ "nacl_load_test.html" ]
+    }
+
+    nacl_test_data("exit_status_test") {
+      output_name = "pm_exit_status_test"
+      sources = [
+        "exit_status/pm_exit_status_test.cc",
+      ]
+      test_files = [ "exit_status/pm_exit_status_test.html" ]
+    }
+
+    nacl_test_data("extension_validation_cache") {
+      sources = [
+        "simple.cc",
+      ]
+
+      # Need a new directory to not clash with with other extension
+      # tests's files (e.g., manifest.json).
+      destination_dir = "extension_vcache_test"
+      test_files = [
+        # TODO(ncbray) move into chrome/test/data/nacl when all tests are
+        # converted.
+        "//ppapi/native_client/tools/browser_tester/browserdata/nacltest.js",
+        "extension_validation_cache/extension_validation_cache.html",
+        "extension_validation_cache/extension_validation_cache.js",
+
+        # Turns the test data directory into an extension.
+        # Use a different nexe_destination_dir to isolate the files.
+        # Note that the .nexe names are embedded in this file.
+        "extension_validation_cache/manifest.json",
+        "load_util.js",
+        "simple_cc.js",
+      ]
+    }
+
+    nacl_test_data("sysconf_nprocessors_onln_test") {
+      sources = [
+        "sysconf_nprocessors_onln/sysconf_nprocessors_onln_test.cc",
+      ]
+      test_files =
+          [ "sysconf_nprocessors_onln/sysconf_nprocessors_onln_test.html" ]
+    }
+
+    source_set("ppapi_test_lib") {
+      sources = [
+        # TODO(ncbray) move these files once SCons no longer depends on them.
+        "//ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.cc",
+        "//ppapi/native_client/tests/ppapi_test_lib/get_browser_interface.h",
+        "//ppapi/native_client/tests/ppapi_test_lib/internal_utils.cc",
+        "//ppapi/native_client/tests/ppapi_test_lib/internal_utils.h",
+        "//ppapi/native_client/tests/ppapi_test_lib/module_instance.cc",
+        "//ppapi/native_client/tests/ppapi_test_lib/test_interface.cc",
+        "//ppapi/native_client/tests/ppapi_test_lib/test_interface.h",
+        "//ppapi/native_client/tests/ppapi_test_lib/testable_callback.cc",
+        "//ppapi/native_client/tests/ppapi_test_lib/testable_callback.h",
+      ]
+      deps = [
+        "//native_client/src/shared/platform",
+        "//native_client/src/shared/gio",
+        "//ppapi/native_client:ppapi_lib",
+      ]
+    }
+
+    nacl_test_data("ppapi_progress_events") {
+      sources = [
+        "progress_events/ppapi_progress_events.cc",
+      ]
+      test_files = [ "progress_events/ppapi_progress_events.html" ]
+      deps = [
+        ":ppapi_test_lib",
+      ]
+    }
+
+    nacl_test_data("ppapi_bad_ppp_initialize") {
+      sources = [
+        "bad/ppapi_bad_ppp_initialize.cc",
+      ]
+    }
+
+    nacl_test_data("ppapi_bad_ppp_initialize_crash") {
+      sources = [
+        "bad/ppapi_bad_ppp_initialize_crash.cc",
+      ]
+    }
+
+    nacl_test_data("ppapi_bad_no_ppp_instance") {
+      sources = [
+        "bad/ppapi_bad_no_ppp_instance.cc",
+      ]
+      deps = [
+        "//native_client/src/shared/platform",
+      ]
+    }
+
+    nacl_test_data("ppapi_bad_get_ppp_instance_crash") {
+      sources = [
+        "bad/ppapi_bad_get_ppp_instance_crash.cc",
+      ]
+    }
+
+    nacl_test_data("ppapi_bad_ppp_instance_didcreate") {
+      sources = [
+        "bad/ppapi_bad_ppp_instance_didcreate.cc",
+      ]
+    }
+
+    nacl_test_data("ppapi_bad_ppp_instance_didcreate_crash") {
+      sources = [
+        "bad/ppapi_bad_ppp_instance_didcreate_crash.cc",
+      ]
+    }
+
+    nacl_test_data("ppapi_crash_via_check_failure") {
+      sources = [
+        "crash/ppapi_crash_via_check_failure.cc",
+      ]
+      deps = [
+        ":ppapi_test_lib",
+      ]
+    }
+
+    nacl_test_data("ppapi_crash_via_exit_call") {
+      sources = [
+        "crash/ppapi_crash_via_exit_call.cc",
+      ]
+      deps = [
+        ":ppapi_test_lib",
+      ]
+    }
+
+    nacl_test_data("ppapi_crash_in_callback") {
+      sources = [
+        "crash/ppapi_crash_in_callback.cc",
+      ]
+      deps = [
+        ":ppapi_test_lib",
+      ]
+    }
+
+    nacl_test_data("ppapi_crash_off_main_thread") {
+      sources = [
+        "crash/ppapi_crash_off_main_thread.cc",
+      ]
+      deps = [
+        ":ppapi_test_lib",
+      ]
+    }
+
+    nacl_test_data("ppapi_crash_ppapi_off_main_thread") {
+      sources = [
+        "crash/ppapi_crash_ppapi_off_main_thread.cc",
+      ]
+      deps = [
+        ":ppapi_test_lib",
+      ]
+    }
+
+    nacl_test_data("irt_manifest_file") {
+      sources = [
+        "manifest_file/irt_manifest_file_test.cc",
+      ]
+      nmfflags = [
+        "-xtest_file:test_file.txt",
+        "-xnmf says hello world:test_file.txt",
+
+        # There is no dummy_test_file.txt file intentionally. This is just for
+        # a test case where there is a manifest entry, but no actual file.
+        "-xdummy_test_file:dummy_test_file.txt",
+      ]
+      test_files = [ "manifest_file/irt_manifest_file_test.html" ]
+    }
+
+    nacl_test_data("irt_exception_test") {
+      sources = [
+        "irt_exception/irt_exception_test.cc",
+      ]
+      deps = [
+        ":ppapi_test_lib",
+        "//native_client/src/untrusted/nacl:nacl_exception",
+      ]
+      test_files = [ "irt_exception/irt_exception_test.html" ]
+    }
+
+    nacl_test_data("ppapi_extension_mime_handler") {
+      sources = [
+        "extension_mime_handler/ppapi_extension_mime_handler.cc",
+      ]
+      deps = [
+        ":ppapi_test_lib",
+      ]
+      test_files = [
+        "extension_mime_handler/ppapi_extension_mime_handler.html",
+        "extension_mime_handler/mime_test_data.dat",
+
+        # For faking the file's MIME type.
+        "extension_mime_handler/mime_test_data.dat.mock-http-headers",
+
+        # Turns the test data directory into an extension.  Hackish.
+        # Note that the .nexe names are embedded in this file.
+        "extension_mime_handler/manifest.json",
+      ]
+    }
+
+    nacl_test_data("pnacl_debug_url_test") {
+      output_name = "pnacl_debug_url"
+      sources = [
+        "simple.cc",
+      ]
+      generate_nmf = false
+      test_files = [
+        "pnacl_debug_url/pnacl_debug_url.html",
+        "pnacl_debug_url/pnacl_has_debug.nmf",
+        "pnacl_debug_url/pnacl_has_debug_flag_off.nmf",
+        "pnacl_debug_url/pnacl_no_debug.nmf",
+      ]
+    }
+
+    nacl_test_data("pnacl_error_handling_test") {
+      output_name = "pnacl_errors"
+      sources = [
+        "simple.cc",
+      ]
+      generate_nmf = false
+      test_files = [
+        "pnacl_error_handling/pnacl_error_handling.html",
+        "pnacl_error_handling/bad.pexe",
+        "pnacl_error_handling/pnacl_bad_pexe.nmf",
+        "pnacl_error_handling/pnacl_bad_pexe_O0.nmf",
+        "pnacl_error_handling/pnacl_bad_doesnotexist.nmf",
+        "pnacl_error_handling/pnacl_illformed_manifest.nmf",
+        "pnacl_error_handling/pnacl_nonfinal_pexe_O0.nmf",
+      ]
+    }
+
+    nacl_test_data("pnacl_mime_type_test") {
+      test_files = [ "pnacl_mime_type/pnacl_mime_type.html" ]
+    }
+
+    nacl_test_data("pnacl_options_test") {
+      output_name = "pnacl_options"
+      sources = [
+        "simple.cc",
+      ]
+      generate_nmf = false
+      test_files = [
+        "pnacl_nmf_options/pnacl_options.html",
+        "pnacl_nmf_options/pnacl_o_0.nmf",
+        "pnacl_nmf_options/pnacl_o_2.nmf",
+        "pnacl_nmf_options/pnacl_o_large.nmf",
+      ]
+    }
+
+    nacl_test_data("pnacl_dyncode_syscall_disabled_test") {
+      output_name = "pnacl_dyncode_syscall_disabled"
+      sources = [
+        "pnacl_dyncode_syscall_disabled/pnacl_dyncode_syscall_disabled.cc",
+      ]
+      deps = [
+        ":ppapi_test_lib",
+        "//native_client/src/untrusted/nacl:nacl_dyncode_private",
+      ]
+      test_files = [ "pnacl_dyncode_syscall_disabled/pnacl_dyncode_syscall_disabled.html" ]
+    }
+
+    nacl_test_data("pnacl_hw_eh_disabled_test") {
+      output_name = "pnacl_hw_eh_disabled"
+      sources = [
+        "pnacl_hw_eh_disabled/pnacl_hw_eh_disabled.cc",
+      ]
+      deps = [
+        ":ppapi_test_lib",
+        "//native_client/src/untrusted/nacl:nacl_exception_private",
+      ]
+      test_files = [ "pnacl_hw_eh_disabled/pnacl_hw_eh_disabled.html" ]
+    }
+
+    # Legacy NaCl PPAPI interface tests being here.
+    nacl_test_data("ppapi_ppb_core") {
+      sources = [
+        "ppapi/ppb_core/ppapi_ppb_core.cc",
+      ]
+      deps = [
+        ":ppapi_test_lib",
+      ]
+      test_files = [ "ppapi/ppb_core/ppapi_ppb_core.html" ]
+    }
+
+    nacl_test_data("ppapi_ppb_instance") {
+      sources = [
+        "ppapi/ppb_instance/ppapi_ppb_instance.cc",
+      ]
+      deps = [
+        ":ppapi_test_lib",
+      ]
+      test_files = [ "ppapi/ppb_instance/ppapi_ppb_instance.html" ]
+    }
+
+    nacl_test_data("ppapi_ppp_instance") {
+      sources = [
+        "ppapi/ppp_instance/ppapi_ppp_instance.cc",
+      ]
+      deps = [
+        ":ppapi_test_lib",
+      ]
+      test_files = [
+        "ppapi/ppp_instance/ppapi_ppp_instance.html",
+        "ppapi/ppp_instance/ppapi_ppp_instance.js",
+      ]
+    }
+
+    if (target_cpu != "arm") {
+      # Source file does not have asm for ARM.

[Roland McGrath, 2015/11/11 06:22:45]

Probably easy to add it and make this unconditional.

[Petr Hosek, 2015/11/13 22:18:33]

That would have to be done on the NaCl side though.

+      nacl_test_data("partly_invalid") {
+        sources = [
+          "//native_client/tests/stubout_mode/partly_invalid.c",
+        ]
+        if (target_cpu == "mipsel") {
+          cflags = [
+            "--pnacl-mips-bias",
+            "-arch",
+            "mips32",
+            "--pnacl-allow-translate",
+          ]
+          ldflags = [ "--pnacl-allow-native" ]
+        }
+      }
+    }
+  }
+
+  group("nacl") {
+    deps = [

[Roland McGrath, 2015/11/11 06:22:45]

It might be easier to read this list if you used a local variable for each of
the full toolchain names, e.g. ":foo($newlib)", ":foo($glibc)", ":foo($pnacl)".

[Petr Hosek, 2015/11/13 22:18:33]

Done.

+      ":shared_test_files(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":shared_test_files(//build/toolchain/nacl:glibc_${target_cpu})",
+      ":shared_test_files(//build/toolchain/nacl:newlib_pnacl)",
+      ":simple_test(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":simple_test(//build/toolchain/nacl:glibc_${target_cpu})",
+      ":simple_test(//build/toolchain/nacl:newlib_pnacl)",
+      ":exit_status_test(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":exit_status_test(//build/toolchain/nacl:glibc_${target_cpu})",
+      ":exit_status_test(//build/toolchain/nacl:newlib_pnacl)",
+      ":extension_validation_cache(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":extension_validation_cache(//build/toolchain/nacl:glibc_${target_cpu})",
+      ":sysconf_nprocessors_onln_test(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":sysconf_nprocessors_onln_test(//build/toolchain/nacl:glibc_${target_cpu})",
+      ":sysconf_nprocessors_onln_test(//build/toolchain/nacl:newlib_pnacl)",
+      ":ppapi_progress_events(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":ppapi_progress_events(//build/toolchain/nacl:glibc_${target_cpu})",
+      ":ppapi_progress_events(//build/toolchain/nacl:newlib_pnacl)",
+      ":ppapi_bad_ppp_initialize(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":ppapi_bad_ppp_initialize_crash(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":ppapi_bad_no_ppp_instance(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":ppapi_bad_get_ppp_instance_crash(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":ppapi_bad_ppp_instance_didcreate(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":ppapi_bad_ppp_instance_didcreate_crash(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":ppapi_crash_via_check_failure(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":ppapi_crash_via_check_failure(//build/toolchain/nacl:glibc_${target_cpu})",
+      ":ppapi_crash_via_check_failure(//build/toolchain/nacl:newlib_pnacl)",
+      ":ppapi_crash_via_exit_call(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":ppapi_crash_via_exit_call(//build/toolchain/nacl:glibc_${target_cpu})",
+      ":ppapi_crash_via_exit_call(//build/toolchain/nacl:newlib_pnacl)",
+      ":ppapi_crash_in_callback(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":ppapi_crash_in_callback(//build/toolchain/nacl:glibc_${target_cpu})",
+      ":ppapi_crash_in_callback(//build/toolchain/nacl:newlib_pnacl)",
+      ":ppapi_crash_off_main_thread(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":ppapi_crash_off_main_thread(//build/toolchain/nacl:glibc_${target_cpu})",
+      ":ppapi_crash_off_main_thread(//build/toolchain/nacl:newlib_pnacl)",
+      ":ppapi_crash_ppapi_off_main_thread(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":ppapi_crash_ppapi_off_main_thread(//build/toolchain/nacl:glibc_${target_cpu})",
+      ":ppapi_crash_ppapi_off_main_thread(//build/toolchain/nacl:newlib_pnacl)",
+      ":irt_manifest_file(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":irt_exception_test(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":irt_exception_test(//build/toolchain/nacl:glibc_${target_cpu})",
+      ":irt_exception_test(//build/toolchain/nacl:newlib_pnacl)",
+      ":ppapi_extension_mime_handler(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":pnacl_debug_url_test(//build/toolchain/nacl:newlib_pnacl)",
+      ":pnacl_error_handling_test(//build/toolchain/nacl:newlib_pnacl)",
+      ":pnacl_mime_type_test(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":pnacl_mime_type_test(//build/toolchain/nacl:glibc_${target_cpu})",
+      ":pnacl_mime_type_test(//build/toolchain/nacl:newlib_pnacl)",
+      ":pnacl_options_test(//build/toolchain/nacl:newlib_pnacl)",
+      ":pnacl_dyncode_syscall_disabled_test(//build/toolchain/nacl:newlib_pnacl)",
+      ":pnacl_hw_eh_disabled_test(//build/toolchain/nacl:newlib_pnacl)",
+      ":ppapi_ppb_core(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":ppapi_ppb_core(//build/toolchain/nacl:glibc_${target_cpu})",
+      ":ppapi_ppb_core(//build/toolchain/nacl:newlib_pnacl)",
+      ":ppapi_ppb_instance(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":ppapi_ppb_instance(//build/toolchain/nacl:glibc_${target_cpu})",
+      ":ppapi_ppb_instance(//build/toolchain/nacl:newlib_pnacl)",
+      ":ppapi_ppp_instance(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+      ":ppapi_ppp_instance(//build/toolchain/nacl:glibc_${target_cpu})",
+      ":ppapi_ppp_instance(//build/toolchain/nacl:newlib_pnacl)",
+      ":partly_invalid(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+    ]
+  }
+}