From f94093ce7933e77329350a227e7c759c67c09785 Mon Sep 17 00:00:00 2001 From: Aleksey Filippov Date: Thu, 19 Apr 2018 14:59:41 -0700 Subject: Rename common tests to remove numeric duplicates (#3425) --- test cases/common/183 same target name/file.c | 3 --- test cases/common/183 same target name/meson.build | 4 ---- test cases/common/183 same target name/sub/file2.c | 3 --- .../common/183 same target name/sub/meson.build | 1 - test cases/common/188 test depends/gen.py | 13 ----------- test cases/common/188 test depends/main.c | 1 - test cases/common/188 test depends/meson.build | 26 ---------------------- test cases/common/188 test depends/test.py | 20 ----------------- test cases/common/196 same target name/file.c | 3 +++ test cases/common/196 same target name/meson.build | 4 ++++ test cases/common/196 same target name/sub/file2.c | 3 +++ .../common/196 same target name/sub/meson.build | 1 + test cases/common/197 test depends/gen.py | 13 +++++++++++ test cases/common/197 test depends/main.c | 1 + test cases/common/197 test depends/meson.build | 26 ++++++++++++++++++++++ test cases/common/197 test depends/test.py | 20 +++++++++++++++++ 16 files changed, 71 insertions(+), 71 deletions(-) delete mode 100644 test cases/common/183 same target name/file.c delete mode 100644 test cases/common/183 same target name/meson.build delete mode 100644 test cases/common/183 same target name/sub/file2.c delete mode 100644 test cases/common/183 same target name/sub/meson.build delete mode 100755 test cases/common/188 test depends/gen.py delete mode 100644 test cases/common/188 test depends/main.c delete mode 100644 test cases/common/188 test depends/meson.build delete mode 100755 test cases/common/188 test depends/test.py create mode 100644 test cases/common/196 same target name/file.c create mode 100644 test cases/common/196 same target name/meson.build create mode 100644 test cases/common/196 same target name/sub/file2.c create mode 100644 test cases/common/196 same target name/sub/meson.build create mode 100755 test cases/common/197 test depends/gen.py create mode 100644 test cases/common/197 test depends/main.c create mode 100644 test cases/common/197 test depends/meson.build create mode 100755 test cases/common/197 test depends/test.py diff --git a/test cases/common/183 same target name/file.c b/test cases/common/183 same target name/file.c deleted file mode 100644 index 6f1c172..0000000 --- a/test cases/common/183 same target name/file.c +++ /dev/null @@ -1,3 +0,0 @@ -int func() { - return 0; -} diff --git a/test cases/common/183 same target name/meson.build b/test cases/common/183 same target name/meson.build deleted file mode 100644 index 4e585d5..0000000 --- a/test cases/common/183 same target name/meson.build +++ /dev/null @@ -1,4 +0,0 @@ -project('same name', 'c') - -static_library('foo', 'file.c') -subdir('sub') diff --git a/test cases/common/183 same target name/sub/file2.c b/test cases/common/183 same target name/sub/file2.c deleted file mode 100644 index a5e453d..0000000 --- a/test cases/common/183 same target name/sub/file2.c +++ /dev/null @@ -1,3 +0,0 @@ -int func() { - return 5; -} diff --git a/test cases/common/183 same target name/sub/meson.build b/test cases/common/183 same target name/sub/meson.build deleted file mode 100644 index 610a4a3..0000000 --- a/test cases/common/183 same target name/sub/meson.build +++ /dev/null @@ -1 +0,0 @@ -static_library('foo', 'file2.c') diff --git a/test cases/common/188 test depends/gen.py b/test cases/common/188 test depends/gen.py deleted file mode 100755 index ee4ed98..0000000 --- a/test cases/common/188 test depends/gen.py +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env python3 - -import sys - - -def main(): - with open(sys.argv[1], 'w') as out: - out.write(sys.argv[2]) - out.write('\n') - - -if __name__ == '__main__': - main() diff --git a/test cases/common/188 test depends/main.c b/test cases/common/188 test depends/main.c deleted file mode 100644 index 78f2de1..0000000 --- a/test cases/common/188 test depends/main.c +++ /dev/null @@ -1 +0,0 @@ -int main(void) { return 0; } diff --git a/test cases/common/188 test depends/meson.build b/test cases/common/188 test depends/meson.build deleted file mode 100644 index 888c451..0000000 --- a/test cases/common/188 test depends/meson.build +++ /dev/null @@ -1,26 +0,0 @@ -project('test depends', 'c') - -gen = find_program('gen.py') - -custom_dep = custom_target('custom_dep', - build_by_default : false, - output : 'custom_dep.txt', - command : [gen, '@OUTPUT@', 'custom_dep'], -) - -exe_dep = executable('exe_dep', 'main.c', - build_by_default : false, -) - -test_prog = find_program('test.py') -test('string dependencies', test_prog, - args : [ - # This is declared for convenience, - # real use case might have some obscure method - # to find these dependencies, e.g. automatic plugin loading. - 'custom_dep.txt', - exe_dep.full_path(), - ], - depends : [custom_dep, exe_dep], - workdir : meson.current_build_dir(), -) diff --git a/test cases/common/188 test depends/test.py b/test cases/common/188 test depends/test.py deleted file mode 100755 index 5b9f65c..0000000 --- a/test cases/common/188 test depends/test.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python3 - -import os -import os.path -import sys - - -def main(): - print('Looking in:', os.getcwd()) - not_found = list() - for f in sys.argv[1:]: - if not os.path.exists(f): - not_found.append(f) - if not_found: - print('Not found:', ', '.join(not_found)) - sys.exit(1) - - -if __name__ == '__main__': - main() diff --git a/test cases/common/196 same target name/file.c b/test cases/common/196 same target name/file.c new file mode 100644 index 0000000..6f1c172 --- /dev/null +++ b/test cases/common/196 same target name/file.c @@ -0,0 +1,3 @@ +int func() { + return 0; +} diff --git a/test cases/common/196 same target name/meson.build b/test cases/common/196 same target name/meson.build new file mode 100644 index 0000000..4e585d5 --- /dev/null +++ b/test cases/common/196 same target name/meson.build @@ -0,0 +1,4 @@ +project('same name', 'c') + +static_library('foo', 'file.c') +subdir('sub') diff --git a/test cases/common/196 same target name/sub/file2.c b/test cases/common/196 same target name/sub/file2.c new file mode 100644 index 0000000..a5e453d --- /dev/null +++ b/test cases/common/196 same target name/sub/file2.c @@ -0,0 +1,3 @@ +int func() { + return 5; +} diff --git a/test cases/common/196 same target name/sub/meson.build b/test cases/common/196 same target name/sub/meson.build new file mode 100644 index 0000000..610a4a3 --- /dev/null +++ b/test cases/common/196 same target name/sub/meson.build @@ -0,0 +1 @@ +static_library('foo', 'file2.c') diff --git a/test cases/common/197 test depends/gen.py b/test cases/common/197 test depends/gen.py new file mode 100755 index 0000000..ee4ed98 --- /dev/null +++ b/test cases/common/197 test depends/gen.py @@ -0,0 +1,13 @@ +#!/usr/bin/env python3 + +import sys + + +def main(): + with open(sys.argv[1], 'w') as out: + out.write(sys.argv[2]) + out.write('\n') + + +if __name__ == '__main__': + main() diff --git a/test cases/common/197 test depends/main.c b/test cases/common/197 test depends/main.c new file mode 100644 index 0000000..78f2de1 --- /dev/null +++ b/test cases/common/197 test depends/main.c @@ -0,0 +1 @@ +int main(void) { return 0; } diff --git a/test cases/common/197 test depends/meson.build b/test cases/common/197 test depends/meson.build new file mode 100644 index 0000000..888c451 --- /dev/null +++ b/test cases/common/197 test depends/meson.build @@ -0,0 +1,26 @@ +project('test depends', 'c') + +gen = find_program('gen.py') + +custom_dep = custom_target('custom_dep', + build_by_default : false, + output : 'custom_dep.txt', + command : [gen, '@OUTPUT@', 'custom_dep'], +) + +exe_dep = executable('exe_dep', 'main.c', + build_by_default : false, +) + +test_prog = find_program('test.py') +test('string dependencies', test_prog, + args : [ + # This is declared for convenience, + # real use case might have some obscure method + # to find these dependencies, e.g. automatic plugin loading. + 'custom_dep.txt', + exe_dep.full_path(), + ], + depends : [custom_dep, exe_dep], + workdir : meson.current_build_dir(), +) diff --git a/test cases/common/197 test depends/test.py b/test cases/common/197 test depends/test.py new file mode 100755 index 0000000..5b9f65c --- /dev/null +++ b/test cases/common/197 test depends/test.py @@ -0,0 +1,20 @@ +#!/usr/bin/env python3 + +import os +import os.path +import sys + + +def main(): + print('Looking in:', os.getcwd()) + not_found = list() + for f in sys.argv[1:]: + if not os.path.exists(f): + not_found.append(f) + if not_found: + print('Not found:', ', '.join(not_found)) + sys.exit(1) + + +if __name__ == '__main__': + main() -- cgit v1.1