Currently, bionic only build a subset of the examples. This changes turns on all the examples and tests compiling those examples.

BUG=344574
R=sbc@chromium.org, binji@chromium.org

Review URL: https://codereview.chromium.org/339393005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284165 0039d316-1c4b-4281-b951-d872f2087c98

25 files changed, 40 insertions, 28 deletions

diff --git a/native_client_sdk/src/build_tools/buildbot_run.py b/native_client_sdk/src/build_tools/buildbot_run.py
index c24c6df..374155d 100755
--- a/native_client_sdk/src/build_tools/buildbot_run.py
+++ b/native_client_sdk/src/build_tools/buildbot_run.py
@@ -87,6 +87,11 @@ def StepTestSDK():
     ])
 
   cmd.extend([sys.executable, 'test_sdk.py'])
+
+  # TODO(noelallen): crbug 386332
+  # For Bionic SDK, only build do a build test until we have hardware.
+  if 'bionic' in os.getenv('BUILDBOT_BUILDERNAME', ''):
+    cmd.extend(['build_examples', 'copy_tests', 'build_tests'])
   Run(cmd, cwd=SCRIPT_DIR)
 
 
@@ -112,9 +117,6 @@ def main(args):
     # to pass --build-only argument.
     if os.getenv('BUILDBOT_BUILDERNAME', '').endswith('build'):
       options.build_only = True
-    # TODO(noelallen): Enable testing on bionic when we have an ARM solution.
-    if 'bionic' in os.getenv('BUILDBOT_BUILDERNAME', ''):
-      options.build_only = True
 
   StepArmRunHooks()
   StepRunUnittests()
