Make test for identity

Also add support for lists in cross files, I thought this was the
intention all along.
pull/5255/head
John Ericson 6 years ago committed by Nirbheek Chauhan
parent 9f48f5fe94
commit d2527eb684
  1. 13
      run_unittests.py
  2. 5
      test cases/unit/58 identity cross/build_wrapper.py
  3. 5
      test cases/unit/58 identity cross/host_wrapper.py
  4. 15
      test cases/unit/58 identity cross/meson.build
  5. 27
      test cases/unit/58 identity cross/stuff.h

@ -5029,6 +5029,19 @@ endian = 'little'
max_count = max(max_count, line.count(search_term)) max_count = max(max_count, line.count(search_term))
self.assertEqual(max_count, 1, 'Export dynamic incorrectly deduplicated.') self.assertEqual(max_count, 1, 'Export dynamic incorrectly deduplicated.')
def test_identity_cross(self):
testdir = os.path.join(self.unit_test_dir, '58 identity cross')
crossfile = tempfile.NamedTemporaryFile(mode='w')
print(os.path.join(testdir, 'build_wrapper.py'))
print(os.path.join(testdir, 'host_wrapper.py'))
os.environ['CC'] = '"' + os.path.join(testdir, 'build_wrapper.py') + '"'
crossfile.write('''[binaries]
c = ['{0}']
'''.format(os.path.join(testdir, 'host_wrapper.py')))
crossfile.flush()
self.meson_cross_file = crossfile.name
# TODO should someday be explicit about build platform only here
self.init(testdir)
def should_run_cross_arm_tests(): def should_run_cross_arm_tests():
return shutil.which('arm-linux-gnueabihf-gcc') and not platform.machine().lower().startswith('arm') return shutil.which('arm-linux-gnueabihf-gcc') and not platform.machine().lower().startswith('arm')

@ -0,0 +1,5 @@
#!/usr/bin/env python
import subprocess, sys
subprocess.call(["cc", "-DEXTERNAL_BUILD"] + sys.argv[1:])

@ -0,0 +1,5 @@
#!/usr/bin/env python
import subprocess, sys
subprocess.call(["cc", "-DEXTERNAL_HOST"] + sys.argv[1:])

@ -0,0 +1,15 @@
project('identity cross test', 'c')
assert(meson.get_compiler('c', native: true).get_define(
'GOT',
args : [ '-DARG_BUILD' ],
prefix : '#include "stuff.h"',
include_directories: include_directories('.'),
) == 'BUILD', 'did not get BUILD from native: true compiler')
assert(meson.get_compiler('c', native: false).get_define(
'GOT',
args : [ '-DARG_HOST' ],
prefix : '#include "stuff.h"',
include_directories: include_directories('.'),
) == 'HOST', 'did not get HOST from native: false compiler')

@ -0,0 +1,27 @@
#ifdef EXTERNAL_BUILD
#ifndef ARG_BUILD
#error "External is build but arg_build is not set."
#elif defined(ARG_HOST)
#error "External is build but arg_host is set."
#else
#define GOT BUILD
#endif
#endif
#ifdef EXTERNAL_HOST
#ifndef ARG_HOST
#error "External is host but arg_host is not set."
#elif defined(ARG_BUILD)
#error "External is host but arg_build is set."
#else
#define GOT HOST
#endif
#endif
#if defined(EXTERNAL_BUILD) && defined(EXTERNAL_HOST)
#error "Both external build and external host set."
#endif
#if !defined(EXTERNAL_BUILD) && !defined(EXTERNAL_HOST)
#error "Neither external build nor external host is set."
#endif
Loading…
Cancel
Save