[NaCl SDK] Remove newlib toolchain from the SDK

native_client_sdk/src/build_tools/tests/build_artifacts_test.py

 #!/usr/bin/env python
 # Copyright (c) 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.
 
 import os
 import ntpath
 import posixpath
 import sys
 import collections
@@ skipping 19 matching lines @@
     patch('build_artifacts.BUILD_ARCHIVE_DIR', '/archive_dir/').start()
     patch('os.path.join', posixpath.join).start()
 
 
 class PosixTestCase(BasePosixTestCase):
   def setUp(self):
     BasePosixTestCase.setUp(self)
 
   def testGetToolchainNaClLib(self):
     tests = [
-        (('newlib', 'x86_32'), 'foo/x86_64-nacl/lib32'),
-        (('newlib', 'x86_64'), 'foo/x86_64-nacl/lib'),
-        (('newlib', 'arm'), 'foo/arm-nacl/lib'),
-        (('glibc', 'x86_32'), 'foo/x86_64-nacl/lib32'),
-        (('glibc', 'x86_64'), 'foo/x86_64-nacl/lib'),
-        (('bionic', 'arm'), 'foo/arm-nacl/lib'),
+        (('glibc_x86', 'x86_32'), 'foo/x86_64-nacl/lib32'),
+        (('glibc_x86', 'x86_64'), 'foo/x86_64-nacl/lib'),
+        (('glibc_arm', 'arm'), 'foo/arm-nacl/lib'),
         (('pnacl', None), 'foo/le32-nacl/lib'),
     ]
 
     for test in tests:
       self.assertEqual(
         build_artifacts.GetToolchainNaClLib(test[0][0], 'foo', test[0][1]),
         test[1])
 
   def testGetGypBuiltLib(self):
     tests = [
-        (('newlib', 'x86_32'), 'foo/Release/gen/tc_newlib/lib32'),
-        (('newlib', 'x86_64'), 'foo/Release/gen/tc_newlib/lib64'),
-        (('newlib', 'arm'), 'foo/Release/gen/tc_newlib/libarm'),
-        (('glibc', 'x86_32'), 'foo/Release/gen/tc_glibc/lib32'),
-        (('glibc', 'x86_64'), 'foo/Release/gen/tc_glibc/lib64'),
+        (('glibc_x86', 'x86_32'), 'foo/Release/gen/tc_glibc/lib32'),
+        (('glibc_x86', 'x86_64'), 'foo/Release/gen/tc_glibc/lib64'),
+        (('glibc_arm', 'arm'), 'foo/Release/gen/tc_glibc/libarm'),
         (('pnacl', None), 'foo/Release/gen/tc_pnacl_newlib/lib')
     ]
 
     for test in tests:
       self.assertEqual(
         build_artifacts.GetGypBuiltLib('foo', test[0][0], test[0][1]),
         test[1])
 
   def testGetGypToolchainLib(self):
     tests = [
-        (('newlib', 'x86_32'),
-         'foo/Release/gen/sdk/posix_x86/nacl_x86_newlib/x86_64-nacl/lib32'),
-        (('newlib', 'x86_64'),
-         'foo/Release/gen/sdk/posix_x86/nacl_x86_newlib/x86_64-nacl/lib'),
-        (('newlib', 'arm'),
-         'foo/Release/gen/sdk/posix_x86/nacl_arm_newlib/arm-nacl/lib'),
-        (('glibc', 'x86_32'),
+        (('glibc_x86', 'x86_32'),
          'foo/Release/gen/sdk/posix_x86/nacl_x86_glibc/x86_64-nacl/lib32'),
-        (('glibc', 'x86_64'),
+        (('glibc_x86', 'x86_64'),
          'foo/Release/gen/sdk/posix_x86/nacl_x86_glibc/x86_64-nacl/lib'),
-        # Bionic uses the newlib toolchain lib directory
-        (('bionic', 'arm'),
-         'foo/Release/gen/sdk/posix_x86/nacl_arm_newlib/arm-nacl/lib'),
+        (('glibc_arm', 'arm'),
+         'foo/Release/gen/sdk/posix_x86/nacl_arm_glibc/arm-nacl/lib'),
         (('pnacl', None),
          'foo/Release/gen/sdk/posix_x86/pnacl_newlib/le32-nacl/lib'),
     ]
 
-    for test in tests:
+    for tc_info, expected in tests:
       self.assertEqual(
-        build_artifacts.GetGypToolchainLib('foo', test[0][0], test[0][1]),
-        test[1])
+        build_artifacts.GetGypToolchainLib('foo', tc_info[0], tc_info[1]),
+        expected)
 
   @patch('build_artifacts.all_archives', ['foo.tar.bz2', 'bar.tar.bz2'])
   @patch('build_version.ChromeMajorVersion', Mock(return_value='40'))
   @patch('build_version.ChromeRevision', Mock(return_value='302630'))
   @patch('build_version.ChromeCommitPosition', Mock(return_value=
              '1492c3d296476fe12cafecabba6ebabe-refs/heads/master@{#302630}'))
   @patch('buildbot_common.Archive')
   def testUploadArchives(self, archive_mock):
     build_artifacts.UploadArchives()
     cwd = '/archive_dir/'
@@ skipping 193 matching lines @@
     archive = build_artifacts.Archive('foo')
     self.assertEqual(archive.name, 'win_foo')
     self.assertEqual(archive.archive_name, 'win_foo.tar.bz2')
     self.assertEqual(archive.archive_path, r'c:\archive_dir\win_foo.tar.bz2')
     self.assertEqual(archive.dirname, r'c:\archive_dir\win_foo')
     makedir_mock.assert_called_once_with(r'c:\archive_dir\win_foo')
 
 
 if __name__ == '__main__':
   unittest.main()