From 95f5a72f625358544f7a37782e7c94266a2867d4 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sun, 17 Mar 2019 23:34:52 +0200 Subject: [PATCH] Delete failing test that checks for custom target linking. --- .../failing/89 link_with custom target/demo.c | 5 ---- .../failing/89 link_with custom target/foo.c | 3 --- .../lib_generator.py | 24 ------------------- .../89 link_with custom target/meson.build | 23 ------------------ 4 files changed, 55 deletions(-) delete mode 100644 test cases/failing/89 link_with custom target/demo.c delete mode 100644 test cases/failing/89 link_with custom target/foo.c delete mode 100755 test cases/failing/89 link_with custom target/lib_generator.py delete mode 100644 test cases/failing/89 link_with custom target/meson.build diff --git a/test cases/failing/89 link_with custom target/demo.c b/test cases/failing/89 link_with custom target/demo.c deleted file mode 100644 index b6feacaef..000000000 --- a/test cases/failing/89 link_with custom target/demo.c +++ /dev/null @@ -1,5 +0,0 @@ -int func_in_foo(); - -int main(int argc, char **argv) { - return func_in_foo(); -} diff --git a/test cases/failing/89 link_with custom target/foo.c b/test cases/failing/89 link_with custom target/foo.c deleted file mode 100644 index 2c714223d..000000000 --- a/test cases/failing/89 link_with custom target/foo.c +++ /dev/null @@ -1,3 +0,0 @@ -int func_in_foo() { - return 0; -} diff --git a/test cases/failing/89 link_with custom target/lib_generator.py b/test cases/failing/89 link_with custom target/lib_generator.py deleted file mode 100755 index 98ed5a820..000000000 --- a/test cases/failing/89 link_with custom target/lib_generator.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python3 - -# Mimic a binary that generates a static library - -import os -import subprocess -import sys - -if __name__ == '__main__': - if len(sys.argv) != 4: - print(sys.argv[0], 'compiler input_file output_file') - sys.exit(1) - compiler = sys.argv[1] - ifile = sys.argv[2] - ofile = sys.argv[3] - tmp = ifile + '.o' - if compiler.endswith('cl'): - subprocess.check_call([compiler, '/nologo', '/MDd', '/Fo' + tmp, '/c', ifile]) - subprocess.check_call(['lib', '/nologo', '/OUT:' + ofile, tmp]) - else: - subprocess.check_call([compiler, '-c', ifile, '-o', tmp]) - subprocess.check_call(['ar', 'csr', ofile, tmp]) - -os.unlink(tmp) diff --git a/test cases/failing/89 link_with custom target/meson.build b/test cases/failing/89 link_with custom target/meson.build deleted file mode 100644 index 6977ca1b7..000000000 --- a/test cases/failing/89 link_with custom target/meson.build +++ /dev/null @@ -1,23 +0,0 @@ -project('link_with custom target', ['c']) - -# -# libraries created by a custom_target currently can be used in sources: (see -# common/100 manygen/ for an example of that), but not in link_with: -# - -lib_generator = find_program('lib_generator.py') - -cc = meson.get_compiler('c').cmd_array().get(-1) - -libfoo_target = custom_target( - 'libfoo', - input: ['foo.c'], - output: ['libfoo.a'], - command: [lib_generator, cc, '@INPUT@', '@OUTPUT@'] -) - -libfoo = declare_dependency( - link_with: libfoo_target, -) - -executable('demo', ['demo.c'], dependencies: [libfoo])