Build PPAPI NaCl Glibc tests with GN

ppapi/BUILD.gn

 # 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.
 
 copy("copy_test_files") {
   visibility = [ ":*" ]
   sources = [
     # Keep "test_case.html.mock-http-headers" with "test_case.html".
     "tests/ppapi_nacl_tests_newlib.nmf",
     "tests/test_case.html",
@@ skipping 10 matching lines @@
   visibility = [ ":*" ]
   sources = [
     "tests/test_url_loader_data/hello.txt",
   ]
   outputs = [
     "$root_out_dir/test_url_loader_data/{{source_file_part}}",
   ]
 }
 
 import("//build/config/features.gni")
+import("//build/config/nacl/config.gni")
 import("//ppapi/ppapi_sources.gni")
 import("//testing/test.gni")
 
 shared_library("ppapi_tests") {
   sources = ppapi_sources.test_common_source_files +
             ppapi_sources.test_trusted_source_files
 
   configs += [ "//build/config:precompiled_headers" ]
   defines = [ "GL_GLEXT_PROTOTYPES" ]
   include_dirs = [ "lib/gl/include" ]
@@ skipping 102 matching lines @@
     "//build/config/sanitizers:deps",
   ]
 }
 
 source_set("ppapi_cpp_lib") {
   sources = ppapi_sources.cpp_source_files
   sources += [
     "cpp/module_embedder.h",
     "cpp/ppp_entrypoints.cc",
   ]
+  deps = [
+    "//build/config/nacl:nacl_base",
+  ]
 }
 
 source_set("ppapi_gles2_lib") {
   include_dirs = [ "lib/gl/include" ]
   sources = [
     "lib/gl/gles2/gl2ext_ppapi.c",
     "lib/gl/gles2/gl2ext_ppapi.h",
     "lib/gl/gles2/gles2.c",
   ]
   deps = [
     "//ppapi/cpp",
   ]
 }
 
 if (enable_nacl) {
   if (is_nacl) {
-    executable("ppapi_nacl_tests_newlib") {
-      include_dirs = [
-        "lib/gl/include",
-        "..",
+    shared_library("ppapi_cpp_lib_shared") {
+      # When using gcc, we hide all symbols by default, but that breaks at
+      # link time as the test executable requires symbols defined in the
+      # shared library.
+      if (is_nacl_glibc) {
+        configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
+      }
+
+      sources = ppapi_sources.cpp_source_files
+      sources += [
+        "cpp/module_embedder.h",
+        "cpp/ppp_entrypoints.cc",
       ]
+      cflags = [ "-fPIC" ]
+      deps = [
+        "//build/config/nacl:nacl_base",
+      ]
+    }
 
+    executable("ppapi_nacl_tests") {
+      # When using gcc, we hide all symbols by default, but that breaks at
+      # link time as the shared library references pp::CreateModule method
+      # defined by the test executable.

[Roland McGrath, 2015/09/17 18:16:52]

Fine enough I guess, though it seems like it might be both cleaner and easier to
grok if the needed exports were just marked explicitly in the source.

[Petr Hosek, 2015/09/17 21:54:08]

Done.

+      if (is_nacl_glibc) {
+        configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
+      }
+
+      include_dirs = [ "lib/gl/include" ]
       sources = ppapi_sources.test_common_source_files +
                 ppapi_sources.test_nacl_source_files
-
       defines = [ "GL_GLEXT_PROTOTYPES" ]
-
+      ldflags = [ "-pthread" ]
       deps = [
-        ":ppapi_cpp_lib",
+        "//build/config/nacl:nacl_base",
         "//ppapi/native_client:ppapi_lib",
       ]
+      if (is_nacl_glibc) {
+        deps += [ ":ppapi_cpp_lib_shared" ]
+      } else {
+        deps += [ ":ppapi_cpp_lib" ]
+      }
     }
 
     copy("nacl_tests_copy") {
       sources = [
-        "${root_out_dir}/ppapi_nacl_tests_newlib.nexe",
+        "${root_out_dir}/ppapi_nacl_tests.nexe",
       ]
+      if (is_nacl_glibc) {
+        suffix = "glibc"
+      } else {
+        suffix = "newlib"
+      }
       outputs = [
-        "${root_build_dir}/{{source_name_part}}_${target_cpu}.nexe",
+        "${root_build_dir}/{{source_name_part}}_${target_cpu}_${suffix}.nexe",
       ]
       deps = [
-        ":ppapi_nacl_tests_newlib",
+        ":ppapi_nacl_tests",
+      ]
+    }
+
+    action("generate_nmf") {
+      nacl_toolchain_dir = rebase_path("//native_client/toolchain")
+      os_toolchain_dir = "${nacl_toolchain_dir}/${host_os}_x86"
+      if (is_nacl_glibc) {
+        toolchain_dir = "${os_toolchain_dir}/nacl_x86_glibc"
+        nmf = "${root_build_dir}/ppapi_nacl_tests_glibc.nmf"
+      } else {
+        toolchain_dir = "${os_toolchain_dir}/nacl_x86_newlib"
+        nmf = "${root_build_dir}/ppapi_nacl_tests_newlib.nmf"
+      }
+      script = "//native_client_sdk/src/tools/create_nmf.py"
+      sources = get_target_outputs(":nacl_tests_copy")
+      outputs = [
+        nmf,
+      ]
+      nmf_flags = []
+      if (is_nacl_glibc) {
+        nmf_flags += [ "--library-path=" + rebase_path(root_out_dir) ]
+        if (current_cpu == "x86") {
+          nmf_flags += [ "--library-path=" +
+                         rebase_path("${toolchain_dir}/x86_64-nacl/lib32",
+                                     root_build_dir) ]
+        }
+        if (target_cpu == "x64" || (target_cpu == "x86" && is_win)) {
+          nmf_flags += [ "--library-path=" +
+                         rebase_path("${toolchain_dir}/x86_64-nacl/lib",
+                                     root_build_dir) ]
+        }
+      }
+      args = [
+               "--no-default-libpath",
+               "--objdump=${toolchain_dir}/bin/x86_64-nacl-objdump",
+               "--output=" + rebase_path(nmf, root_build_dir),
+               "--stage-dependencies=" + rebase_path(root_build_dir),
+             ] + nmf_flags + rebase_path(sources, root_build_dir)
+      deps = [
+        ":nacl_tests_copy",
       ]
     }
   }
 
-  group("ppapi_nacl_tests") {
+  group("ppapi_nacl_tests_all") {
     deps = []
     if (target_cpu == "x86" || target_cpu == "x64") {
-      deps += [ ":nacl_tests_copy(//build/toolchain/nacl:clang_newlib_${target_cpu})" ]
+      deps += [
+        ":nacl_tests_copy(//build/toolchain/nacl:clang_newlib_${target_cpu})",
+        ":generate_nmf(//build/toolchain/nacl:glibc_${target_cpu})",
+      ]
     }
   }
 }