From a1a8772034aef90e8d58230d8bcfce54ab27bf6a Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 4 Oct 2019 11:54:47 +0100 Subject: Add test case to verify identity cross builds A build with a cross file should always be identified as a cross build, even if the host and build machine are identical. This was the case in 0.50, regressed in 0.51, and is fixed again in 0.52, so add a test case to ensure it doesn't regress again. --- test cases/unit/71 cross/crossfile.in | 5 +++++ test cases/unit/71 cross/meson.build | 16 ++++++++++++++++ test cases/unit/71 cross/meson_options.txt | 1 + 3 files changed, 22 insertions(+) create mode 100644 test cases/unit/71 cross/crossfile.in create mode 100644 test cases/unit/71 cross/meson.build create mode 100644 test cases/unit/71 cross/meson_options.txt (limited to 'test cases/unit/71 cross') diff --git a/test cases/unit/71 cross/crossfile.in b/test cases/unit/71 cross/crossfile.in new file mode 100644 index 0000000..678e8d3 --- /dev/null +++ b/test cases/unit/71 cross/crossfile.in @@ -0,0 +1,5 @@ +[host_machine] +system = '@system@' +cpu_family = '@cpu_family@' +cpu = '@cpu@' +endian = '@endian@' diff --git a/test cases/unit/71 cross/meson.build b/test cases/unit/71 cross/meson.build new file mode 100644 index 0000000..6c85cf7 --- /dev/null +++ b/test cases/unit/71 cross/meson.build @@ -0,0 +1,16 @@ +project('crosstest') + +if get_option('generate') + conf_data = configuration_data() + conf_data.set('system', build_machine.system()) + conf_data.set('cpu', build_machine.cpu()) + conf_data.set('cpu_family', build_machine.cpu_family()) + conf_data.set('endian', build_machine.endian()) + + configure_file(input: 'crossfile.in', + output: 'crossfile', + configuration: conf_data) + message('Written cross file') +else + assert(meson.is_cross_build(), 'not setup as cross build') +endif diff --git a/test cases/unit/71 cross/meson_options.txt b/test cases/unit/71 cross/meson_options.txt new file mode 100644 index 0000000..5896d63 --- /dev/null +++ b/test cases/unit/71 cross/meson_options.txt @@ -0,0 +1 @@ +option('generate', type : 'boolean', value : false) -- cgit v1.1