diff --git a/native_client_sdk/src/examples/api/core/example.dsc b/native_client_sdk/src/examples/api/core/example.dsc
index 885ad10..4b17c97 100644
--- a/native_client_sdk/src/examples/api/core/example.dsc
+++ b/native_client_sdk/src/examples/api/core/example.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'core',
diff --git a/native_client_sdk/src/examples/api/file_io/example.dsc b/native_client_sdk/src/examples/api/file_io/example.dsc
index e1eb3de..df6ea63 100644
--- a/native_client_sdk/src/examples/api/file_io/example.dsc
+++ b/native_client_sdk/src/examples/api/file_io/example.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'file_io',
diff --git a/native_client_sdk/src/examples/api/gamepad/example.dsc b/native_client_sdk/src/examples/api/gamepad/example.dsc
index 2087860..464670f 100644
--- a/native_client_sdk/src/examples/api/gamepad/example.dsc
+++ b/native_client_sdk/src/examples/api/gamepad/example.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'gamepad',
diff --git a/native_client_sdk/src/examples/api/graphics_3d/example.dsc b/native_client_sdk/src/examples/api/graphics_3d/example.dsc
index 6d637e3..82a956e 100644
--- a/native_client_sdk/src/examples/api/graphics_3d/example.dsc
+++ b/native_client_sdk/src/examples/api/graphics_3d/example.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'graphics_3d',
diff --git a/native_client_sdk/src/examples/api/input_event/example.dsc b/native_client_sdk/src/examples/api/input_event/example.dsc
index 725a83c..6e45712 100644
--- a/native_client_sdk/src/examples/api/input_event/example.dsc
+++ b/native_client_sdk/src/examples/api/input_event/example.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'linux', 'win'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'linux', 'win'],
   'TARGETS': [
     {
       'NAME' : 'input_event',
diff --git a/native_client_sdk/src/examples/api/media_stream_audio/example.dsc b/native_client_sdk/src/examples/api/media_stream_audio/example.dsc
index 8adc6e2..1cdf938 100644
--- a/native_client_sdk/src/examples/api/media_stream_audio/example.dsc
+++ b/native_client_sdk/src/examples/api/media_stream_audio/example.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'media_stream_audio',
diff --git a/native_client_sdk/src/examples/api/media_stream_video/example.dsc b/native_client_sdk/src/examples/api/media_stream_video/example.dsc
index 1011b9c..7e00735 100644
--- a/native_client_sdk/src/examples/api/media_stream_video/example.dsc
+++ b/native_client_sdk/src/examples/api/media_stream_video/example.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'media_stream_video',
diff --git a/native_client_sdk/src/examples/api/mouse_cursor/example.dsc b/native_client_sdk/src/examples/api/mouse_cursor/example.dsc
index 4b89b8f..8a82930 100644
--- a/native_client_sdk/src/examples/api/mouse_cursor/example.dsc
+++ b/native_client_sdk/src/examples/api/mouse_cursor/example.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'mouse_cursor',
diff --git a/native_client_sdk/src/examples/api/mouse_lock/example.dsc b/native_client_sdk/src/examples/api/mouse_lock/example.dsc
index 626e3a2..f1c5be1 100644
--- a/native_client_sdk/src/examples/api/mouse_lock/example.dsc
+++ b/native_client_sdk/src/examples/api/mouse_lock/example.dsc
@@ -1,6 +1,6 @@
 {
   'DISABLE_PACKAGE': True,
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'mouse_lock',
diff --git a/native_client_sdk/src/examples/api/network_monitor/example.dsc b/native_client_sdk/src/examples/api/network_monitor/example.dsc
index 271b3ad..44ba94f 100644
--- a/native_client_sdk/src/examples/api/network_monitor/example.dsc
+++ b/native_client_sdk/src/examples/api/network_monitor/example.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'network_monitor',
diff --git a/native_client_sdk/src/examples/api/socket/example.dsc b/native_client_sdk/src/examples/api/socket/example.dsc
index a573c82..3c7df8a 100644
--- a/native_client_sdk/src/examples/api/socket/example.dsc
+++ b/native_client_sdk/src/examples/api/socket/example.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'socket',
diff --git a/native_client_sdk/src/examples/api/url_loader/example.dsc b/native_client_sdk/src/examples/api/url_loader/example.dsc
index baafd66..1ee83b4 100644
--- a/native_client_sdk/src/examples/api/url_loader/example.dsc
+++ b/native_client_sdk/src/examples/api/url_loader/example.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'url_loader',
diff --git a/native_client_sdk/src/examples/api/var_array_buffer/example.dsc b/native_client_sdk/src/examples/api/var_array_buffer/example.dsc
index 4b1f296..699a7787 100644
--- a/native_client_sdk/src/examples/api/var_array_buffer/example.dsc
+++ b/native_client_sdk/src/examples/api/var_array_buffer/example.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'var_array_buffer',
diff --git a/native_client_sdk/src/examples/api/var_dictionary/example.dsc b/native_client_sdk/src/examples/api/var_dictionary/example.dsc
index 1842eba..90f146e 100644
--- a/native_client_sdk/src/examples/api/var_dictionary/example.dsc
+++ b/native_client_sdk/src/examples/api/var_dictionary/example.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'var_dictionary',
diff --git a/native_client_sdk/src/examples/api/websocket/example.dsc b/native_client_sdk/src/examples/api/websocket/example.dsc
index c3d02fc..e48a3f1 100644
--- a/native_client_sdk/src/examples/api/websocket/example.dsc
+++ b/native_client_sdk/src/examples/api/websocket/example.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'websocket',
diff --git a/native_client_sdk/src/examples/demo/nacl_io_demo/nacl_io_demo.c b/native_client_sdk/src/examples/demo/nacl_io_demo/nacl_io_demo.c
index 226d50f..d103c1f 100644
--- a/native_client_sdk/src/examples/demo/nacl_io_demo/nacl_io_demo.c
+++ b/native_client_sdk/src/examples/demo/nacl_io_demo/nacl_io_demo.c
@@ -41,6 +41,16 @@
 #define va_copy(d, s) ((d) = (s))
 #endif
 
+/**
+ * The location of MAX is inconsitantly between LIBCs, so instead
+ * we define it here for consistency.
+ */
+static int larger_int_of(int a, int b) {
+  if (a > b)
+    return a;
+  return b;
+}
+
 typedef struct {
   const char* name;
   HandleFunc function;
@@ -312,8 +322,8 @@ static void* EchoThread(void* user_data) {
   int fd1 = open("/dev/jspipe1", O_RDWR | O_NONBLOCK);
   int fd2 = open("/dev/jspipe2", O_RDWR | O_NONBLOCK);
   int fd3 = open("/dev/jspipe3", O_RDWR | O_NONBLOCK);
-  int nfds = MAX(fd1, fd2);
-  nfds = MAX(nfds, fd3);
+  int nfds = larger_int_of(fd1, fd2);
+  nfds = larger_int_of(nfds, fd3);
   while (1) {
     fd_set readfds;
     FD_ZERO(&readfds);
diff --git a/native_client_sdk/src/libraries/jsoncpp/library.dsc b/native_client_sdk/src/libraries/jsoncpp/library.dsc
index 26f506a..6029ce2 100644
--- a/native_client_sdk/src/libraries/jsoncpp/library.dsc
+++ b/native_client_sdk/src/libraries/jsoncpp/library.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['bionic', 'newlib', 'glibc', 'pnacl', 'linux', 'win'],
+  'TOOLS': ['bionic', 'newlib', 'glibc', 'bionic', 'pnacl', 'linux', 'win'],
   'SEARCH': [
     '../../../../third_party/jsoncpp/overrides/include/json',
     '../../../../third_party/jsoncpp/overrides/src/lib_json',
diff --git a/native_client_sdk/src/libraries/libjpeg/library.dsc b/native_client_sdk/src/libraries/libjpeg/library.dsc
index d5dd5c3..a6579e1 100644
--- a/native_client_sdk/src/libraries/libjpeg/library.dsc
+++ b/native_client_sdk/src/libraries/libjpeg/library.dsc
@@ -1,6 +1,6 @@
 {
   'DISABLE': True,
-  'TOOLS': ['newlib', 'glibc', 'linux', 'win'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'linux', 'win'],
   'SEARCH': [
     '../../../../third_party/libjpeg',
   ],
diff --git a/native_client_sdk/src/libraries/nacl_io/library.dsc b/native_client_sdk/src/libraries/nacl_io/library.dsc
index 10dd172..d8630dd 100644
--- a/native_client_sdk/src/libraries/nacl_io/library.dsc
+++ b/native_client_sdk/src/libraries/nacl_io/library.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['bionic', 'newlib', 'glibc', 'pnacl', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'linux'],
   'SEARCH': [
     '.',
     'pepper',
diff --git a/native_client_sdk/src/libraries/ppapi_cpp/library.dsc b/native_client_sdk/src/libraries/ppapi_cpp/library.dsc
index bb3d032..1ca014e 100644
--- a/native_client_sdk/src/libraries/ppapi_cpp/library.dsc
+++ b/native_client_sdk/src/libraries/ppapi_cpp/library.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['bionic', 'newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc',  'bionic', 'pnacl', 'win', 'linux'],
   'SEARCH': [
       '../../../../ppapi/cpp',
       '../../../../ppapi/cpp/dev',
diff --git a/native_client_sdk/src/libraries/ppapi_cpp_private/library.dsc b/native_client_sdk/src/libraries/ppapi_cpp_private/library.dsc
index 02817ac..33e64e2 100644
--- a/native_client_sdk/src/libraries/ppapi_cpp_private/library.dsc
+++ b/native_client_sdk/src/libraries/ppapi_cpp_private/library.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc',  'bionic', 'pnacl', 'win', 'linux'],
   'SEARCH': [
       '../../../../ppapi/c/private',
       '../../../../ppapi/cpp/private',
diff --git a/native_client_sdk/src/libraries/ppapi_gles2/library.dsc b/native_client_sdk/src/libraries/ppapi_gles2/library.dsc
index 6b8b21e..aaf19c9 100644
--- a/native_client_sdk/src/libraries/ppapi_gles2/library.dsc
+++ b/native_client_sdk/src/libraries/ppapi_gles2/library.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['bionic', 'newlib', 'glibc', 'pnacl', 'linux', 'win'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'linux', 'win'],
   'SEARCH' : [
     '../../../../ppapi/lib/gl/gles2',
     '../../../../ppapi/lib/gl/include/EGL',
diff --git a/native_client_sdk/src/libraries/sdk_util/library.dsc b/native_client_sdk/src/libraries/sdk_util/library.dsc
index 961a43f..1ec8b3c 100644
--- a/native_client_sdk/src/libraries/sdk_util/library.dsc
+++ b/native_client_sdk/src/libraries/sdk_util/library.dsc
@@ -1,5 +1,5 @@
 {
-  'TOOLS': ['bionic', 'newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc',  'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'sdk_util',
diff --git a/native_client_sdk/src/libraries/zlib/library.dsc b/native_client_sdk/src/libraries/zlib/library.dsc
index d7409e9..422e013 100644
--- a/native_client_sdk/src/libraries/zlib/library.dsc
+++ b/native_client_sdk/src/libraries/zlib/library.dsc
@@ -1,6 +1,6 @@
 {
   'DISABLE': True,
-  'TOOLS': ['bionic', 'newlib', 'glibc', 'linux', 'win'],
+  'TOOLS': ['newlib', 'glibc',  'bionic', 'linux', 'win'],
   'SEARCH': [
     '../../../../third_party/zlib',
   ],