[NaCl SDK] Set nacl_allow_thin_archives to 0 in prep for build_nexe change.

native_client_sdk/src/build_tools/tests/build_artifacts_test.py

Index: native_client_sdk/src/build_tools/tests/build_artifacts_test.py
diff --git a/native_client_sdk/src/build_tools/tests/build_artifacts_test.py b/native_client_sdk/src/build_tools/tests/build_artifacts_test.py
index 6bc938aa49436846a89d147f73b981e4d249fd29..aa71502bf047db40414568bf9be5771c7fdd1f0f 100755
--- a/native_client_sdk/src/build_tools/tests/build_artifacts_test.py
+++ b/native_client_sdk/src/build_tools/tests/build_artifacts_test.py
@@ -118,6 +118,7 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
     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']
 
   def testSimple(self):
     build_artifacts.GypNinjaBuild(
@@ -126,7 +127,8 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
         call(['python', 'gyp.py', 'foo.gyp', '--depth=.', '-G',
               'output_dir=out_dir'],
              cwd='src_dir',
-             env={'GYP_GENERATORS': 'ninja', 'GYP_DEFINES': ''}),
+             env={'GYP_GENERATORS': 'ninja',
+                  'GYP_DEFINES': ' '.join(self.gyp_defines_base)}),
         call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir')
     ])
 
@@ -139,7 +141,8 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
              cwd='src_dir',
              env={
                  'GYP_GENERATORS': 'ninja',
-                 'GYP_DEFINES': 'target_arch=x64'
+                 'GYP_DEFINES': ' '.join(self.gyp_defines_base +
+                                         ['target_arch=x64']),
              }),
         call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir')
     ])
@@ -151,7 +154,8 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
         call(['python', 'gyp.py', 'foo.gyp', '--depth=.', '-G',
               'output_dir=out_dir'],
              cwd='src_dir',
-             env={'GYP_GENERATORS': 'ninja', 'GYP_DEFINES': ''}),
+             env={'GYP_GENERATORS': 'ninja',
+                  'GYP_DEFINES': ' '.join(self.gyp_defines_base)}),
         call(['ninja', '-C', 'out_dir/Release', 'target1', 'target2'],
              cwd='src_dir')
     ])
@@ -167,7 +171,8 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
              cwd='src_dir',
              env={
                'GYP_GENERATORS': 'ninja',
-               'GYP_DEFINES': 'mac_sdk=10.6 clang=1'
+               'GYP_DEFINES': ' '.join(self.gyp_defines_base +
+                                       ['mac_sdk=10.6', 'clang=1']),
              }),
         call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir')
     ])
@@ -183,7 +188,9 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
              env={
                'GYP_CROSSCOMPILE': '1',
                'GYP_GENERATORS': 'ninja',
-               'GYP_DEFINES': 'target_arch=arm arm_float_abi=hard',
+               'GYP_DEFINES': ' '.join(self.gyp_defines_base +
+                                       ['target_arch=arm',
+                                        'arm_float_abi=hard']),
              }),
         call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir')
     ])
@@ -200,8 +207,10 @@ class GypNinjaPosixTestCase(BasePosixTestCase):
              env={
                'GYP_CROSSCOMPILE': '1',
                'GYP_GENERATORS': 'ninja',
-               'GYP_DEFINES': 'target_arch=arm arm_float_abi=hard '
-                              'disable_cross_trusted=1',
+               'GYP_DEFINES': ' '.join(self.gyp_defines_base +
+                                       ['target_arch=arm',
+                                        'arm_float_abi=hard',
+                                        'disable_cross_trusted=1']),
              }),
         call(['ninja', '-C', 'out_dir/Release', 'target'], cwd='src_dir')
     ])