[NaCl SDK] Remove old/unused gyp defines

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 88 matching lines @@
 class GypNinjaPosixTestCase(BasePosixTestCase):
   def setUp(self):
     BasePosixTestCase.setUp(self)
     patch('sys.executable', 'python').start()
     patch('build_artifacts.SRC_DIR', 'src_dir').start()
     patch('os.environ', {}).start()
     self.run_mock = patch('buildbot_common.Run').start()
     self.options_mock = patch('build_artifacts.options').start()
     self.options_mock.mac_sdk = False
     self.options_mock.no_arm_trusted = False
-    self.gyp_defines_base = ['nacl_allow_thin_archives=0']
+    self.gyp_defines_base = []
 
   def testSimple(self):
     build_artifacts.GypNinjaBuild(
         None, 'gyp.py', 'foo.gyp', 'target', 'out_dir')
     self.run_mock.assert_has_calls([
         call(['python', 'gyp.py', 'foo.gyp', '--depth=.', '-G',
               'output_dir=out_dir'],
              cwd='src_dir',
-             env={'GYP_GENERATORS': 'ninja',
-                  'GYP_DEFINES': ' '.join(self.gyp_defines_base)}),
+             env={'GYP_DEFINES': ' '.join(self.gyp_defines_base)}),
         call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir')
     ])
 
   def testTargetArch(self):
     build_artifacts.GypNinjaBuild(
         'x64', 'gyp.py', 'foo.gyp', 'target', 'out_dir')
     self.run_mock.assert_has_calls([
         call(['python', 'gyp.py', 'foo.gyp', '--depth=.', '-G',
               'output_dir=out_dir'],
              cwd='src_dir',
              env={
-                 'GYP_GENERATORS': 'ninja',
                  'GYP_DEFINES': ' '.join(self.gyp_defines_base +
                                          ['target_arch=x64']),
              }),
         call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir')
     ])
 
   def testMultipleTargets(self):
     build_artifacts.GypNinjaBuild(
         None, 'gyp.py', 'foo.gyp', ['target1', 'target2'], 'out_dir')
     self.run_mock.assert_has_calls([
         call(['python', 'gyp.py', 'foo.gyp', '--depth=.', '-G',
               'output_dir=out_dir'],
              cwd='src_dir',
-             env={'GYP_GENERATORS': 'ninja',
-                  'GYP_DEFINES': ' '.join(self.gyp_defines_base)}),
+             env={'GYP_DEFINES': ' '.join(self.gyp_defines_base)}),
         call(['ninja', '-C', 'out_dir/Release', 'target1', 'target2'],
              cwd='src_dir')
     ])
 
   def testMacSdk(self):
     build_artifacts.PLATFORM = 'mac'
     self.options_mock.mac_sdk = '10.6'
     build_artifacts.GypNinjaBuild(
         None, 'gyp.py', 'foo.gyp', 'target', 'out_dir')
     self.run_mock.assert_has_calls([
         call(['python', 'gyp.py', 'foo.gyp', '--depth=.', '-G',
               'output_dir=out_dir'],
              cwd='src_dir',
              env={
-               'GYP_GENERATORS': 'ninja',
                'GYP_DEFINES': ' '.join(self.gyp_defines_base +
-                                       ['mac_sdk=10.6', 'clang=1']),
+                                       ['mac_sdk=10.6']),
              }),
         call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir')
     ])
 
   def testArmLinux(self):
     build_artifacts.PLATFORM = 'linux'
     build_artifacts.GypNinjaBuild(
         'arm', 'gyp.py', 'foo.gyp', 'target', 'out_dir')
     self.run_mock.assert_has_calls([
         call(['python', 'gyp.py', 'foo.gyp', '--depth=.', '-G',
               'output_dir=out_dir'],
              cwd='src_dir',
              env={
                'GYP_CROSSCOMPILE': '1',
-               'GYP_GENERATORS': 'ninja',
                'GYP_DEFINES': ' '.join(self.gyp_defines_base +
                                        ['target_arch=arm']),
              }),
         call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir')
     ])
 
   def testNoArmTrusted(self):
     build_artifacts.PLATFORM = 'linux'
     self.options_mock.no_arm_trusted = True
     build_artifacts.GypNinjaBuild(
         'arm', 'gyp.py', 'foo.gyp', 'target', 'out_dir')
     self.run_mock.assert_has_calls([
         call(['python', 'gyp.py', 'foo.gyp', '--depth=.', '-G',
               'output_dir=out_dir'],
              cwd='src_dir',
              env={
                'GYP_CROSSCOMPILE': '1',
-               'GYP_GENERATORS': 'ninja',
                'GYP_DEFINES': ' '.join(self.gyp_defines_base +
                                        ['target_arch=arm',
                                         'disable_cross_trusted=1']),
              }),
         call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir')
     ])
 
 
 class ArchivePosixTestCase(BasePosixTestCase):
   def setUp(self):
@@ skipping 76 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()