Currently, bionic only build a subset of the examples. This changes turns on...

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

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()

native_client_sdk/src/examples/api/core/example.dsc

 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'core',

native_client_sdk/src/examples/api/file_io/example.dsc

 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'file_io',

native_client_sdk/src/examples/api/gamepad/example.dsc

 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'gamepad',

native_client_sdk/src/examples/api/graphics_3d/example.dsc

 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'graphics_3d',

native_client_sdk/src/examples/api/input_event/example.dsc

 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'linux', 'win'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'linux', 'win'],
   'TARGETS': [
     {
       'NAME' : 'input_event',

native_client_sdk/src/examples/api/media_stream_audio/example.dsc

 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'media_stream_audio',

native_client_sdk/src/examples/api/media_stream_video/example.dsc

 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'media_stream_video',

native_client_sdk/src/examples/api/mouse_cursor/example.dsc

 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'mouse_cursor',

native_client_sdk/src/examples/api/mouse_lock/example.dsc

 {
   'DISABLE_PACKAGE': True,
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'mouse_lock',

native_client_sdk/src/examples/api/network_monitor/example.dsc

 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'network_monitor',

native_client_sdk/src/examples/api/socket/example.dsc

 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'socket',

native_client_sdk/src/examples/api/url_loader/example.dsc

 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'url_loader',

native_client_sdk/src/examples/api/var_array_buffer/example.dsc

 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'var_array_buffer',

native_client_sdk/src/examples/api/var_dictionary/example.dsc

 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'var_dictionary',

native_client_sdk/src/examples/api/websocket/example.dsc

 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'websocket',

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);

native_client_sdk/src/libraries/jsoncpp/library.dsc

 {
-  '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',

native_client_sdk/src/libraries/libjpeg/library.dsc

 {
   'DISABLE': True,
-  'TOOLS': ['newlib', 'glibc', 'linux', 'win'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'linux', 'win'],
   'SEARCH': [
     '../../../../third_party/libjpeg',
   ],

native_client_sdk/src/libraries/nacl_io/library.dsc

 {
-  'TOOLS': ['bionic', 'newlib', 'glibc', 'pnacl', 'linux'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'linux'],
   'SEARCH': [
     '.',
     'pepper',

native_client_sdk/src/libraries/ppapi_cpp/library.dsc

 {
-  'TOOLS': ['bionic', 'newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc',  'bionic', 'pnacl', 'win', 'linux'],
   'SEARCH': [
       '../../../../ppapi/cpp',
       '../../../../ppapi/cpp/dev',

native_client_sdk/src/libraries/ppapi_cpp_private/library.dsc

 {
-  'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc',  'bionic', 'pnacl', 'win', 'linux'],
   'SEARCH': [
       '../../../../ppapi/c/private',
       '../../../../ppapi/cpp/private',

native_client_sdk/src/libraries/ppapi_gles2/library.dsc

 {
-  'TOOLS': ['bionic', 'newlib', 'glibc', 'pnacl', 'linux', 'win'],
+  'TOOLS': ['newlib', 'glibc', 'bionic', 'pnacl', 'linux', 'win'],
   'SEARCH' : [
     '../../../../ppapi/lib/gl/gles2',
     '../../../../ppapi/lib/gl/include/EGL',

native_client_sdk/src/libraries/sdk_util/library.dsc

 {
-  'TOOLS': ['bionic', 'newlib', 'glibc', 'pnacl', 'win', 'linux'],
+  'TOOLS': ['newlib', 'glibc',  'bionic', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
       'NAME' : 'sdk_util',

native_client_sdk/src/libraries/zlib/library.dsc

 {
   'DISABLE': True,
-  'TOOLS': ['bionic', 'newlib', 'glibc', 'linux', 'win'],
+  'TOOLS': ['newlib', 'glibc',  'bionic', 'linux', 'win'],
   'SEARCH': [
     '../../../../third_party/zlib',
   ],