diff options
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | .travis.yml | 4 | ||||
-rw-r--r-- | docs/markdown/Builtin-options.md | 1 | ||||
-rw-r--r-- | docs/markdown/Porting-from-autotools.md | 4 | ||||
-rw-r--r-- | docs/markdown/Reference-manual.md | 3 | ||||
-rw-r--r-- | docs/markdown/snippets/buildtype_toggles.md | 21 | ||||
-rw-r--r-- | docs/markdown/snippets/dict_add.md | 10 | ||||
-rw-r--r-- | manual tests/7 vala composite widgets/mywidget.vala | 50 | ||||
-rw-r--r-- | mesonbuild/backend/backends.py | 2 | ||||
-rw-r--r-- | mesonbuild/backend/ninjabackend.py | 12 | ||||
-rw-r--r-- | mesonbuild/backend/vs2010backend.py | 27 | ||||
-rw-r--r-- | mesonbuild/compilers/c.py | 48 | ||||
-rw-r--r-- | mesonbuild/compilers/compilers.py | 109 | ||||
-rw-r--r-- | mesonbuild/compilers/cpp.py | 14 | ||||
-rw-r--r-- | mesonbuild/compilers/cs.py | 13 | ||||
-rw-r--r-- | mesonbuild/compilers/d.py | 46 | ||||
-rw-r--r-- | mesonbuild/compilers/fortran.py | 57 | ||||
-rw-r--r-- | mesonbuild/compilers/rust.py | 16 | ||||
-rw-r--r-- | mesonbuild/compilers/swift.py | 16 | ||||
-rw-r--r-- | mesonbuild/compilers/vala.py | 6 | ||||
-rw-r--r-- | mesonbuild/coredata.py | 52 | ||||
-rw-r--r-- | mesonbuild/dependencies/base.py | 2 | ||||
-rw-r--r-- | mesonbuild/environment.py | 4 | ||||
-rw-r--r-- | mesonbuild/interpreter.py | 19 | ||||
-rw-r--r-- | mesonbuild/interpreterbase.py | 14 | ||||
-rw-r--r-- | mesonbuild/linkers.py | 14 | ||||
-rw-r--r-- | mesonbuild/minstall.py | 57 | ||||
-rw-r--r-- | mesonbuild/modules/gnome.py | 61 | ||||
-rw-r--r-- | mesonbuild/wrap/wraptool.py | 27 | ||||
-rwxr-xr-x | run_meson_command_tests.py | 2 | ||||
-rwxr-xr-x | run_project_tests.py | 32 | ||||
-rwxr-xr-x | run_unittests.py | 177 | ||||
-rw-r--r-- | test cases/common/100 manygen/depuser.c (renamed from test cases/common/103 manygen/depuser.c) | 0 | ||||
-rw-r--r-- | test cases/common/100 manygen/meson.build (renamed from test cases/common/103 manygen/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/100 manygen/subdir/funcinfo.def (renamed from test cases/common/103 manygen/subdir/funcinfo.def) | 0 | ||||
-rwxr-xr-x | test cases/common/100 manygen/subdir/manygen.py (renamed from test cases/common/103 manygen/subdir/manygen.py) | 0 | ||||
-rw-r--r-- | test cases/common/100 manygen/subdir/meson.build (renamed from test cases/common/103 manygen/subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/101 stringdef/meson.build (renamed from test cases/common/104 stringdef/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/101 stringdef/stringdef.c (renamed from test cases/common/104 stringdef/stringdef.c) | 0 | ||||
-rw-r--r-- | test cases/common/102 find program path/meson.build (renamed from test cases/common/105 find program path/meson.build) | 0 | ||||
-rwxr-xr-x | test cases/common/102 find program path/program.py (renamed from test cases/common/105 find program path/program.py) | 0 | ||||
-rw-r--r-- | test cases/common/103 subproject subdir/meson.build (renamed from test cases/common/106 subproject subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/103 subproject subdir/prog.c (renamed from test cases/common/106 subproject subdir/prog.c) | 2 | ||||
-rw-r--r-- | test cases/common/103 subproject subdir/subprojects/sub/lib/meson.build (renamed from test cases/common/106 subproject subdir/subprojects/sub/lib/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/103 subproject subdir/subprojects/sub/lib/sub.c (renamed from test cases/common/106 subproject subdir/subprojects/sub/lib/sub.c) | 2 | ||||
-rw-r--r-- | test cases/common/103 subproject subdir/subprojects/sub/lib/sub.h (renamed from test cases/common/106 subproject subdir/subprojects/sub/lib/sub.h) | 0 | ||||
-rw-r--r-- | test cases/common/103 subproject subdir/subprojects/sub/meson.build (renamed from test cases/common/106 subproject subdir/subprojects/sub/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/104 postconf/meson.build (renamed from test cases/common/107 postconf/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/104 postconf/postconf.py (renamed from test cases/common/107 postconf/postconf.py) | 0 | ||||
-rw-r--r-- | test cases/common/104 postconf/prog.c (renamed from test cases/common/107 postconf/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/104 postconf/raw.dat (renamed from test cases/common/107 postconf/raw.dat) | 0 | ||||
-rw-r--r-- | test cases/common/105 postconf with args/meson.build (renamed from test cases/common/108 postconf with args/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/105 postconf with args/postconf.py (renamed from test cases/common/108 postconf with args/postconf.py) | 0 | ||||
-rw-r--r-- | test cases/common/105 postconf with args/prog.c (renamed from test cases/common/108 postconf with args/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/105 postconf with args/raw.dat (renamed from test cases/common/108 postconf with args/raw.dat) | 0 | ||||
-rw-r--r-- | test cases/common/106 testframework options/meson.build (renamed from test cases/common/109 testframework options/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/106 testframework options/meson_options.txt (renamed from test cases/common/109 testframework options/meson_options.txt) | 0 | ||||
-rw-r--r-- | test cases/common/106 testframework options/test_args.txt (renamed from test cases/common/109 testframework options/test_args.txt) | 0 | ||||
-rw-r--r-- | test cases/common/107 extract same name/lib.c (renamed from test cases/common/110 extract same name/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/107 extract same name/main.c (renamed from test cases/common/110 extract same name/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/107 extract same name/meson.build (renamed from test cases/common/110 extract same name/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/107 extract same name/src/lib.c (renamed from test cases/common/110 extract same name/src/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/108 has header symbol/meson.build (renamed from test cases/common/111 has header symbol/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/109 has arg/meson.build (renamed from test cases/common/112 has arg/meson.build) | 0 | ||||
-rwxr-xr-x | test cases/common/110 generatorcustom/catter.py (renamed from test cases/common/113 generatorcustom/catter.py) | 0 | ||||
-rwxr-xr-x | test cases/common/110 generatorcustom/gen.py (renamed from test cases/common/113 generatorcustom/gen.py) | 0 | ||||
-rw-r--r-- | test cases/common/110 generatorcustom/main.c (renamed from test cases/common/113 generatorcustom/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/110 generatorcustom/meson.build (renamed from test cases/common/113 generatorcustom/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/110 generatorcustom/res1.txt (renamed from test cases/common/113 generatorcustom/res1.txt) | 0 | ||||
-rw-r--r-- | test cases/common/110 generatorcustom/res2.txt (renamed from test cases/common/113 generatorcustom/res2.txt) | 0 | ||||
-rw-r--r-- | test cases/common/111 multiple dir configure file/meson.build (renamed from test cases/common/114 multiple dir configure file/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/111 multiple dir configure file/subdir/foo.txt (renamed from test cases/common/114 multiple dir configure file/subdir/foo.txt) | 0 | ||||
-rw-r--r-- | test cases/common/111 multiple dir configure file/subdir/meson.build (renamed from test cases/common/114 multiple dir configure file/subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/111 multiple dir configure file/subdir/someinput.in (renamed from test cases/common/114 multiple dir configure file/subdir/someinput.in) | 0 | ||||
-rw-r--r-- | test cases/common/112 spaces backslash/asm output/meson.build (renamed from test cases/common/115 spaces backslash/asm output/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/112 spaces backslash/comparer-end-notstring.c (renamed from test cases/common/115 spaces backslash/comparer-end-notstring.c) | 0 | ||||
-rw-r--r-- | test cases/common/112 spaces backslash/comparer-end.c (renamed from test cases/common/115 spaces backslash/comparer-end.c) | 0 | ||||
-rw-r--r-- | test cases/common/112 spaces backslash/comparer.c (renamed from test cases/common/115 spaces backslash/comparer.c) | 0 | ||||
-rw-r--r-- | test cases/common/112 spaces backslash/include/comparer.h (renamed from test cases/common/115 spaces backslash/include/comparer.h) | 0 | ||||
-rw-r--r-- | test cases/common/112 spaces backslash/meson.build (renamed from test cases/common/115 spaces backslash/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/113 ternary/meson.build (renamed from test cases/common/116 ternary/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/114 custom target capture/data_source.txt (renamed from test cases/common/117 custom target capture/data_source.txt) | 0 | ||||
-rw-r--r-- | test cases/common/114 custom target capture/installed_files.txt (renamed from test cases/common/117 custom target capture/installed_files.txt) | 0 | ||||
-rw-r--r-- | test cases/common/114 custom target capture/meson.build (renamed from test cases/common/117 custom target capture/meson.build) | 0 | ||||
-rwxr-xr-x | test cases/common/114 custom target capture/my_compiler.py (renamed from test cases/common/117 custom target capture/my_compiler.py) | 0 | ||||
-rwxr-xr-x | test cases/common/115 allgenerate/converter.py (renamed from test cases/common/118 allgenerate/converter.py) | 0 | ||||
-rw-r--r-- | test cases/common/115 allgenerate/foobar.cpp.in (renamed from test cases/common/118 allgenerate/foobar.cpp.in) | 0 | ||||
-rw-r--r-- | test cases/common/115 allgenerate/meson.build (renamed from test cases/common/118 allgenerate/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/116 pathjoin/meson.build (renamed from test cases/common/119 pathjoin/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/117 subdir subproject/meson.build (renamed from test cases/common/120 subdir subproject/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/117 subdir subproject/prog/meson.build (renamed from test cases/common/120 subdir subproject/prog/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/117 subdir subproject/prog/prog.c (renamed from test cases/common/120 subdir subproject/prog/prog.c) | 2 | ||||
-rw-r--r-- | test cases/common/117 subdir subproject/subprojects/sub/meson.build (renamed from test cases/common/120 subdir subproject/subprojects/sub/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/117 subdir subproject/subprojects/sub/sub.c (renamed from test cases/common/120 subdir subproject/subprojects/sub/sub.c) | 2 | ||||
-rw-r--r-- | test cases/common/117 subdir subproject/subprojects/sub/sub.h (renamed from test cases/common/120 subdir subproject/subprojects/sub/sub.h) | 0 | ||||
-rw-r--r-- | test cases/common/118 interpreter copy mutable var on assignment/meson.build (renamed from test cases/common/121 interpreter copy mutable var on assignment/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/119 skip/meson.build (renamed from test cases/common/122 skip/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/120 subproject project arguments/exe.c (renamed from test cases/common/123 subproject project arguments/exe.c) | 0 | ||||
-rw-r--r-- | test cases/common/120 subproject project arguments/exe.cpp (renamed from test cases/common/123 subproject project arguments/exe.cpp) | 0 | ||||
-rw-r--r-- | test cases/common/120 subproject project arguments/meson.build (renamed from test cases/common/123 subproject project arguments/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/120 subproject project arguments/subprojects/subexe/meson.build (renamed from test cases/common/123 subproject project arguments/subprojects/subexe/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/120 subproject project arguments/subprojects/subexe/subexe.c (renamed from test cases/common/123 subproject project arguments/subprojects/subexe/subexe.c) | 0 | ||||
-rw-r--r-- | test cases/common/121 test skip/meson.build (renamed from test cases/common/124 test skip/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/121 test skip/test_skip.c | 3 | ||||
-rw-r--r-- | test cases/common/122 shared module/installed_files.txt (renamed from test cases/common/125 shared module/installed_files.txt) | 0 | ||||
-rw-r--r-- | test cases/common/122 shared module/meson.build (renamed from test cases/common/125 shared module/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/122 shared module/module.c (renamed from test cases/common/125 shared module/module.c) | 0 | ||||
-rw-r--r-- | test cases/common/122 shared module/nosyms.c (renamed from test cases/common/125 shared module/nosyms.c) | 0 | ||||
-rw-r--r-- | test cases/common/122 shared module/prog.c (renamed from test cases/common/125 shared module/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/122 shared module/runtime.c (renamed from test cases/common/125 shared module/runtime.c) | 0 | ||||
-rw-r--r-- | test cases/common/123 llvm ir and assembly/main.c (renamed from test cases/common/126 llvm ir and assembly/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/123 llvm ir and assembly/main.cpp (renamed from test cases/common/126 llvm ir and assembly/main.cpp) | 0 | ||||
-rw-r--r-- | test cases/common/123 llvm ir and assembly/meson.build (renamed from test cases/common/126 llvm ir and assembly/meson.build) | 2 | ||||
-rw-r--r-- | test cases/common/123 llvm ir and assembly/square-arm.S (renamed from test cases/common/126 llvm ir and assembly/square-arm.S) | 6 | ||||
-rw-r--r-- | test cases/common/123 llvm ir and assembly/square-x86.S (renamed from test cases/common/126 llvm ir and assembly/square-x86.S) | 13 | ||||
-rw-r--r-- | test cases/common/123 llvm ir and assembly/square-x86_64.S (renamed from test cases/common/126 llvm ir and assembly/square-x86_64.S) | 16 | ||||
-rw-r--r-- | test cases/common/123 llvm ir and assembly/square.ll (renamed from test cases/common/126 llvm ir and assembly/square.ll) | 0 | ||||
-rw-r--r-- | test cases/common/123 llvm ir and assembly/symbol-underscore.h (renamed from test cases/common/126 llvm ir and assembly/symbol-underscore.h) | 0 | ||||
-rw-r--r-- | test cases/common/124 cpp and asm/meson.build (renamed from test cases/common/127 cpp and asm/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/124 cpp and asm/retval-arm.S (renamed from test cases/common/127 cpp and asm/retval-arm.S) | 0 | ||||
-rw-r--r-- | test cases/common/124 cpp and asm/retval-x86.S (renamed from test cases/common/127 cpp and asm/retval-x86.S) | 0 | ||||
-rw-r--r-- | test cases/common/124 cpp and asm/retval-x86_64.S (renamed from test cases/common/127 cpp and asm/retval-x86_64.S) | 0 | ||||
-rw-r--r-- | test cases/common/124 cpp and asm/symbol-underscore.h (renamed from test cases/common/127 cpp and asm/symbol-underscore.h) | 0 | ||||
-rw-r--r-- | test cases/common/124 cpp and asm/trivial.cc (renamed from test cases/common/127 cpp and asm/trivial.cc) | 0 | ||||
-rw-r--r-- | test cases/common/124 test skip/test_skip.c | 4 | ||||
-rw-r--r-- | test cases/common/125 extract all shared library/extractor.h (renamed from test cases/common/128 extract all shared library/extractor.h) | 0 | ||||
-rw-r--r-- | test cases/common/125 extract all shared library/four.c (renamed from test cases/common/128 extract all shared library/four.c) | 0 | ||||
-rw-r--r-- | test cases/common/125 extract all shared library/func1234.def (renamed from test cases/common/128 extract all shared library/func1234.def) | 0 | ||||
-rw-r--r-- | test cases/common/125 extract all shared library/meson.build (renamed from test cases/common/128 extract all shared library/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/125 extract all shared library/one.c (renamed from test cases/common/128 extract all shared library/one.c) | 0 | ||||
-rw-r--r-- | test cases/common/125 extract all shared library/prog.c (renamed from test cases/common/128 extract all shared library/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/125 extract all shared library/three.c (renamed from test cases/common/128 extract all shared library/three.c) | 0 | ||||
-rw-r--r-- | test cases/common/125 extract all shared library/two.c (renamed from test cases/common/128 extract all shared library/two.c) | 0 | ||||
-rw-r--r-- | test cases/common/126 object only target/installed_files.txt (renamed from test cases/common/129 object only target/installed_files.txt) | 0 | ||||
-rw-r--r-- | test cases/common/126 object only target/meson.build (renamed from test cases/common/129 object only target/meson.build) | 0 | ||||
-rwxr-xr-x | test cases/common/126 object only target/obj_generator.py (renamed from test cases/common/129 object only target/obj_generator.py) | 0 | ||||
-rw-r--r-- | test cases/common/126 object only target/prog.c (renamed from test cases/common/129 object only target/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/126 object only target/source.c (renamed from test cases/common/129 object only target/source.c) | 0 | ||||
-rw-r--r-- | test cases/common/126 object only target/source2.c (renamed from test cases/common/129 object only target/source2.c) | 0 | ||||
-rw-r--r-- | test cases/common/126 object only target/source2.def (renamed from test cases/common/129 object only target/source2.def) | 0 | ||||
-rw-r--r-- | test cases/common/126 object only target/source3.c (renamed from test cases/common/129 object only target/source3.c) | 0 | ||||
-rw-r--r-- | test cases/common/127 no buildincdir/include/header.h (renamed from test cases/common/130 no buildincdir/include/header.h) | 0 | ||||
-rw-r--r-- | test cases/common/127 no buildincdir/meson.build (renamed from test cases/common/130 no buildincdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/127 no buildincdir/prog.c (renamed from test cases/common/130 no buildincdir/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/128 custom target directory install/docgen.py (renamed from test cases/common/131 custom target directory install/docgen.py) | 0 | ||||
-rw-r--r-- | test cases/common/128 custom target directory install/installed_files.txt (renamed from test cases/common/131 custom target directory install/installed_files.txt) | 0 | ||||
-rw-r--r-- | test cases/common/128 custom target directory install/meson.build (renamed from test cases/common/131 custom target directory install/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/129 dependency file generation/main .c (renamed from test cases/common/132 dependency file generation/main .c) | 0 | ||||
-rw-r--r-- | test cases/common/129 dependency file generation/meson.build (renamed from test cases/common/132 dependency file generation/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/13 pch/c/meson.build | 8 | ||||
-rw-r--r-- | test cases/common/13 pch/c/pch/prog.h (renamed from test cases/common/13 pch/pch/prog.h) | 0 | ||||
-rw-r--r-- | test cases/common/13 pch/c/pch/prog_pch.c (renamed from test cases/common/13 pch/pch/prog_pch.c) | 0 | ||||
-rw-r--r-- | test cases/common/13 pch/c/prog.c (renamed from test cases/common/13 pch/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/13 pch/cpp/meson.build (renamed from test cases/common/14 cpp pch/meson.build) | 1 | ||||
-rw-r--r-- | test cases/common/13 pch/cpp/pch/prog.hh (renamed from test cases/common/14 cpp pch/pch/prog.hh) | 0 | ||||
-rw-r--r-- | test cases/common/13 pch/cpp/pch/prog_pch.cc (renamed from test cases/common/14 cpp pch/pch/prog_pch.cc) | 0 | ||||
-rw-r--r-- | test cases/common/13 pch/cpp/prog.cc (renamed from test cases/common/14 cpp pch/prog.cc) | 0 | ||||
-rw-r--r-- | test cases/common/13 pch/meson.build | 13 | ||||
-rw-r--r-- | test cases/common/13 pch/mixed/func.c (renamed from test cases/common/15 mixed pch/func.c) | 0 | ||||
-rw-r--r-- | test cases/common/13 pch/mixed/main.cc (renamed from test cases/common/15 mixed pch/main.cc) | 0 | ||||
-rw-r--r-- | test cases/common/13 pch/mixed/meson.build (renamed from test cases/common/15 mixed pch/meson.build) | 3 | ||||
-rw-r--r-- | test cases/common/13 pch/mixed/pch/func.h (renamed from test cases/common/15 mixed pch/pch/func.h) | 0 | ||||
-rw-r--r-- | test cases/common/13 pch/mixed/pch/func_pch.c (renamed from test cases/common/15 mixed pch/pch/func_pch.c) | 0 | ||||
-rw-r--r-- | test cases/common/13 pch/mixed/pch/main.h (renamed from test cases/common/15 mixed pch/pch/main.h) | 0 | ||||
-rw-r--r-- | test cases/common/13 pch/mixed/pch/main_pch.cc (renamed from test cases/common/15 mixed pch/pch/main_pch.cc) | 0 | ||||
-rw-r--r-- | test cases/common/130 configure file in generator/inc/confdata.in (renamed from test cases/common/133 configure file in generator/inc/confdata.in) | 0 | ||||
-rw-r--r-- | test cases/common/130 configure file in generator/inc/meson.build (renamed from test cases/common/133 configure file in generator/inc/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/130 configure file in generator/meson.build (renamed from test cases/common/133 configure file in generator/meson.build) | 0 | ||||
-rwxr-xr-x | test cases/common/130 configure file in generator/src/gen.py (renamed from test cases/common/133 configure file in generator/src/gen.py) | 0 | ||||
-rw-r--r-- | test cases/common/130 configure file in generator/src/main.c (renamed from test cases/common/133 configure file in generator/src/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/130 configure file in generator/src/meson.build (renamed from test cases/common/133 configure file in generator/src/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/130 configure file in generator/src/source (renamed from test cases/common/133 configure file in generator/src/source) | 0 | ||||
-rw-r--r-- | test cases/common/131 generated llvm ir/copyfile.py (renamed from test cases/common/134 generated llvm ir/copyfile.py) | 0 | ||||
-rw-r--r-- | test cases/common/131 generated llvm ir/main.c (renamed from test cases/common/134 generated llvm ir/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/131 generated llvm ir/meson.build (renamed from test cases/common/134 generated llvm ir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/131 generated llvm ir/square.ll.in (renamed from test cases/common/134 generated llvm ir/square.ll.in) | 0 | ||||
-rw-r--r-- | test cases/common/132 generated assembly/copyfile.py (renamed from test cases/common/135 generated assembly/copyfile.py) | 0 | ||||
-rw-r--r-- | test cases/common/132 generated assembly/main.c (renamed from test cases/common/135 generated assembly/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/132 generated assembly/meson.build (renamed from test cases/common/135 generated assembly/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/132 generated assembly/square-arm.S.in (renamed from test cases/common/135 generated assembly/square-arm.S.in) | 0 | ||||
-rw-r--r-- | test cases/common/132 generated assembly/square-x86.S.in (renamed from test cases/common/135 generated assembly/square-x86.S.in) | 0 | ||||
-rw-r--r-- | test cases/common/132 generated assembly/square-x86_64.S.in (renamed from test cases/common/135 generated assembly/square-x86_64.S.in) | 0 | ||||
-rw-r--r-- | test cases/common/132 generated assembly/symbol-underscore.h (renamed from test cases/common/135 generated assembly/symbol-underscore.h) | 0 | ||||
-rw-r--r-- | test cases/common/133 build by default targets in tests/main.c (renamed from test cases/common/136 build by default targets in tests/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/133 build by default targets in tests/meson.build (renamed from test cases/common/136 build by default targets in tests/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/133 build by default targets in tests/write_file.py (renamed from test cases/common/136 build by default targets in tests/write_file.py) | 0 | ||||
-rw-r--r-- | test cases/common/134 build by default/checkexists.py (renamed from test cases/common/137 build by default/checkexists.py) | 0 | ||||
-rw-r--r-- | test cases/common/134 build by default/foo.c (renamed from test cases/common/137 build by default/foo.c) | 0 | ||||
-rw-r--r-- | test cases/common/134 build by default/meson.build (renamed from test cases/common/137 build by default/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/134 build by default/mygen.py (renamed from test cases/common/137 build by default/mygen.py) | 0 | ||||
-rw-r--r-- | test cases/common/134 build by default/source.txt (renamed from test cases/common/137 build by default/source.txt) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/ctsub/copyfile.py (renamed from test cases/common/138 include order/ctsub/copyfile.py) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/ctsub/emptyfile.c (renamed from test cases/common/138 include order/ctsub/emptyfile.c) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/ctsub/main.h (renamed from test cases/common/138 include order/ctsub/main.h) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/ctsub/meson.build (renamed from test cases/common/138 include order/ctsub/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/inc1/hdr.h (renamed from test cases/common/138 include order/inc1/hdr.h) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/inc2/hdr.h (renamed from test cases/common/138 include order/inc2/hdr.h) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/meson.build (renamed from test cases/common/138 include order/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/ordertest.c (renamed from test cases/common/138 include order/ordertest.c) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/sub1/main.h (renamed from test cases/common/138 include order/sub1/main.h) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/sub1/meson.build (renamed from test cases/common/138 include order/sub1/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/sub1/some.c (renamed from test cases/common/138 include order/sub1/some.c) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/sub1/some.h (renamed from test cases/common/138 include order/sub1/some.h) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/sub2/main.h (renamed from test cases/common/138 include order/sub2/main.h) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/sub2/meson.build (renamed from test cases/common/138 include order/sub2/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/sub3/main.h (renamed from test cases/common/138 include order/sub3/main.h) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/sub3/meson.build (renamed from test cases/common/138 include order/sub3/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/sub4/main.c (renamed from test cases/common/138 include order/sub4/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/sub4/main.h (renamed from test cases/common/138 include order/sub4/main.h) | 0 | ||||
-rw-r--r-- | test cases/common/135 include order/sub4/meson.build (renamed from test cases/common/138 include order/sub4/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/136 override options/four.c (renamed from test cases/common/139 override options/four.c) | 0 | ||||
-rw-r--r-- | test cases/common/136 override options/meson.build (renamed from test cases/common/139 override options/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/136 override options/one.c (renamed from test cases/common/139 override options/one.c) | 0 | ||||
-rw-r--r-- | test cases/common/136 override options/three.c (renamed from test cases/common/139 override options/three.c) | 0 | ||||
-rw-r--r-- | test cases/common/136 override options/two.c (renamed from test cases/common/139 override options/two.c) | 0 | ||||
-rw-r--r-- | test cases/common/137 get define/concat.h (renamed from test cases/common/140 get define/concat.h) | 0 | ||||
-rw-r--r-- | test cases/common/137 get define/meson.build (renamed from test cases/common/140 get define/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/137 get define/meson_options.txt (renamed from test cases/common/140 get define/meson_options.txt) | 0 | ||||
-rw-r--r-- | test cases/common/138 c cpp and asm/main.c (renamed from test cases/common/141 c cpp and asm/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/138 c cpp and asm/main.cpp (renamed from test cases/common/141 c cpp and asm/main.cpp) | 0 | ||||
-rw-r--r-- | test cases/common/138 c cpp and asm/meson.build (renamed from test cases/common/141 c cpp and asm/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/138 c cpp and asm/retval-arm.S (renamed from test cases/common/141 c cpp and asm/retval-arm.S) | 0 | ||||
-rw-r--r-- | test cases/common/138 c cpp and asm/retval-x86.S (renamed from test cases/common/141 c cpp and asm/retval-x86.S) | 0 | ||||
-rw-r--r-- | test cases/common/138 c cpp and asm/retval-x86_64.S (renamed from test cases/common/141 c cpp and asm/retval-x86_64.S) | 0 | ||||
-rw-r--r-- | test cases/common/138 c cpp and asm/somelib.c (renamed from test cases/common/141 c cpp and asm/somelib.c) | 0 | ||||
-rw-r--r-- | test cases/common/138 c cpp and asm/symbol-underscore.h (renamed from test cases/common/141 c cpp and asm/symbol-underscore.h) | 0 | ||||
-rw-r--r-- | test cases/common/139 compute int/config.h.in (renamed from test cases/common/142 compute int/config.h.in) | 0 | ||||
-rw-r--r-- | test cases/common/139 compute int/foobar.h (renamed from test cases/common/142 compute int/foobar.h) | 0 | ||||
-rw-r--r-- | test cases/common/139 compute int/meson.build (renamed from test cases/common/142 compute int/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/139 compute int/prog.c.in (renamed from test cases/common/142 compute int/prog.c.in) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/basename.py (renamed from test cases/common/16 configure file/basename.py) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/check_file.py (renamed from test cases/common/16 configure file/check_file.py) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/config.h (renamed from test cases/common/16 configure file/config.h) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/config.h.in (renamed from test cases/common/16 configure file/config.h.in) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/config4a.h.in (renamed from test cases/common/16 configure file/config4a.h.in) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/config4b.h.in (renamed from test cases/common/16 configure file/config4b.h.in) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/config5.h.in (renamed from test cases/common/16 configure file/config5.h.in) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/config6.h.in (renamed from test cases/common/16 configure file/config6.h.in) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/config7.h.in (renamed from test cases/common/16 configure file/config7.h.in) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/config8.h.in (renamed from test cases/common/16 configure file/config8.h.in) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/dummy.dat (renamed from test cases/common/16 configure file/dummy.dat) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/dumpprog.c (renamed from test cases/common/16 configure file/dumpprog.c) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/file_contains.py (renamed from test cases/common/16 configure file/file_contains.py) | 0 | ||||
-rwxr-xr-x | test cases/common/14 configure file/generator-without-input-file.py (renamed from test cases/common/16 configure file/generator-without-input-file.py) | 0 | ||||
-rwxr-xr-x | test cases/common/14 configure file/generator.py (renamed from test cases/common/16 configure file/generator.py) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/installed_files.txt (renamed from test cases/common/16 configure file/installed_files.txt) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/invalid-utf8.bin.in (renamed from test cases/common/16 configure file/invalid-utf8.bin.in) | bin | 10 -> 10 bytes | |||
-rw-r--r-- | test cases/common/14 configure file/meson.build (renamed from test cases/common/16 configure file/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/nosubst-nocopy1.txt.in (renamed from test cases/common/16 configure file/nosubst-nocopy1.txt.in) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/nosubst-nocopy2.txt.in (renamed from test cases/common/16 configure file/nosubst-nocopy2.txt.in) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/prog.c (renamed from test cases/common/16 configure file/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/prog2.c (renamed from test cases/common/16 configure file/prog2.c) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/prog4.c (renamed from test cases/common/16 configure file/prog4.c) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/prog5.c (renamed from test cases/common/16 configure file/prog5.c) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/prog6.c (renamed from test cases/common/16 configure file/prog6.c) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/prog7.c (renamed from test cases/common/16 configure file/prog7.c) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/subdir/meson.build (renamed from test cases/common/16 configure file/subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/test.py.in (renamed from test cases/common/16 configure file/test.py.in) | 0 | ||||
-rw-r--r-- | test cases/common/14 configure file/touch.py (renamed from test cases/common/16 configure file/touch.py) | 0 | ||||
-rw-r--r-- | test cases/common/140 custom target object output/meson.build (renamed from test cases/common/143 custom target object output/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/140 custom target object output/obj_generator.py (renamed from test cases/common/143 custom target object output/obj_generator.py) | 0 | ||||
-rw-r--r-- | test cases/common/140 custom target object output/objdir/meson.build (renamed from test cases/common/143 custom target object output/objdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/140 custom target object output/objdir/source.c (renamed from test cases/common/143 custom target object output/objdir/source.c) | 0 | ||||
-rw-r--r-- | test cases/common/140 custom target object output/progdir/meson.build (renamed from test cases/common/143 custom target object output/progdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/140 custom target object output/progdir/prog.c (renamed from test cases/common/143 custom target object output/progdir/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/141 empty build file/meson.build (renamed from test cases/common/144 empty build file/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/141 empty build file/subdir/meson.build (renamed from test cases/common/144 empty build file/subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/142 whole archive/exe/meson.build (renamed from test cases/common/145 whole archive/exe/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/142 whole archive/exe2/meson.build (renamed from test cases/common/145 whole archive/exe2/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/142 whole archive/exe3/meson.build (renamed from test cases/common/145 whole archive/exe3/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/142 whole archive/exe4/meson.build (renamed from test cases/common/145 whole archive/exe4/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/142 whole archive/func1.c (renamed from test cases/common/145 whole archive/func1.c) | 0 | ||||
-rw-r--r-- | test cases/common/142 whole archive/func2.c (renamed from test cases/common/145 whole archive/func2.c) | 0 | ||||
-rw-r--r-- | test cases/common/142 whole archive/meson.build (renamed from test cases/common/145 whole archive/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/142 whole archive/mylib.h (renamed from test cases/common/145 whole archive/mylib.h) | 0 | ||||
-rw-r--r-- | test cases/common/142 whole archive/prog.c (renamed from test cases/common/145 whole archive/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/142 whole archive/sh_func2_dep_func1/meson.build (renamed from test cases/common/145 whole archive/sh_func2_dep_func1/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/142 whole archive/sh_func2_linked_func1/meson.build (renamed from test cases/common/145 whole archive/sh_func2_linked_func1/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/142 whole archive/sh_func2_transdep_func1/meson.build (renamed from test cases/common/145 whole archive/sh_func2_transdep_func1/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/142 whole archive/sh_only_link_whole/meson.build (renamed from test cases/common/145 whole archive/sh_only_link_whole/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/142 whole archive/st_func1/meson.build (renamed from test cases/common/145 whole archive/st_func1/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/142 whole archive/st_func2/meson.build (renamed from test cases/common/145 whole archive/st_func2/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/143 C and CPP link/dummy.c (renamed from test cases/common/146 C and CPP link/dummy.c) | 0 | ||||
-rw-r--r-- | test cases/common/143 C and CPP link/foo.c (renamed from test cases/common/146 C and CPP link/foo.c) | 0 | ||||
-rw-r--r-- | test cases/common/143 C and CPP link/foo.cpp (renamed from test cases/common/146 C and CPP link/foo.cpp) | 0 | ||||
-rw-r--r-- | test cases/common/143 C and CPP link/foo.h (renamed from test cases/common/146 C and CPP link/foo.h) | 0 | ||||
-rw-r--r-- | test cases/common/143 C and CPP link/foo.hpp (renamed from test cases/common/146 C and CPP link/foo.hpp) | 0 | ||||
-rw-r--r-- | test cases/common/143 C and CPP link/foobar.c (renamed from test cases/common/146 C and CPP link/foobar.c) | 0 | ||||
-rw-r--r-- | test cases/common/143 C and CPP link/foobar.h (renamed from test cases/common/146 C and CPP link/foobar.h) | 0 | ||||
-rw-r--r-- | test cases/common/143 C and CPP link/meson.build (renamed from test cases/common/146 C and CPP link/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/143 C and CPP link/sub.c (renamed from test cases/common/146 C and CPP link/sub.c) | 0 | ||||
-rw-r--r-- | test cases/common/143 C and CPP link/sub.h (renamed from test cases/common/146 C and CPP link/sub.h) | 0 | ||||
-rw-r--r-- | test cases/common/144 mesonintrospect from scripts/check_env.py (renamed from test cases/common/147 mesonintrospect from scripts/check_env.py) | 0 | ||||
-rw-r--r-- | test cases/common/144 mesonintrospect from scripts/meson.build (renamed from test cases/common/147 mesonintrospect from scripts/meson.build) | 0 | ||||
-rwxr-xr-x | test cases/common/145 custom target multiple outputs/generator.py (renamed from test cases/common/148 custom target multiple outputs/generator.py) | 0 | ||||
-rw-r--r-- | test cases/common/145 custom target multiple outputs/installed_files.txt (renamed from test cases/common/148 custom target multiple outputs/installed_files.txt) | 0 | ||||
-rw-r--r-- | test cases/common/145 custom target multiple outputs/meson.build (renamed from test cases/common/148 custom target multiple outputs/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/146 special characters/check_quoting.py (renamed from test cases/common/149 special characters/check_quoting.py) | 0 | ||||
-rw-r--r-- | test cases/common/146 special characters/installed_files.txt (renamed from test cases/common/149 special characters/installed_files.txt) | 0 | ||||
-rw-r--r-- | test cases/common/146 special characters/meson.build (renamed from test cases/common/149 special characters/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/147 nested links/meson.build (renamed from test cases/common/150 nested links/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/147 nested links/xephyr.c (renamed from test cases/common/150 nested links/xephyr.c) | 0 | ||||
-rw-r--r-- | test cases/common/148 list of file sources/foo (renamed from test cases/common/151 list of file sources/foo) | 0 | ||||
-rw-r--r-- | test cases/common/148 list of file sources/gen.py (renamed from test cases/common/151 list of file sources/gen.py) | 0 | ||||
-rw-r--r-- | test cases/common/148 list of file sources/meson.build (renamed from test cases/common/151 list of file sources/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/149 link depends custom target/foo.c (renamed from test cases/common/152 link depends custom target/foo.c) | 0 | ||||
-rwxr-xr-x | test cases/common/149 link depends custom target/make_file.py (renamed from test cases/common/152 link depends custom target/make_file.py) | 0 | ||||
-rw-r--r-- | test cases/common/149 link depends custom target/meson.build (renamed from test cases/common/152 link depends custom target/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/15 if/meson.build (renamed from test cases/common/17 if/meson.build) | 30 | ||||
-rw-r--r-- | test cases/common/15 if/prog.c (renamed from test cases/common/17 if/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/3rdorderdeps/lib.c.in (renamed from test cases/common/153 recursive linking/3rdorderdeps/lib.c.in) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/3rdorderdeps/main.c.in (renamed from test cases/common/153 recursive linking/3rdorderdeps/main.c.in) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/3rdorderdeps/meson.build (renamed from test cases/common/153 recursive linking/3rdorderdeps/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/circular/lib1.c (renamed from test cases/common/153 recursive linking/circular/lib1.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/circular/lib2.c (renamed from test cases/common/153 recursive linking/circular/lib2.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/circular/lib3.c (renamed from test cases/common/153 recursive linking/circular/lib3.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/circular/main.c (renamed from test cases/common/153 recursive linking/circular/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/circular/meson.build (renamed from test cases/common/153 recursive linking/circular/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/circular/prop1.c (renamed from test cases/common/153 recursive linking/circular/prop1.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/circular/prop2.c (renamed from test cases/common/153 recursive linking/circular/prop2.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/circular/prop3.c (renamed from test cases/common/153 recursive linking/circular/prop3.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/edge-cases/libsto.c (renamed from test cases/common/153 recursive linking/edge-cases/libsto.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/edge-cases/meson.build (renamed from test cases/common/153 recursive linking/edge-cases/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/edge-cases/shstmain.c (renamed from test cases/common/153 recursive linking/edge-cases/shstmain.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/edge-cases/stobuilt.c (renamed from test cases/common/153 recursive linking/edge-cases/stobuilt.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/edge-cases/stomain.c (renamed from test cases/common/153 recursive linking/edge-cases/stomain.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/lib.h (renamed from test cases/common/153 recursive linking/lib.h) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/main.c (renamed from test cases/common/153 recursive linking/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/meson.build (renamed from test cases/common/153 recursive linking/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/shnodep/lib.c (renamed from test cases/common/153 recursive linking/shnodep/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/shnodep/meson.build (renamed from test cases/common/153 recursive linking/shnodep/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/shshdep/lib.c (renamed from test cases/common/153 recursive linking/shshdep/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/shshdep/meson.build (renamed from test cases/common/153 recursive linking/shshdep/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/shstdep/lib.c (renamed from test cases/common/153 recursive linking/shstdep/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/shstdep/meson.build (renamed from test cases/common/153 recursive linking/shstdep/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/stnodep/lib.c (renamed from test cases/common/153 recursive linking/stnodep/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/stnodep/meson.build (renamed from test cases/common/153 recursive linking/stnodep/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/stshdep/lib.c (renamed from test cases/common/153 recursive linking/stshdep/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/stshdep/meson.build (renamed from test cases/common/153 recursive linking/stshdep/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/ststdep/lib.c (renamed from test cases/common/153 recursive linking/ststdep/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/150 recursive linking/ststdep/meson.build (renamed from test cases/common/153 recursive linking/ststdep/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/151 library at root/lib.c (renamed from test cases/common/154 library at root/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/151 library at root/main/main.c (renamed from test cases/common/154 library at root/main/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/151 library at root/main/meson.build (renamed from test cases/common/154 library at root/main/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/151 library at root/meson.build (renamed from test cases/common/154 library at root/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/152 simd/fallback.c (renamed from test cases/common/155 simd/fallback.c) | 0 | ||||
-rw-r--r-- | test cases/common/152 simd/include/simdheader.h (renamed from test cases/common/155 simd/include/simdheader.h) | 0 | ||||
-rw-r--r-- | test cases/common/152 simd/meson.build (renamed from test cases/common/155 simd/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/152 simd/simd_avx.c (renamed from test cases/common/155 simd/simd_avx.c) | 0 | ||||
-rw-r--r-- | test cases/common/152 simd/simd_avx2.c (renamed from test cases/common/155 simd/simd_avx2.c) | 0 | ||||
-rw-r--r-- | test cases/common/152 simd/simd_mmx.c (renamed from test cases/common/155 simd/simd_mmx.c) | 0 | ||||
-rw-r--r-- | test cases/common/152 simd/simd_neon.c (renamed from test cases/common/155 simd/simd_neon.c) | 0 | ||||
-rw-r--r-- | test cases/common/152 simd/simd_sse.c (renamed from test cases/common/155 simd/simd_sse.c) | 0 | ||||
-rw-r--r-- | test cases/common/152 simd/simd_sse2.c (renamed from test cases/common/155 simd/simd_sse2.c) | 0 | ||||
-rw-r--r-- | test cases/common/152 simd/simd_sse3.c (renamed from test cases/common/155 simd/simd_sse3.c) | 0 | ||||
-rw-r--r-- | test cases/common/152 simd/simd_sse41.c (renamed from test cases/common/155 simd/simd_sse41.c) | 0 | ||||
-rw-r--r-- | test cases/common/152 simd/simd_sse42.c (renamed from test cases/common/155 simd/simd_sse42.c) | 0 | ||||
-rw-r--r-- | test cases/common/152 simd/simd_ssse3.c (renamed from test cases/common/155 simd/simd_ssse3.c) | 0 | ||||
-rw-r--r-- | test cases/common/152 simd/simdchecker.c (renamed from test cases/common/155 simd/simdchecker.c) | 0 | ||||
-rw-r--r-- | test cases/common/152 simd/simdfuncs.h (renamed from test cases/common/155 simd/simdfuncs.h) | 0 | ||||
-rw-r--r-- | test cases/common/153 shared module resolving symbol in executable/meson.build (renamed from test cases/common/156 shared module resolving symbol in executable/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/153 shared module resolving symbol in executable/module.c (renamed from test cases/common/156 shared module resolving symbol in executable/module.c) | 0 | ||||
-rw-r--r-- | test cases/common/153 shared module resolving symbol in executable/prog.c (renamed from test cases/common/156 shared module resolving symbol in executable/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/154 dotinclude/dotproc.c (renamed from test cases/common/157 dotinclude/dotproc.c) | 0 | ||||
-rw-r--r-- | test cases/common/154 dotinclude/meson.build (renamed from test cases/common/157 dotinclude/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/154 dotinclude/stdio.h (renamed from test cases/common/157 dotinclude/stdio.h) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/all/meson.build (renamed from test cases/common/158 reserved targets/all/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/benchmark/meson.build (renamed from test cases/common/158 reserved targets/benchmark/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/clean-ctlist/meson.build (renamed from test cases/common/158 reserved targets/clean-ctlist/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/clean-gcda/meson.build (renamed from test cases/common/158 reserved targets/clean-gcda/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/clean-gcno/meson.build (renamed from test cases/common/158 reserved targets/clean-gcno/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/clean/meson.build (renamed from test cases/common/158 reserved targets/clean/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/coverage-html/meson.build (renamed from test cases/common/158 reserved targets/coverage-html/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/coverage-text/meson.build (renamed from test cases/common/158 reserved targets/coverage-text/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/coverage-xml/meson.build (renamed from test cases/common/158 reserved targets/coverage-xml/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/coverage/meson.build (renamed from test cases/common/158 reserved targets/coverage/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/dist/meson.build (renamed from test cases/common/158 reserved targets/dist/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/distcheck/meson.build (renamed from test cases/common/158 reserved targets/distcheck/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/install/meson.build (renamed from test cases/common/158 reserved targets/install/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/meson.build (renamed from test cases/common/158 reserved targets/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/phony/meson.build (renamed from test cases/common/158 reserved targets/phony/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/reconfigure/meson.build (renamed from test cases/common/158 reserved targets/reconfigure/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/runtarget/meson.build (renamed from test cases/common/158 reserved targets/runtarget/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/scan-build/meson.build (renamed from test cases/common/158 reserved targets/scan-build/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/test.c (renamed from test cases/common/158 reserved targets/test.c) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/test/meson.build (renamed from test cases/common/158 reserved targets/test/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/155 reserved targets/uninstall/meson.build (renamed from test cases/common/158 reserved targets/uninstall/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/156 duplicate source names/dir1/file.c (renamed from test cases/common/159 duplicate source names/dir1/file.c) | 0 | ||||
-rw-r--r-- | test cases/common/156 duplicate source names/dir1/meson.build (renamed from test cases/common/159 duplicate source names/dir1/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/156 duplicate source names/dir2/dir1/file.c (renamed from test cases/common/159 duplicate source names/dir2/dir1/file.c) | 0 | ||||
-rw-r--r-- | test cases/common/156 duplicate source names/dir2/file.c (renamed from test cases/common/159 duplicate source names/dir2/file.c) | 0 | ||||
-rw-r--r-- | test cases/common/156 duplicate source names/dir2/meson.build (renamed from test cases/common/159 duplicate source names/dir2/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/156 duplicate source names/dir3/dir1/file.c (renamed from test cases/common/159 duplicate source names/dir3/dir1/file.c) | 0 | ||||
-rw-r--r-- | test cases/common/156 duplicate source names/dir3/file.c (renamed from test cases/common/159 duplicate source names/dir3/file.c) | 0 | ||||
-rw-r--r-- | test cases/common/156 duplicate source names/dir3/meson.build (renamed from test cases/common/159 duplicate source names/dir3/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/156 duplicate source names/meson.build (renamed from test cases/common/159 duplicate source names/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/157 index customtarget/check_args.py (renamed from test cases/common/160 index customtarget/check_args.py) | 0 | ||||
-rw-r--r-- | test cases/common/157 index customtarget/gen_sources.py (renamed from test cases/common/160 index customtarget/gen_sources.py) | 0 | ||||
-rw-r--r-- | test cases/common/157 index customtarget/lib.c (renamed from test cases/common/160 index customtarget/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/157 index customtarget/meson.build (renamed from test cases/common/160 index customtarget/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/157 index customtarget/subdir/foo.c (renamed from test cases/common/160 index customtarget/subdir/foo.c) | 0 | ||||
-rw-r--r-- | test cases/common/157 index customtarget/subdir/meson.build (renamed from test cases/common/160 index customtarget/subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/158 wrap file should not failed/meson.build (renamed from test cases/common/161 wrap file should not failed/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/158 wrap file should not failed/src/meson.build (renamed from test cases/common/161 wrap file should not failed/src/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/158 wrap file should not failed/src/subprojects/foo/prog2.c (renamed from test cases/common/161 wrap file should not failed/src/subprojects/foo/prog2.c) | 0 | ||||
-rw-r--r-- | test cases/common/158 wrap file should not failed/src/subprojects/prog.c (renamed from test cases/common/161 wrap file should not failed/src/subprojects/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/158 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip (renamed from test cases/common/161 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip) | 0 | ||||
-rw-r--r-- | test cases/common/158 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz (renamed from test cases/common/161 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz) | 0 | ||||
-rw-r--r-- | test cases/common/158 wrap file should not failed/subprojects/zlib-1.2.8/foo.c (renamed from test cases/common/161 wrap file should not failed/subprojects/zlib-1.2.8/foo.c) | 0 | ||||
-rw-r--r-- | test cases/common/158 wrap file should not failed/subprojects/zlib-1.2.8/meson.build (renamed from test cases/common/161 wrap file should not failed/subprojects/zlib-1.2.8/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/158 wrap file should not failed/subprojects/zlib.wrap (renamed from test cases/common/161 wrap file should not failed/subprojects/zlib.wrap) | 0 | ||||
-rw-r--r-- | test cases/common/159 includedir subproj/meson.build (renamed from test cases/common/162 includedir subproj/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/159 includedir subproj/prog.c (renamed from test cases/common/162 includedir subproj/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/159 includedir subproj/subprojects/inctest/include/incfile.h (renamed from test cases/common/162 includedir subproj/subprojects/inctest/include/incfile.h) | 0 | ||||
-rw-r--r-- | test cases/common/159 includedir subproj/subprojects/inctest/meson.build (renamed from test cases/common/162 includedir subproj/subprojects/inctest/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/16 else/meson.build (renamed from test cases/common/18 else/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/16 else/prog.c (renamed from test cases/common/18 else/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/160 subproject dir name collision/a.c (renamed from test cases/common/163 subproject dir name collision/a.c) | 0 | ||||
-rw-r--r-- | test cases/common/160 subproject dir name collision/custom_subproject_dir/B/b.c (renamed from test cases/common/163 subproject dir name collision/custom_subproject_dir/B/b.c) | 0 | ||||
-rw-r--r-- | test cases/common/160 subproject dir name collision/custom_subproject_dir/B/meson.build (renamed from test cases/common/163 subproject dir name collision/custom_subproject_dir/B/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/160 subproject dir name collision/custom_subproject_dir/C/c.c (renamed from test cases/common/163 subproject dir name collision/custom_subproject_dir/C/c.c) | 0 | ||||
-rw-r--r-- | test cases/common/160 subproject dir name collision/custom_subproject_dir/C/meson.build (renamed from test cases/common/163 subproject dir name collision/custom_subproject_dir/C/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/160 subproject dir name collision/meson.build (renamed from test cases/common/163 subproject dir name collision/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/160 subproject dir name collision/other_subdir/custom_subproject_dir/other.c (renamed from test cases/common/163 subproject dir name collision/other_subdir/custom_subproject_dir/other.c) | 0 | ||||
-rw-r--r-- | test cases/common/160 subproject dir name collision/other_subdir/meson.build (renamed from test cases/common/163 subproject dir name collision/other_subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/161 config tool variable/meson.build (renamed from test cases/common/164 config tool variable/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/162 custom target subdir depend files/copyfile.py (renamed from test cases/common/165 custom target subdir depend files/copyfile.py) | 0 | ||||
-rw-r--r-- | test cases/common/162 custom target subdir depend files/meson.build (renamed from test cases/common/165 custom target subdir depend files/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/162 custom target subdir depend files/subdir/dep.dat (renamed from test cases/common/165 custom target subdir depend files/subdir/dep.dat) | 0 | ||||
-rw-r--r-- | test cases/common/162 custom target subdir depend files/subdir/foo.c.in (renamed from test cases/common/165 custom target subdir depend files/subdir/foo.c.in) | 0 | ||||
-rw-r--r-- | test cases/common/162 custom target subdir depend files/subdir/meson.build (renamed from test cases/common/165 custom target subdir depend files/subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/163 external program shebang parsing/input.txt (renamed from test cases/common/166 external program shebang parsing/input.txt) | 0 | ||||
-rw-r--r-- | test cases/common/163 external program shebang parsing/main.c (renamed from test cases/common/166 external program shebang parsing/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/163 external program shebang parsing/meson.build (renamed from test cases/common/166 external program shebang parsing/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/163 external program shebang parsing/script.int.in (renamed from test cases/common/166 external program shebang parsing/script.int.in) | 0 | ||||
-rw-r--r-- | test cases/common/164 disabler/meson.build (renamed from test cases/common/167 disabler/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/165 array option/meson.build (renamed from test cases/common/168 array option/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/165 array option/meson_options.txt (renamed from test cases/common/168 array option/meson_options.txt) | 0 | ||||
-rw-r--r-- | test cases/common/166 custom target template substitution/checkcopy.py (renamed from test cases/common/169 custom target template substitution/checkcopy.py) | 0 | ||||
-rw-r--r-- | test cases/common/166 custom target template substitution/foo.c.in (renamed from test cases/common/169 custom target template substitution/foo.c.in) | 0 | ||||
-rw-r--r-- | test cases/common/166 custom target template substitution/meson.build (renamed from test cases/common/169 custom target template substitution/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/167 not-found dependency/meson.build (renamed from test cases/common/170 not-found dependency/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/167 not-found dependency/sub/meson.build (renamed from test cases/common/170 not-found dependency/sub/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/167 not-found dependency/subprojects/trivial/meson.build (renamed from test cases/common/170 not-found dependency/subprojects/trivial/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/167 not-found dependency/subprojects/trivial/trivial.c (renamed from test cases/common/170 not-found dependency/subprojects/trivial/trivial.c) | 0 | ||||
-rw-r--r-- | test cases/common/167 not-found dependency/testlib.c (renamed from test cases/common/170 not-found dependency/testlib.c) | 0 | ||||
-rw-r--r-- | test cases/common/168 subdir if_found/meson.build (renamed from test cases/common/171 subdir if_found/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/168 subdir if_found/subdir/meson.build (renamed from test cases/common/171 subdir if_found/subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/169 default options prefix dependent defaults/meson.build (renamed from test cases/common/172 default options prefix dependent defaults/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/17 comparison/meson.build (renamed from test cases/common/19 comparison/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/17 comparison/prog.c (renamed from test cases/common/19 comparison/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/170 dependency factory/meson.build (renamed from test cases/common/173 dependency factory/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/171 get project license/bar.c (renamed from test cases/common/174 get project license/bar.c) | 0 | ||||
-rw-r--r-- | test cases/common/171 get project license/meson.build (renamed from test cases/common/174 get project license/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/172 yield/meson.build | 7 | ||||
-rw-r--r-- | test cases/common/172 yield/meson_options.txt (renamed from test cases/common/175 yield/meson_options.txt) | 1 | ||||
-rw-r--r-- | test cases/common/172 yield/subprojects/sub/meson.build (renamed from test cases/common/175 yield/subprojects/sub/meson.build) | 1 | ||||
-rw-r--r-- | test cases/common/172 yield/subprojects/sub/meson_options.txt (renamed from test cases/common/175 yield/subprojects/sub/meson_options.txt) | 1 | ||||
-rw-r--r-- | test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/a.c (renamed from test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/a.c) | 0 | ||||
-rw-r--r-- | test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build (renamed from test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here (renamed from test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here) | 0 | ||||
-rw-r--r-- | test cases/common/173 subproject nested subproject dirs/contrib/subprojects/beta/b.c (renamed from test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/b.c) | 0 | ||||
-rw-r--r-- | test cases/common/173 subproject nested subproject dirs/contrib/subprojects/beta/meson.build (renamed from test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/173 subproject nested subproject dirs/meson.build (renamed from test cases/common/176 subproject nested subproject dirs/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/173 subproject nested subproject dirs/prog.c (renamed from test cases/common/176 subproject nested subproject dirs/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/174 preserve gendir/base.inp (renamed from test cases/common/177 preserve gendir/base.inp) | 0 | ||||
-rw-r--r-- | test cases/common/174 preserve gendir/com/mesonbuild/subbie.inp (renamed from test cases/common/177 preserve gendir/com/mesonbuild/subbie.inp) | 0 | ||||
-rwxr-xr-x | test cases/common/174 preserve gendir/genprog.py (renamed from test cases/common/177 preserve gendir/genprog.py) | 0 | ||||
-rw-r--r-- | test cases/common/174 preserve gendir/meson.build (renamed from test cases/common/177 preserve gendir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/174 preserve gendir/testprog.c (renamed from test cases/common/177 preserve gendir/testprog.c) | 0 | ||||
-rw-r--r-- | test cases/common/175 source in dep/bar.cpp (renamed from test cases/common/178 source in dep/bar.cpp) | 0 | ||||
-rw-r--r-- | test cases/common/175 source in dep/foo.c (renamed from test cases/common/178 source in dep/foo.c) | 0 | ||||
-rw-r--r-- | test cases/common/175 source in dep/generated/funname (renamed from test cases/common/178 source in dep/generated/funname) | 0 | ||||
-rwxr-xr-x | test cases/common/175 source in dep/generated/genheader.py (renamed from test cases/common/178 source in dep/generated/genheader.py) | 0 | ||||
-rw-r--r-- | test cases/common/175 source in dep/generated/main.c (renamed from test cases/common/178 source in dep/generated/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/175 source in dep/generated/meson.build (renamed from test cases/common/178 source in dep/generated/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/175 source in dep/meson.build (renamed from test cases/common/178 source in dep/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/175 yield/meson.build | 6 | ||||
-rw-r--r-- | test cases/common/176 generator link whole/export.h (renamed from test cases/common/179 generator link whole/export.h) | 0 | ||||
-rwxr-xr-x | test cases/common/176 generator link whole/generator.py (renamed from test cases/common/179 generator link whole/generator.py) | 0 | ||||
-rw-r--r-- | test cases/common/176 generator link whole/main.c (renamed from test cases/common/179 generator link whole/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/176 generator link whole/meson.build (renamed from test cases/common/179 generator link whole/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/176 generator link whole/meson_test_function.tmpl (renamed from test cases/common/179 generator link whole/meson_test_function.tmpl) | 0 | ||||
-rw-r--r-- | test cases/common/176 generator link whole/pull_meson_test_function.c (renamed from test cases/common/179 generator link whole/pull_meson_test_function.c) | 0 | ||||
-rw-r--r-- | test cases/common/177 initial c_args/meson.build (renamed from test cases/common/180 initial c_args/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/177 initial c_args/test_args.txt (renamed from test cases/common/180 initial c_args/test_args.txt) | 0 | ||||
-rw-r--r-- | test cases/common/178 identical target name in subproject flat layout/foo.c (renamed from test cases/common/181 identical target name in subproject flat layout/foo.c) | 0 | ||||
-rw-r--r-- | test cases/common/178 identical target name in subproject flat layout/main.c (renamed from test cases/common/181 identical target name in subproject flat layout/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/178 identical target name in subproject flat layout/meson.build (renamed from test cases/common/181 identical target name in subproject flat layout/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/178 identical target name in subproject flat layout/subprojects/subproj/foo.c (renamed from test cases/common/181 identical target name in subproject flat layout/subprojects/subproj/foo.c) | 0 | ||||
-rw-r--r-- | test cases/common/178 identical target name in subproject flat layout/subprojects/subproj/meson.build (renamed from test cases/common/181 identical target name in subproject flat layout/subprojects/subproj/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/179 as-needed/config.h (renamed from test cases/common/182 as-needed/config.h) | 0 | ||||
-rw-r--r-- | test cases/common/179 as-needed/libA.cpp (renamed from test cases/common/182 as-needed/libA.cpp) | 0 | ||||
-rw-r--r-- | test cases/common/179 as-needed/libA.h (renamed from test cases/common/182 as-needed/libA.h) | 0 | ||||
-rw-r--r-- | test cases/common/179 as-needed/libB.cpp (renamed from test cases/common/182 as-needed/libB.cpp) | 0 | ||||
-rw-r--r-- | test cases/common/179 as-needed/main.cpp (renamed from test cases/common/182 as-needed/main.cpp) | 0 | ||||
-rw-r--r-- | test cases/common/179 as-needed/meson.build (renamed from test cases/common/182 as-needed/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/18 array/func.c (renamed from test cases/common/20 array/func.c) | 0 | ||||
-rw-r--r-- | test cases/common/18 array/meson.build (renamed from test cases/common/20 array/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/18 array/prog.c (renamed from test cases/common/20 array/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/180 ndebug if-release enabled/main.c (renamed from test cases/common/183 ndebug if-release enabled/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/180 ndebug if-release enabled/meson.build (renamed from test cases/common/183 ndebug if-release enabled/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/181 ndebug if-release disabled/main.c (renamed from test cases/common/184 ndebug if-release disabled/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/181 ndebug if-release disabled/meson.build (renamed from test cases/common/184 ndebug if-release disabled/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/182 subproject version/meson.build (renamed from test cases/common/185 subproject version/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/182 subproject version/subprojects/a/meson.build (renamed from test cases/common/185 subproject version/subprojects/a/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/183 subdir_done/meson.build (renamed from test cases/common/186 subdir_done/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/184 bothlibraries/libfile.c (renamed from test cases/common/187 bothlibraries/libfile.c) | 0 | ||||
-rw-r--r-- | test cases/common/184 bothlibraries/main.c (renamed from test cases/common/187 bothlibraries/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/184 bothlibraries/meson.build (renamed from test cases/common/187 bothlibraries/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/184 bothlibraries/mylib.h (renamed from test cases/common/187 bothlibraries/mylib.h) | 0 | ||||
-rw-r--r-- | test cases/common/185 escape and unicode/file.c.in (renamed from test cases/common/188 escape and unicode/file.c.in) | 0 | ||||
-rw-r--r-- | test cases/common/185 escape and unicode/file.py (renamed from test cases/common/188 escape and unicode/file.py) | 0 | ||||
-rw-r--r-- | test cases/common/185 escape and unicode/find.py (renamed from test cases/common/188 escape and unicode/find.py) | 0 | ||||
-rw-r--r-- | test cases/common/185 escape and unicode/fun.c (renamed from test cases/common/188 escape and unicode/fun.c) | 0 | ||||
-rw-r--r-- | test cases/common/185 escape and unicode/main.c (renamed from test cases/common/188 escape and unicode/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/185 escape and unicode/meson.build (renamed from test cases/common/188 escape and unicode/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/186 has link arg/meson.build (renamed from test cases/common/189 has link arg/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/187 same target name flat layout/foo.c (renamed from test cases/common/190 same target name flat layout/foo.c) | 0 | ||||
-rw-r--r-- | test cases/common/187 same target name flat layout/main.c (renamed from test cases/common/190 same target name flat layout/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/187 same target name flat layout/meson.build (renamed from test cases/common/190 same target name flat layout/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/187 same target name flat layout/subdir/foo.c (renamed from test cases/common/190 same target name flat layout/subdir/foo.c) | 0 | ||||
-rw-r--r-- | test cases/common/187 same target name flat layout/subdir/meson.build (renamed from test cases/common/190 same target name flat layout/subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/188 find override/meson.build (renamed from test cases/common/191 find override/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/188 find override/otherdir/main.c (renamed from test cases/common/191 find override/otherdir/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/188 find override/otherdir/main2.c (renamed from test cases/common/191 find override/otherdir/main2.c) | 0 | ||||
-rw-r--r-- | test cases/common/188 find override/otherdir/meson.build (renamed from test cases/common/191 find override/otherdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/188 find override/otherdir/source.desc (renamed from test cases/common/191 find override/otherdir/source.desc) | 0 | ||||
-rw-r--r-- | test cases/common/188 find override/otherdir/source2.desc (renamed from test cases/common/191 find override/otherdir/source2.desc) | 0 | ||||
-rwxr-xr-x | test cases/common/188 find override/subdir/converter.py (renamed from test cases/common/191 find override/subdir/converter.py) | 0 | ||||
-rwxr-xr-x | test cases/common/188 find override/subdir/gencodegen.py.in (renamed from test cases/common/191 find override/subdir/gencodegen.py.in) | 0 | ||||
-rw-r--r-- | test cases/common/188 find override/subdir/meson.build (renamed from test cases/common/191 find override/subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/189 partial dependency/declare_dependency/headers/foo.c (renamed from test cases/common/192 partial dependency/declare_dependency/headers/foo.c) | 0 | ||||
-rw-r--r-- | test cases/common/189 partial dependency/declare_dependency/headers/foo.h (renamed from test cases/common/192 partial dependency/declare_dependency/headers/foo.h) | 0 | ||||
-rw-r--r-- | test cases/common/189 partial dependency/declare_dependency/main.c (renamed from test cases/common/192 partial dependency/declare_dependency/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/189 partial dependency/declare_dependency/meson.build (renamed from test cases/common/192 partial dependency/declare_dependency/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/189 partial dependency/declare_dependency/other.c (renamed from test cases/common/192 partial dependency/declare_dependency/other.c) | 0 | ||||
-rw-r--r-- | test cases/common/189 partial dependency/meson.build (renamed from test cases/common/192 partial dependency/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/19 includedir/include/func.h (renamed from test cases/common/21 includedir/include/func.h) | 0 | ||||
-rw-r--r-- | test cases/common/19 includedir/meson.build (renamed from test cases/common/21 includedir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/19 includedir/src/func.c (renamed from test cases/common/21 includedir/src/func.c) | 0 | ||||
-rw-r--r-- | test cases/common/19 includedir/src/meson.build (renamed from test cases/common/21 includedir/src/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/19 includedir/src/prog.c (renamed from test cases/common/21 includedir/src/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/190 openmp/main.c (renamed from test cases/common/193 openmp/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/190 openmp/main.cpp (renamed from test cases/common/193 openmp/main.cpp) | 0 | ||||
-rw-r--r-- | test cases/common/190 openmp/main.f90 (renamed from test cases/common/193 openmp/main.f90) | 0 | ||||
-rw-r--r-- | test cases/common/190 openmp/meson.build (renamed from test cases/common/193 openmp/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/191 same target name/file.c (renamed from test cases/common/194 same target name/file.c) | 0 | ||||
-rw-r--r-- | test cases/common/191 same target name/meson.build (renamed from test cases/common/194 same target name/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/191 same target name/sub/file2.c (renamed from test cases/common/194 same target name/sub/file2.c) | 0 | ||||
-rw-r--r-- | test cases/common/191 same target name/sub/meson.build (renamed from test cases/common/194 same target name/sub/meson.build) | 0 | ||||
-rwxr-xr-x | test cases/common/192 test depends/gen.py (renamed from test cases/common/195 test depends/gen.py) | 0 | ||||
-rw-r--r-- | test cases/common/192 test depends/main.c (renamed from test cases/common/195 test depends/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/192 test depends/meson.build (renamed from test cases/common/195 test depends/meson.build) | 0 | ||||
-rwxr-xr-x | test cases/common/192 test depends/test.py (renamed from test cases/common/195 test depends/test.py) | 0 | ||||
-rw-r--r-- | test cases/common/193 args flattening/meson.build (renamed from test cases/common/196 args flattening/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/194 dict/meson.build (renamed from test cases/common/197 dict/meson.build) | 12 | ||||
-rw-r--r-- | test cases/common/194 dict/prog.c (renamed from test cases/common/197 dict/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/195 check header/meson.build (renamed from test cases/common/198 check header/meson.build) | 4 | ||||
-rw-r--r-- | test cases/common/195 check header/ouagadougou.h (renamed from test cases/common/198 check header/ouagadougou.h) | 0 | ||||
-rw-r--r-- | test cases/common/196 install_mode/config.h.in (renamed from test cases/common/199 install_mode/config.h.in) | 0 | ||||
-rw-r--r-- | test cases/common/196 install_mode/data_source.txt (renamed from test cases/common/199 install_mode/data_source.txt) | 0 | ||||
-rw-r--r-- | test cases/common/196 install_mode/foo.1 (renamed from test cases/common/199 install_mode/foo.1) | 0 | ||||
-rw-r--r-- | test cases/common/196 install_mode/installed_files.txt (renamed from test cases/common/199 install_mode/installed_files.txt) | 1 | ||||
-rw-r--r-- | test cases/common/196 install_mode/meson.build (renamed from test cases/common/199 install_mode/meson.build) | 3 | ||||
-rw-r--r-- | test cases/common/196 install_mode/rootdir.h (renamed from test cases/common/199 install_mode/rootdir.h) | 0 | ||||
-rw-r--r-- | test cases/common/196 install_mode/runscript.sh (renamed from test cases/common/199 install_mode/runscript.sh) | 0 | ||||
-rw-r--r-- | test cases/common/196 install_mode/stat.c (renamed from test cases/common/199 install_mode/stat.c) | 0 | ||||
-rw-r--r-- | test cases/common/196 install_mode/sub1/second.dat (renamed from test cases/common/199 install_mode/sub1/second.dat) | 0 | ||||
-rw-r--r-- | test cases/common/196 install_mode/sub2/stub (renamed from test cases/common/60 install script/no-installed-files) | 0 | ||||
-rw-r--r-- | test cases/common/196 install_mode/trivial.c (renamed from test cases/common/199 install_mode/trivial.c) | 0 | ||||
-rw-r--r-- | test cases/common/197 subproject array version/meson.build (renamed from test cases/common/200 subproject array version/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/197 subproject array version/subprojects/foo/meson.build (renamed from test cases/common/200 subproject array version/subprojects/foo/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/198 feature option/meson.build (renamed from test cases/common/201 feature option/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/198 feature option/meson_options.txt (renamed from test cases/common/201 feature option/meson_options.txt) | 0 | ||||
-rw-r--r-- | test cases/common/199 feature option disabled/meson.build (renamed from test cases/common/202 feature option disabled/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/199 feature option disabled/meson_options.txt (renamed from test cases/common/202 feature option disabled/meson_options.txt) | 0 | ||||
-rw-r--r-- | test cases/common/20 header in file list/header.h (renamed from test cases/common/22 header in file list/header.h) | 0 | ||||
-rw-r--r-- | test cases/common/20 header in file list/meson.build (renamed from test cases/common/22 header in file list/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/20 header in file list/prog.c (renamed from test cases/common/22 header in file list/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/200 static threads/lib1.c (renamed from test cases/common/203 static threads/lib1.c) | 0 | ||||
-rw-r--r-- | test cases/common/200 static threads/lib2.c (renamed from test cases/common/203 static threads/lib2.c) | 0 | ||||
-rw-r--r-- | test cases/common/200 static threads/meson.build (renamed from test cases/common/203 static threads/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/200 static threads/prog.c (renamed from test cases/common/203 static threads/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/201 generator in subdir/com/mesonbuild/genprog.py (renamed from test cases/common/205 generator in subdir/com/mesonbuild/genprog.py) | 0 | ||||
-rw-r--r-- | test cases/common/201 generator in subdir/com/mesonbuild/meson.build (renamed from test cases/common/205 generator in subdir/com/mesonbuild/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/201 generator in subdir/com/mesonbuild/subbie.inp (renamed from test cases/common/205 generator in subdir/com/mesonbuild/subbie.inp) | 0 | ||||
-rw-r--r-- | test cases/common/201 generator in subdir/com/mesonbuild/testprog.c (renamed from test cases/common/205 generator in subdir/com/mesonbuild/testprog.c) | 0 | ||||
-rw-r--r-- | test cases/common/201 generator in subdir/meson.build (renamed from test cases/common/205 generator in subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/21 global arg/meson.build (renamed from test cases/common/23 global arg/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/21 global arg/prog.c (renamed from test cases/common/23 global arg/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/21 global arg/prog.cc (renamed from test cases/common/23 global arg/prog.cc) | 0 | ||||
-rw-r--r-- | test cases/common/22 target arg/func.c (renamed from test cases/common/24 target arg/func.c) | 0 | ||||
-rw-r--r-- | test cases/common/22 target arg/func2.c (renamed from test cases/common/24 target arg/func2.c) | 0 | ||||
-rw-r--r-- | test cases/common/22 target arg/meson.build (renamed from test cases/common/24 target arg/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/22 target arg/prog.cc (renamed from test cases/common/24 target arg/prog.cc) | 0 | ||||
-rw-r--r-- | test cases/common/22 target arg/prog2.cc (renamed from test cases/common/24 target arg/prog2.cc) | 0 | ||||
-rw-r--r-- | test cases/common/23 object extraction/lib.c (renamed from test cases/common/25 object extraction/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/23 object extraction/lib2.c (renamed from test cases/common/25 object extraction/lib2.c) | 0 | ||||
-rw-r--r-- | test cases/common/23 object extraction/main.c (renamed from test cases/common/25 object extraction/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/23 object extraction/meson.build (renamed from test cases/common/25 object extraction/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/23 object extraction/src/lib.c (renamed from test cases/common/25 object extraction/src/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/24 endian/meson.build (renamed from test cases/common/26 endian/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/24 endian/prog.c (renamed from test cases/common/26 endian/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/25 library versions/installed_files.txt (renamed from test cases/common/27 library versions/installed_files.txt) | 0 | ||||
-rw-r--r-- | test cases/common/25 library versions/lib.c (renamed from test cases/common/27 library versions/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/25 library versions/meson.build (renamed from test cases/common/27 library versions/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/25 library versions/subdir/meson.build (renamed from test cases/common/27 library versions/subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/26 config subdir/include/config.h.in (renamed from test cases/common/28 config subdir/include/config.h.in) | 0 | ||||
-rw-r--r-- | test cases/common/26 config subdir/include/meson.build (renamed from test cases/common/28 config subdir/include/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/26 config subdir/meson.build (renamed from test cases/common/28 config subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/26 config subdir/src/meson.build (renamed from test cases/common/28 config subdir/src/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/26 config subdir/src/prog.c (renamed from test cases/common/28 config subdir/src/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/27 pipeline/input_src.dat (renamed from test cases/common/29 pipeline/input_src.dat) | 0 | ||||
-rw-r--r-- | test cases/common/27 pipeline/meson.build (renamed from test cases/common/29 pipeline/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/27 pipeline/prog.c (renamed from test cases/common/29 pipeline/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/27 pipeline/srcgen.c (renamed from test cases/common/29 pipeline/srcgen.c) | 0 | ||||
-rw-r--r-- | test cases/common/28 pipeline/meson.build (renamed from test cases/common/30 pipeline/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/28 pipeline/src/input_src.dat (renamed from test cases/common/30 pipeline/src/input_src.dat) | 0 | ||||
-rw-r--r-- | test cases/common/28 pipeline/src/meson.build (renamed from test cases/common/30 pipeline/src/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/28 pipeline/src/prog.c (renamed from test cases/common/30 pipeline/src/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/28 pipeline/src/srcgen.c (renamed from test cases/common/30 pipeline/src/srcgen.c) | 0 | ||||
-rw-r--r-- | test cases/common/29 find program/meson.build (renamed from test cases/common/31 find program/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/29 find program/source.in (renamed from test cases/common/31 find program/source.in) | 0 | ||||
-rw-r--r-- | test cases/common/30 multiline string/meson.build (renamed from test cases/common/32 multiline string/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/31 try compile/invalid.c (renamed from test cases/common/33 try compile/invalid.c) | 0 | ||||
-rw-r--r-- | test cases/common/31 try compile/meson.build (renamed from test cases/common/33 try compile/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/31 try compile/valid.c (renamed from test cases/common/33 try compile/valid.c) | 0 | ||||
-rw-r--r-- | test cases/common/32 compiler id/meson.build (renamed from test cases/common/34 compiler id/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/33 sizeof/config.h.in (renamed from test cases/common/35 sizeof/config.h.in) | 0 | ||||
-rw-r--r-- | test cases/common/33 sizeof/meson.build (renamed from test cases/common/35 sizeof/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/33 sizeof/prog.c.in (renamed from test cases/common/35 sizeof/prog.c.in) | 0 | ||||
-rw-r--r-- | test cases/common/34 define10/config.h.in (renamed from test cases/common/36 define10/config.h.in) | 0 | ||||
-rw-r--r-- | test cases/common/34 define10/meson.build (renamed from test cases/common/36 define10/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/34 define10/prog.c (renamed from test cases/common/36 define10/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/35 has header/meson.build (renamed from test cases/common/37 has header/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/35 has header/ouagadougou.h (renamed from test cases/common/37 has header/ouagadougou.h) | 0 | ||||
-rw-r--r-- | test cases/common/36 run program/get-version.py (renamed from test cases/common/38 run program/get-version.py) | 0 | ||||
-rw-r--r-- | test cases/common/36 run program/meson.build (renamed from test cases/common/38 run program/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/36 run program/scripts/hello.bat (renamed from test cases/common/38 run program/scripts/hello.bat) | 0 | ||||
-rwxr-xr-x | test cases/common/36 run program/scripts/hello.sh (renamed from test cases/common/38 run program/scripts/hello.sh) | 0 | ||||
-rw-r--r-- | test cases/common/37 tryrun/error.c (renamed from test cases/common/39 tryrun/error.c) | 0 | ||||
-rw-r--r-- | test cases/common/37 tryrun/meson.build (renamed from test cases/common/39 tryrun/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/37 tryrun/no_compile.c (renamed from test cases/common/39 tryrun/no_compile.c) | 0 | ||||
-rw-r--r-- | test cases/common/37 tryrun/ok.c (renamed from test cases/common/39 tryrun/ok.c) | 0 | ||||
-rw-r--r-- | test cases/common/38 logic ops/meson.build (renamed from test cases/common/40 logic ops/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/39 string operations/meson.build (renamed from test cases/common/42 string operations/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/40 has function/meson.build (renamed from test cases/common/43 has function/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/41 elif/meson.build | 28 | ||||
-rw-r--r-- | test cases/common/41 has member/meson.build (renamed from test cases/common/44 has member/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/42 alignment/meson.build (renamed from test cases/common/45 alignment/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/43 library chain/installed_files.txt (renamed from test cases/common/46 library chain/installed_files.txt) | 0 | ||||
-rw-r--r-- | test cases/common/43 library chain/main.c (renamed from test cases/common/46 library chain/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/43 library chain/meson.build (renamed from test cases/common/46 library chain/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/43 library chain/subdir/lib1.c (renamed from test cases/common/46 library chain/subdir/lib1.c) | 0 | ||||
-rw-r--r-- | test cases/common/43 library chain/subdir/meson.build (renamed from test cases/common/46 library chain/subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/43 library chain/subdir/subdir2/lib2.c (renamed from test cases/common/46 library chain/subdir/subdir2/lib2.c) | 0 | ||||
-rw-r--r-- | test cases/common/43 library chain/subdir/subdir2/meson.build (renamed from test cases/common/46 library chain/subdir/subdir2/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/43 library chain/subdir/subdir3/lib3.c (renamed from test cases/common/46 library chain/subdir/subdir3/lib3.c) | 0 | ||||
-rw-r--r-- | test cases/common/43 library chain/subdir/subdir3/meson.build (renamed from test cases/common/46 library chain/subdir/subdir3/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/44 options/meson.build (renamed from test cases/common/47 options/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/44 options/meson_options.txt (renamed from test cases/common/47 options/meson_options.txt) | 0 | ||||
-rw-r--r-- | test cases/common/45 test args/cmd_args.c (renamed from test cases/common/48 test args/cmd_args.c) | 0 | ||||
-rw-r--r-- | test cases/common/45 test args/copyfile.py (renamed from test cases/common/48 test args/copyfile.py) | 0 | ||||
-rw-r--r-- | test cases/common/45 test args/env2vars.c (renamed from test cases/common/48 test args/env2vars.c) | 0 | ||||
-rw-r--r-- | test cases/common/45 test args/envvars.c (renamed from test cases/common/48 test args/envvars.c) | 0 | ||||
-rw-r--r-- | test cases/common/45 test args/meson.build (renamed from test cases/common/48 test args/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/45 test args/tester.c (renamed from test cases/common/48 test args/tester.c) | 0 | ||||
-rwxr-xr-x | test cases/common/45 test args/tester.py (renamed from test cases/common/48 test args/tester.py) | 0 | ||||
-rw-r--r-- | test cases/common/45 test args/testfile.txt (renamed from test cases/common/48 test args/testfile.txt) | 0 | ||||
-rw-r--r-- | test cases/common/46 subproject/installed_files.txt (renamed from test cases/common/49 subproject/installed_files.txt) | 0 | ||||
-rw-r--r-- | test cases/common/46 subproject/meson.build (renamed from test cases/common/49 subproject/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/46 subproject/subprojects/sublib/include/subdefs.h (renamed from test cases/common/49 subproject/subprojects/sublib/include/subdefs.h) | 0 | ||||
-rw-r--r-- | test cases/common/46 subproject/subprojects/sublib/meson.build (renamed from test cases/common/49 subproject/subprojects/sublib/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/46 subproject/subprojects/sublib/simpletest.c (renamed from test cases/common/49 subproject/subprojects/sublib/simpletest.c) | 0 | ||||
-rw-r--r-- | test cases/common/46 subproject/subprojects/sublib/sublib.c (renamed from test cases/common/49 subproject/subprojects/sublib/sublib.c) | 0 | ||||
-rw-r--r-- | test cases/common/46 subproject/user.c (renamed from test cases/common/49 subproject/user.c) | 0 | ||||
-rw-r--r-- | test cases/common/47 subproject options/meson.build (renamed from test cases/common/50 subproject options/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/47 subproject options/meson_options.txt (renamed from test cases/common/50 subproject options/meson_options.txt) | 0 | ||||
-rw-r--r-- | test cases/common/47 subproject options/subprojects/subproject/meson.build (renamed from test cases/common/50 subproject options/subprojects/subproject/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/47 subproject options/subprojects/subproject/meson_options.txt (renamed from test cases/common/50 subproject options/subprojects/subproject/meson_options.txt) | 0 | ||||
-rw-r--r-- | test cases/common/48 pkgconfig-gen/dependencies/exposed.c (renamed from test cases/common/51 pkgconfig-gen/dependencies/exposed.c) | 0 | ||||
-rw-r--r-- | test cases/common/48 pkgconfig-gen/dependencies/internal.c (renamed from test cases/common/51 pkgconfig-gen/dependencies/internal.c) | 0 | ||||
-rw-r--r-- | test cases/common/48 pkgconfig-gen/dependencies/meson.build (renamed from test cases/common/51 pkgconfig-gen/dependencies/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/48 pkgconfig-gen/installed_files.txt (renamed from test cases/common/51 pkgconfig-gen/installed_files.txt) | 0 | ||||
-rw-r--r-- | test cases/common/48 pkgconfig-gen/meson.build (renamed from test cases/common/51 pkgconfig-gen/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/48 pkgconfig-gen/simple.c (renamed from test cases/common/51 pkgconfig-gen/simple.c) | 0 | ||||
-rw-r--r-- | test cases/common/48 pkgconfig-gen/simple.h (renamed from test cases/common/51 pkgconfig-gen/simple.h) | 0 | ||||
-rw-r--r-- | test cases/common/49 custom install dirs/datafile.cat (renamed from test cases/common/52 custom install dirs/datafile.cat) | 0 | ||||
-rw-r--r-- | test cases/common/49 custom install dirs/installed_files.txt (renamed from test cases/common/52 custom install dirs/installed_files.txt) | 0 | ||||
-rw-r--r-- | test cases/common/49 custom install dirs/meson.build (renamed from test cases/common/52 custom install dirs/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/49 custom install dirs/prog.1 (renamed from test cases/common/52 custom install dirs/prog.1) | 0 | ||||
-rw-r--r-- | test cases/common/49 custom install dirs/prog.c (renamed from test cases/common/52 custom install dirs/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/49 custom install dirs/sample.h (renamed from test cases/common/52 custom install dirs/sample.h) | 0 | ||||
-rw-r--r-- | test cases/common/49 custom install dirs/subdir/datafile.dog (renamed from test cases/common/52 custom install dirs/subdir/datafile.dog) | 0 | ||||
-rw-r--r-- | test cases/common/50 subproject subproject/meson.build (renamed from test cases/common/53 subproject subproject/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/50 subproject subproject/prog.c (renamed from test cases/common/53 subproject subproject/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/50 subproject subproject/subprojects/a/a.c (renamed from test cases/common/53 subproject subproject/subprojects/a/a.c) | 0 | ||||
-rw-r--r-- | test cases/common/50 subproject subproject/subprojects/a/meson.build (renamed from test cases/common/53 subproject subproject/subprojects/a/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/50 subproject subproject/subprojects/b/b.c (renamed from test cases/common/53 subproject subproject/subprojects/b/b.c) | 0 | ||||
-rw-r--r-- | test cases/common/50 subproject subproject/subprojects/b/meson.build (renamed from test cases/common/53 subproject subproject/subprojects/b/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/51 same file name/d1/file.c (renamed from test cases/common/54 same file name/d1/file.c) | 0 | ||||
-rw-r--r-- | test cases/common/51 same file name/d2/file.c (renamed from test cases/common/54 same file name/d2/file.c) | 0 | ||||
-rw-r--r-- | test cases/common/51 same file name/meson.build (renamed from test cases/common/54 same file name/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/51 same file name/prog.c (renamed from test cases/common/54 same file name/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/52 file grabber/a.c (renamed from test cases/common/55 file grabber/a.c) | 0 | ||||
-rw-r--r-- | test cases/common/52 file grabber/b.c (renamed from test cases/common/55 file grabber/b.c) | 0 | ||||
-rw-r--r-- | test cases/common/52 file grabber/c.c (renamed from test cases/common/55 file grabber/c.c) | 0 | ||||
-rw-r--r-- | test cases/common/52 file grabber/grabber.bat (renamed from test cases/common/55 file grabber/grabber.bat) | 0 | ||||
-rwxr-xr-x | test cases/common/52 file grabber/grabber.sh (renamed from test cases/common/55 file grabber/grabber.sh) | 0 | ||||
-rw-r--r-- | test cases/common/52 file grabber/grabber2.bat (renamed from test cases/common/55 file grabber/grabber2.bat) | 0 | ||||
-rw-r--r-- | test cases/common/52 file grabber/meson.build (renamed from test cases/common/55 file grabber/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/52 file grabber/prog.c (renamed from test cases/common/55 file grabber/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/52 file grabber/subdir/meson.build (renamed from test cases/common/55 file grabber/subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/52 file grabber/subdir/suba.c (renamed from test cases/common/55 file grabber/subdir/suba.c) | 0 | ||||
-rw-r--r-- | test cases/common/52 file grabber/subdir/subb.c (renamed from test cases/common/55 file grabber/subdir/subb.c) | 0 | ||||
-rw-r--r-- | test cases/common/52 file grabber/subdir/subc.c (renamed from test cases/common/55 file grabber/subdir/subc.c) | 0 | ||||
-rw-r--r-- | test cases/common/52 file grabber/subdir/subprog.c (renamed from test cases/common/55 file grabber/subdir/subprog.c) | 0 | ||||
-rw-r--r-- | test cases/common/53 custom target/data_source.txt (renamed from test cases/common/56 custom target/data_source.txt) | 0 | ||||
-rwxr-xr-x | test cases/common/53 custom target/depfile/dep.py (renamed from test cases/common/56 custom target/depfile/dep.py) | 0 | ||||
-rw-r--r-- | test cases/common/53 custom target/depfile/meson.build (renamed from test cases/common/56 custom target/depfile/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/53 custom target/installed_files.txt (renamed from test cases/common/56 custom target/installed_files.txt) | 0 | ||||
-rw-r--r-- | test cases/common/53 custom target/meson.build (renamed from test cases/common/56 custom target/meson.build) | 0 | ||||
-rwxr-xr-x | test cases/common/53 custom target/my_compiler.py (renamed from test cases/common/56 custom target/my_compiler.py) | 0 | ||||
-rw-r--r-- | test cases/common/54 custom target chain/data_source.txt (renamed from test cases/common/57 custom target chain/data_source.txt) | 0 | ||||
-rw-r--r-- | test cases/common/54 custom target chain/installed_files.txt (renamed from test cases/common/57 custom target chain/installed_files.txt) | 0 | ||||
-rw-r--r-- | test cases/common/54 custom target chain/meson.build (renamed from test cases/common/57 custom target chain/meson.build) | 0 | ||||
-rwxr-xr-x | test cases/common/54 custom target chain/my_compiler.py (renamed from test cases/common/57 custom target chain/my_compiler.py) | 0 | ||||
-rwxr-xr-x | test cases/common/54 custom target chain/my_compiler2.py (renamed from test cases/common/57 custom target chain/my_compiler2.py) | 0 | ||||
-rw-r--r-- | test cases/common/54 custom target chain/usetarget/meson.build (renamed from test cases/common/57 custom target chain/usetarget/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/54 custom target chain/usetarget/myexe.c (renamed from test cases/common/57 custom target chain/usetarget/myexe.c) | 0 | ||||
-rwxr-xr-x | test cases/common/54 custom target chain/usetarget/subcomp.py (renamed from test cases/common/57 custom target chain/usetarget/subcomp.py) | 0 | ||||
-rwxr-xr-x | test cases/common/55 run target/check_exists.py (renamed from test cases/common/58 run target/check_exists.py) | 0 | ||||
-rwxr-xr-x | test cases/common/55 run target/configure.in (renamed from test cases/common/58 run target/configure.in) | 0 | ||||
-rw-r--r-- | test cases/common/55 run target/converter.py (renamed from test cases/common/58 run target/converter.py) | 0 | ||||
-rwxr-xr-x | test cases/common/55 run target/fakeburner.py (renamed from test cases/common/58 run target/fakeburner.py) | 0 | ||||
-rw-r--r-- | test cases/common/55 run target/helloprinter.c (renamed from test cases/common/58 run target/helloprinter.c) | 0 | ||||
-rw-r--r-- | test cases/common/55 run target/meson.build (renamed from test cases/common/58 run target/meson.build) | 0 | ||||
-rwxr-xr-x | test cases/common/55 run target/scripts/script.sh (renamed from test cases/common/58 run target/scripts/script.sh) | 0 | ||||
-rw-r--r-- | test cases/common/56 object generator/meson.build (renamed from test cases/common/59 object generator/meson.build) | 0 | ||||
-rwxr-xr-x | test cases/common/56 object generator/obj_generator.py (renamed from test cases/common/59 object generator/obj_generator.py) | 0 | ||||
-rw-r--r-- | test cases/common/56 object generator/prog.c (renamed from test cases/common/59 object generator/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/56 object generator/source.c (renamed from test cases/common/59 object generator/source.c) | 0 | ||||
-rw-r--r-- | test cases/common/56 object generator/source2.c (renamed from test cases/common/59 object generator/source2.c) | 0 | ||||
-rw-r--r-- | test cases/common/56 object generator/source3.c (renamed from test cases/common/59 object generator/source3.c) | 0 | ||||
-rw-r--r-- | test cases/common/57 install script/installed_files.txt (renamed from test cases/common/60 install script/installed_files.txt) | 0 | ||||
-rw-r--r-- | test cases/common/57 install script/meson.build (renamed from test cases/common/60 install script/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/57 install script/myinstall.py (renamed from test cases/common/60 install script/myinstall.py) | 0 | ||||
-rw-r--r-- | test cases/common/57 install script/no-installed-files (renamed from test cases/common/64 custom header generator/somefile.txt) | 0 | ||||
-rw-r--r-- | test cases/common/57 install script/prog.c (renamed from test cases/common/60 install script/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/57 install script/src/meson.build (renamed from test cases/common/60 install script/src/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/57 install script/src/myinstall.py (renamed from test cases/common/60 install script/src/myinstall.py) | 0 | ||||
-rwxr-xr-x | test cases/common/58 custom target source output/generator.py (renamed from test cases/common/61 custom target source output/generator.py) | 0 | ||||
-rw-r--r-- | test cases/common/58 custom target source output/main.c (renamed from test cases/common/61 custom target source output/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/58 custom target source output/meson.build (renamed from test cases/common/61 custom target source output/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/59 exe static shared/meson.build (renamed from test cases/common/62 exe static shared/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/59 exe static shared/prog.c (renamed from test cases/common/62 exe static shared/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/59 exe static shared/shlib2.c (renamed from test cases/common/62 exe static shared/shlib2.c) | 0 | ||||
-rw-r--r-- | test cases/common/59 exe static shared/stat.c (renamed from test cases/common/62 exe static shared/stat.c) | 0 | ||||
-rw-r--r-- | test cases/common/59 exe static shared/stat2.c (renamed from test cases/common/62 exe static shared/stat2.c) | 0 | ||||
-rw-r--r-- | test cases/common/59 exe static shared/subdir/exports.h (renamed from test cases/common/62 exe static shared/subdir/exports.h) | 0 | ||||
-rw-r--r-- | test cases/common/59 exe static shared/subdir/meson.build (renamed from test cases/common/62 exe static shared/subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/59 exe static shared/subdir/shlib.c (renamed from test cases/common/62 exe static shared/subdir/shlib.c) | 0 | ||||
-rw-r--r-- | test cases/common/60 array methods/meson.build (renamed from test cases/common/63 array methods/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/61 custom header generator/input.def (renamed from test cases/common/64 custom header generator/input.def) | 0 | ||||
-rw-r--r-- | test cases/common/61 custom header generator/makeheader.py (renamed from test cases/common/64 custom header generator/makeheader.py) | 0 | ||||
-rw-r--r-- | test cases/common/61 custom header generator/meson.build (renamed from test cases/common/64 custom header generator/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/61 custom header generator/prog.c (renamed from test cases/common/64 custom header generator/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/61 custom header generator/somefile.txt (renamed from test cases/common/66 install subdir/sub2/dircheck/excluded-three.dat) | 0 | ||||
-rw-r--r-- | test cases/common/62 multiple generators/data2.dat (renamed from test cases/common/65 multiple generators/data2.dat) | 0 | ||||
-rw-r--r-- | test cases/common/62 multiple generators/main.cpp (renamed from test cases/common/65 multiple generators/main.cpp) | 0 | ||||
-rw-r--r-- | test cases/common/62 multiple generators/meson.build (renamed from test cases/common/65 multiple generators/meson.build) | 0 | ||||
-rwxr-xr-x | test cases/common/62 multiple generators/mygen.py (renamed from test cases/common/65 multiple generators/mygen.py) | 0 | ||||
-rw-r--r-- | test cases/common/62 multiple generators/subdir/data.dat (renamed from test cases/common/65 multiple generators/subdir/data.dat) | 0 | ||||
-rw-r--r-- | test cases/common/62 multiple generators/subdir/meson.build (renamed from test cases/common/65 multiple generators/subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/63 install subdir/installed_files.txt (renamed from test cases/common/66 install subdir/installed_files.txt) | 0 | ||||
-rw-r--r-- | test cases/common/63 install subdir/meson.build (renamed from test cases/common/66 install subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/63 install subdir/nested_elided/sub/dircheck/nineth.dat (renamed from test cases/common/66 install subdir/nested_elided/sub/dircheck/nineth.dat) | 0 | ||||
-rw-r--r-- | test cases/common/63 install subdir/nested_elided/sub/eighth.dat (renamed from test cases/common/66 install subdir/nested_elided/sub/eighth.dat) | 0 | ||||
-rw-r--r-- | test cases/common/63 install subdir/sub/sub1/third.dat (renamed from test cases/common/66 install subdir/sub/sub1/third.dat) | 0 | ||||
-rw-r--r-- | test cases/common/63 install subdir/sub1/second.dat (renamed from test cases/common/66 install subdir/sub1/second.dat) | 0 | ||||
-rw-r--r-- | test cases/common/63 install subdir/sub2/dircheck/excluded-three.dat (renamed from test cases/common/66 install subdir/sub2/excluded-three.dat) | 0 | ||||
-rw-r--r-- | test cases/common/63 install subdir/sub2/excluded-three.dat (renamed from test cases/common/66 install subdir/sub2/excluded/two.dat) | 0 | ||||
-rw-r--r-- | test cases/common/63 install subdir/sub2/excluded/two.dat (renamed from test cases/common/66 install subdir/sub2/one.dat) | 0 | ||||
-rw-r--r-- | test cases/common/63 install subdir/sub2/one.dat (renamed from test cases/common/93 private include/stlib/foo1.def) | 0 | ||||
-rw-r--r-- | test cases/common/63 install subdir/sub_elided/dircheck/fifth.dat (renamed from test cases/common/66 install subdir/sub_elided/dircheck/fifth.dat) | 0 | ||||
-rw-r--r-- | test cases/common/63 install subdir/sub_elided/fourth.dat (renamed from test cases/common/66 install subdir/sub_elided/fourth.dat) | 0 | ||||
-rw-r--r-- | test cases/common/63 install subdir/subdir/meson.build (renamed from test cases/common/66 install subdir/subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/63 install subdir/subdir/sub1/data1.dat (renamed from test cases/common/66 install subdir/subdir/sub1/data1.dat) | 0 | ||||
-rw-r--r-- | test cases/common/63 install subdir/subdir/sub1/sub2/data2.dat (renamed from test cases/common/66 install subdir/subdir/sub1/sub2/data2.dat) | 0 | ||||
-rw-r--r-- | test cases/common/63 install subdir/subdir/sub_elided/dircheck/seventh.dat (renamed from test cases/common/66 install subdir/subdir/sub_elided/dircheck/seventh.dat) | 0 | ||||
-rw-r--r-- | test cases/common/63 install subdir/subdir/sub_elided/sixth.dat (renamed from test cases/common/66 install subdir/subdir/sub_elided/sixth.dat) | 0 | ||||
-rw-r--r-- | test cases/common/64 foreach/installed_files.txt (renamed from test cases/common/67 foreach/installed_files.txt) | 0 | ||||
-rw-r--r-- | test cases/common/64 foreach/meson.build (renamed from test cases/common/67 foreach/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/64 foreach/prog1.c (renamed from test cases/common/67 foreach/prog1.c) | 0 | ||||
-rw-r--r-- | test cases/common/64 foreach/prog2.c (renamed from test cases/common/67 foreach/prog2.c) | 0 | ||||
-rw-r--r-- | test cases/common/64 foreach/prog3.c (renamed from test cases/common/67 foreach/prog3.c) | 0 | ||||
-rw-r--r-- | test cases/common/65 number arithmetic/meson.build (renamed from test cases/common/68 number arithmetic/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/66 string arithmetic/meson.build (renamed from test cases/common/69 string arithmetic/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/67 array arithmetic/meson.build (renamed from test cases/common/70 array arithmetic/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/68 arithmetic bidmas/meson.build (renamed from test cases/common/71 arithmetic bidmas/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/69 build always/main.c (renamed from test cases/common/72 build always/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/69 build always/meson.build (renamed from test cases/common/72 build always/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/69 build always/version.c.in (renamed from test cases/common/72 build always/version.c.in) | 0 | ||||
-rw-r--r-- | test cases/common/69 build always/version.h (renamed from test cases/common/72 build always/version.h) | 0 | ||||
-rwxr-xr-x | test cases/common/69 build always/version_gen.py (renamed from test cases/common/72 build always/version_gen.py) | 0 | ||||
-rw-r--r-- | test cases/common/70 vcstag/meson.build (renamed from test cases/common/73 vcstag/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/70 vcstag/tagprog.c (renamed from test cases/common/73 vcstag/tagprog.c) | 0 | ||||
-rw-r--r-- | test cases/common/70 vcstag/vcstag.c.in (renamed from test cases/common/73 vcstag/vcstag.c.in) | 0 | ||||
-rw-r--r-- | test cases/common/71 modules/meson.build (renamed from test cases/common/74 modules/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/72 should fail/failing.c (renamed from test cases/common/75 should fail/failing.c) | 0 | ||||
-rw-r--r-- | test cases/common/72 should fail/meson.build (renamed from test cases/common/75 should fail/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/73 configure file in custom target/inc/confdata.in (renamed from test cases/common/76 configure file in custom target/inc/confdata.in) | 0 | ||||
-rw-r--r-- | test cases/common/73 configure file in custom target/inc/meson.build (renamed from test cases/common/76 configure file in custom target/inc/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/73 configure file in custom target/meson.build (renamed from test cases/common/76 configure file in custom target/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/73 configure file in custom target/src/meson.build (renamed from test cases/common/76 configure file in custom target/src/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/73 configure file in custom target/src/mycompiler.py (renamed from test cases/common/76 configure file in custom target/src/mycompiler.py) | 0 | ||||
-rw-r--r-- | test cases/common/74 external test program/meson.build (renamed from test cases/common/77 external test program/meson.build) | 0 | ||||
-rwxr-xr-x | test cases/common/74 external test program/mytest.py (renamed from test cases/common/77 external test program/mytest.py) | 0 | ||||
-rwxr-xr-x | test cases/common/75 ctarget dependency/gen1.py (renamed from test cases/common/78 ctarget dependency/gen1.py) | 0 | ||||
-rwxr-xr-x | test cases/common/75 ctarget dependency/gen2.py (renamed from test cases/common/78 ctarget dependency/gen2.py) | 0 | ||||
-rw-r--r-- | test cases/common/75 ctarget dependency/input.dat (renamed from test cases/common/78 ctarget dependency/input.dat) | 0 | ||||
-rw-r--r-- | test cases/common/75 ctarget dependency/meson.build (renamed from test cases/common/78 ctarget dependency/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/76 shared subproject/a.c (renamed from test cases/common/79 shared subproject/a.c) | 0 | ||||
-rw-r--r-- | test cases/common/76 shared subproject/meson.build (renamed from test cases/common/79 shared subproject/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/76 shared subproject/subprojects/B/b.c (renamed from test cases/common/79 shared subproject/subprojects/B/b.c) | 0 | ||||
-rw-r--r-- | test cases/common/76 shared subproject/subprojects/B/meson.build (renamed from test cases/common/79 shared subproject/subprojects/B/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/76 shared subproject/subprojects/C/c.c (renamed from test cases/common/79 shared subproject/subprojects/C/c.c) | 0 | ||||
-rw-r--r-- | test cases/common/76 shared subproject/subprojects/C/meson.build (renamed from test cases/common/79 shared subproject/subprojects/C/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/77 shared subproject 2/a.c (renamed from test cases/common/80 shared subproject 2/a.c) | 0 | ||||
-rw-r--r-- | test cases/common/77 shared subproject 2/meson.build (renamed from test cases/common/80 shared subproject 2/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/77 shared subproject 2/subprojects/B/b.c (renamed from test cases/common/80 shared subproject 2/subprojects/B/b.c) | 0 | ||||
-rw-r--r-- | test cases/common/77 shared subproject 2/subprojects/B/meson.build (renamed from test cases/common/80 shared subproject 2/subprojects/B/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/77 shared subproject 2/subprojects/C/c.c (renamed from test cases/common/80 shared subproject 2/subprojects/C/c.c) | 0 | ||||
-rw-r--r-- | test cases/common/77 shared subproject 2/subprojects/C/meson.build (renamed from test cases/common/80 shared subproject 2/subprojects/C/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/78 file object/lib.c (renamed from test cases/common/81 file object/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/78 file object/meson.build (renamed from test cases/common/81 file object/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/78 file object/prog.c (renamed from test cases/common/81 file object/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/78 file object/subdir1/lib.c (renamed from test cases/common/81 file object/subdir1/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/78 file object/subdir1/meson.build (renamed from test cases/common/81 file object/subdir1/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/78 file object/subdir1/prog.c (renamed from test cases/common/81 file object/subdir1/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/78 file object/subdir2/lib.c (renamed from test cases/common/81 file object/subdir2/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/78 file object/subdir2/meson.build (renamed from test cases/common/81 file object/subdir2/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/78 file object/subdir2/prog.c (renamed from test cases/common/81 file object/subdir2/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/79 custom subproject dir/a.c (renamed from test cases/common/82 custom subproject dir/a.c) | 0 | ||||
-rw-r--r-- | test cases/common/79 custom subproject dir/custom_subproject_dir/B/b.c (renamed from test cases/common/82 custom subproject dir/custom_subproject_dir/B/b.c) | 0 | ||||
-rw-r--r-- | test cases/common/79 custom subproject dir/custom_subproject_dir/B/meson.build (renamed from test cases/common/82 custom subproject dir/custom_subproject_dir/B/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/79 custom subproject dir/custom_subproject_dir/C/c.c (renamed from test cases/common/82 custom subproject dir/custom_subproject_dir/C/c.c) | 0 | ||||
-rw-r--r-- | test cases/common/79 custom subproject dir/custom_subproject_dir/C/meson.build (renamed from test cases/common/82 custom subproject dir/custom_subproject_dir/C/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/79 custom subproject dir/meson.build (renamed from test cases/common/82 custom subproject dir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/80 has type/meson.build (renamed from test cases/common/83 has type/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/81 extract from nested subdir/meson.build (renamed from test cases/common/84 extract from nested subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/81 extract from nested subdir/src/first/lib_first.c | 3 | ||||
-rw-r--r-- | test cases/common/81 extract from nested subdir/src/first/meson.build (renamed from test cases/common/84 extract from nested subdir/src/first/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/81 extract from nested subdir/src/meson.build (renamed from test cases/common/84 extract from nested subdir/src/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/81 extract from nested subdir/tst/first/exe_first.c (renamed from test cases/common/84 extract from nested subdir/tst/first/exe_first.c) | 2 | ||||
-rw-r--r-- | test cases/common/81 extract from nested subdir/tst/first/meson.build (renamed from test cases/common/84 extract from nested subdir/tst/first/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/81 extract from nested subdir/tst/meson.build (renamed from test cases/common/84 extract from nested subdir/tst/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/82 internal dependency/meson.build (renamed from test cases/common/85 internal dependency/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/82 internal dependency/proj1/include/proj1.h (renamed from test cases/common/85 internal dependency/proj1/include/proj1.h) | 0 | ||||
-rw-r--r-- | test cases/common/82 internal dependency/proj1/meson.build (renamed from test cases/common/85 internal dependency/proj1/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/82 internal dependency/proj1/proj1f1.c (renamed from test cases/common/85 internal dependency/proj1/proj1f1.c) | 0 | ||||
-rw-r--r-- | test cases/common/82 internal dependency/proj1/proj1f2.c (renamed from test cases/common/85 internal dependency/proj1/proj1f2.c) | 0 | ||||
-rw-r--r-- | test cases/common/82 internal dependency/proj1/proj1f3.c (renamed from test cases/common/85 internal dependency/proj1/proj1f3.c) | 0 | ||||
-rw-r--r-- | test cases/common/82 internal dependency/src/main.c (renamed from test cases/common/85 internal dependency/src/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/82 internal dependency/src/meson.build (renamed from test cases/common/85 internal dependency/src/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/83 same basename/exe1.c (renamed from test cases/common/86 same basename/exe1.c) | 0 | ||||
-rw-r--r-- | test cases/common/83 same basename/exe2.c (renamed from test cases/common/86 same basename/exe2.c) | 0 | ||||
-rw-r--r-- | test cases/common/83 same basename/lib.c (renamed from test cases/common/86 same basename/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/83 same basename/meson.build (renamed from test cases/common/86 same basename/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/83 same basename/sharedsub/meson.build (renamed from test cases/common/86 same basename/sharedsub/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/83 same basename/staticsub/meson.build (renamed from test cases/common/86 same basename/staticsub/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/84 declare dep/entity/entity.h (renamed from test cases/common/87 declare dep/entity/entity.h) | 0 | ||||
-rw-r--r-- | test cases/common/84 declare dep/entity/entity1.c (renamed from test cases/common/87 declare dep/entity/entity1.c) | 0 | ||||
-rw-r--r-- | test cases/common/84 declare dep/entity/entity2.c (renamed from test cases/common/87 declare dep/entity/entity2.c) | 0 | ||||
-rw-r--r-- | test cases/common/84 declare dep/entity/meson.build (renamed from test cases/common/87 declare dep/entity/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/84 declare dep/main.c (renamed from test cases/common/87 declare dep/main.c) | 0 | ||||
-rw-r--r-- | test cases/common/84 declare dep/meson.build (renamed from test cases/common/87 declare dep/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/84 extract from nested subdir/src/first/lib_first.c | 3 | ||||
-rw-r--r-- | test cases/common/85 extract all/extractor.h (renamed from test cases/common/88 extract all/extractor.h) | 0 | ||||
-rw-r--r-- | test cases/common/85 extract all/four.c (renamed from test cases/common/88 extract all/four.c) | 0 | ||||
-rw-r--r-- | test cases/common/85 extract all/meson.build (renamed from test cases/common/88 extract all/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/85 extract all/one.c (renamed from test cases/common/88 extract all/one.c) | 0 | ||||
-rw-r--r-- | test cases/common/85 extract all/prog.c (renamed from test cases/common/88 extract all/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/85 extract all/three.c (renamed from test cases/common/88 extract all/three.c) | 0 | ||||
-rw-r--r-- | test cases/common/85 extract all/two.c (renamed from test cases/common/88 extract all/two.c) | 0 | ||||
-rw-r--r-- | test cases/common/86 add language/meson.build (renamed from test cases/common/89 add language/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/86 add language/prog.c (renamed from test cases/common/89 add language/prog.c) | 0 | ||||
-rw-r--r-- | test cases/common/86 add language/prog.cc (renamed from test cases/common/89 add language/prog.cc) | 0 | ||||
-rw-r--r-- | test cases/common/87 identical target name in subproject/bar.c (renamed from test cases/common/90 identical target name in subproject/bar.c) | 0 | ||||
-rw-r--r-- | test cases/common/87 identical target name in subproject/meson.build (renamed from test cases/common/90 identical target name in subproject/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/87 identical target name in subproject/subprojects/foo/bar.c (renamed from test cases/common/90 identical target name in subproject/subprojects/foo/bar.c) | 0 | ||||
-rw-r--r-- | test cases/common/87 identical target name in subproject/subprojects/foo/meson.build (renamed from test cases/common/90 identical target name in subproject/subprojects/foo/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/88 plusassign/meson.build (renamed from test cases/common/91 plusassign/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/89 skip subdir/meson.build (renamed from test cases/common/92 skip subdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/89 skip subdir/subdir1/meson.build (renamed from test cases/common/92 skip subdir/subdir1/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/89 skip subdir/subdir1/subdir2/meson.build (renamed from test cases/common/92 skip subdir/subdir1/subdir2/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/90 private include/meson.build (renamed from test cases/common/93 private include/meson.build) | 0 | ||||
-rwxr-xr-x | test cases/common/90 private include/stlib/compiler.py (renamed from test cases/common/93 private include/stlib/compiler.py) | 0 | ||||
-rw-r--r-- | test cases/common/90 private include/stlib/foo1.def (renamed from test cases/common/93 private include/stlib/foo2.def) | 0 | ||||
-rw-r--r-- | test cases/common/90 private include/stlib/foo2.def (renamed from test cases/unit/40 rpath order/subprojects/sub1/lib.c) | 0 | ||||
-rw-r--r-- | test cases/common/90 private include/stlib/meson.build (renamed from test cases/common/93 private include/stlib/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/90 private include/user/libuser.c (renamed from test cases/common/93 private include/user/libuser.c) | 0 | ||||
-rw-r--r-- | test cases/common/90 private include/user/meson.build (renamed from test cases/common/93 private include/user/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/91 default options/meson.build (renamed from test cases/common/94 default options/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/92 dep fallback/gensrc.py (renamed from test cases/common/95 dep fallback/gensrc.py) | 0 | ||||
-rw-r--r-- | test cases/common/92 dep fallback/meson.build (renamed from test cases/common/95 dep fallback/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/92 dep fallback/subprojects/boblib/bob.c (renamed from test cases/common/95 dep fallback/subprojects/boblib/bob.c) | 0 | ||||
-rw-r--r-- | test cases/common/92 dep fallback/subprojects/boblib/bob.h (renamed from test cases/common/95 dep fallback/subprojects/boblib/bob.h) | 0 | ||||
-rw-r--r-- | test cases/common/92 dep fallback/subprojects/boblib/genbob.py (renamed from test cases/common/95 dep fallback/subprojects/boblib/genbob.py) | 0 | ||||
-rw-r--r-- | test cases/common/92 dep fallback/subprojects/boblib/meson.build (renamed from test cases/common/95 dep fallback/subprojects/boblib/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/92 dep fallback/subprojects/dummylib/meson.build (renamed from test cases/common/95 dep fallback/subprojects/dummylib/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/92 dep fallback/tester.c (renamed from test cases/common/95 dep fallback/tester.c) | 0 | ||||
-rw-r--r-- | test cases/common/93 default library/ef.cpp (renamed from test cases/common/96 default library/ef.cpp) | 0 | ||||
-rw-r--r-- | test cases/common/93 default library/ef.h (renamed from test cases/common/96 default library/ef.h) | 0 | ||||
-rw-r--r-- | test cases/common/93 default library/eftest.cpp (renamed from test cases/common/96 default library/eftest.cpp) | 0 | ||||
-rw-r--r-- | test cases/common/93 default library/meson.build (renamed from test cases/common/96 default library/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/94 selfbuilt custom/data.dat (renamed from test cases/common/97 selfbuilt custom/data.dat) | 0 | ||||
-rw-r--r-- | test cases/common/94 selfbuilt custom/mainprog.cpp (renamed from test cases/common/97 selfbuilt custom/mainprog.cpp) | 0 | ||||
-rw-r--r-- | test cases/common/94 selfbuilt custom/meson.build (renamed from test cases/common/97 selfbuilt custom/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/94 selfbuilt custom/tool.cpp (renamed from test cases/common/97 selfbuilt custom/tool.cpp) | 0 | ||||
-rw-r--r-- | test cases/common/95 gen extra/meson.build (renamed from test cases/common/98 gen extra/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/95 gen extra/name.dat (renamed from test cases/common/98 gen extra/name.dat) | 0 | ||||
-rw-r--r-- | test cases/common/95 gen extra/name.l (renamed from test cases/common/98 gen extra/name.l) | 0 | ||||
-rw-r--r-- | test cases/common/95 gen extra/plain.c (renamed from test cases/common/98 gen extra/plain.c) | 0 | ||||
-rwxr-xr-x | test cases/common/95 gen extra/srcgen.py (renamed from test cases/common/98 gen extra/srcgen.py) | 0 | ||||
-rw-r--r-- | test cases/common/95 gen extra/srcgen2.py (renamed from test cases/common/98 gen extra/srcgen2.py) | 0 | ||||
-rw-r--r-- | test cases/common/95 gen extra/srcgen3.py (renamed from test cases/common/98 gen extra/srcgen3.py) | 0 | ||||
-rw-r--r-- | test cases/common/95 gen extra/upper.c (renamed from test cases/common/98 gen extra/upper.c) | 0 | ||||
-rw-r--r-- | test cases/common/96 benchmark/delayer.c (renamed from test cases/common/99 benchmark/delayer.c) | 0 | ||||
-rw-r--r-- | test cases/common/96 benchmark/meson.build (renamed from test cases/common/99 benchmark/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/97 test workdir/meson.build (renamed from test cases/common/100 test workdir/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/97 test workdir/opener.c (renamed from test cases/common/100 test workdir/opener.c) | 0 | ||||
-rw-r--r-- | test cases/common/98 suites/exe1.c (renamed from test cases/common/101 suites/exe1.c) | 0 | ||||
-rw-r--r-- | test cases/common/98 suites/exe2.c (renamed from test cases/common/101 suites/exe2.c) | 0 | ||||
-rw-r--r-- | test cases/common/98 suites/meson.build (renamed from test cases/common/101 suites/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/98 suites/subprojects/sub/meson.build (renamed from test cases/common/101 suites/subprojects/sub/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/98 suites/subprojects/sub/sub1.c (renamed from test cases/common/101 suites/subprojects/sub/sub1.c) | 0 | ||||
-rw-r--r-- | test cases/common/98 suites/subprojects/sub/sub2.c (renamed from test cases/common/101 suites/subprojects/sub/sub2.c) | 0 | ||||
-rw-r--r-- | test cases/common/99 threads/meson.build (renamed from test cases/common/102 threads/meson.build) | 0 | ||||
-rw-r--r-- | test cases/common/99 threads/threadprog.c (renamed from test cases/common/102 threads/threadprog.c) | 0 | ||||
-rw-r--r-- | test cases/common/99 threads/threadprog.cpp (renamed from test cases/common/102 threads/threadprog.cpp) | 0 | ||||
-rw-r--r-- | test cases/d/10 d cpp/cppmain.cpp | 12 | ||||
-rw-r--r-- | test cases/frameworks/4 qt/manualinclude.cpp | 2 | ||||
-rw-r--r-- | test cases/nasm/1 configure file/hello.asm | 38 | ||||
-rw-r--r-- | test cases/unit/14 testsetup selection/main.c | 2 | ||||
-rw-r--r-- | test cases/unit/14 testsetup selection/subprojects/bar/bar.c | 2 | ||||
-rw-r--r-- | test cases/unit/14 testsetup selection/subprojects/foo/foo.c | 2 | ||||
-rw-r--r-- | test cases/unit/36 mixed command line args/meson.build (renamed from test cases/unit/35 mixed command line args/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/36 mixed command line args/meson_options.txt (renamed from test cases/unit/35 mixed command line args/meson_options.txt) | 0 | ||||
-rw-r--r-- | test cases/unit/37 pkgconfig format/meson.build (renamed from test cases/unit/36 pkgconfig format/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/37 pkgconfig format/somelib.c (renamed from test cases/unit/36 pkgconfig format/somelib.c) | 0 | ||||
-rw-r--r-- | test cases/unit/37 pkgconfig format/someret.c (renamed from test cases/unit/36 pkgconfig format/someret.c) | 0 | ||||
-rwxr-xr-x | test cases/unit/38 python extmodule/blaster.py (renamed from test cases/unit/37 python extmodule/blaster.py) | 0 | ||||
-rw-r--r-- | test cases/unit/38 python extmodule/ext/meson.build (renamed from test cases/unit/37 python extmodule/ext/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/38 python extmodule/ext/tachyon_module.c (renamed from test cases/unit/37 python extmodule/ext/tachyon_module.c) | 0 | ||||
-rw-r--r-- | test cases/unit/38 python extmodule/meson.build (renamed from test cases/unit/37 python extmodule/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/38 python extmodule/meson_options.txt (renamed from test cases/unit/37 python extmodule/meson_options.txt) | 0 | ||||
-rw-r--r-- | test cases/unit/39 external, internal library rpath/built library/bar.c (renamed from test cases/unit/38 external, internal library rpath/built library/bar.c) | 0 | ||||
-rw-r--r-- | test cases/unit/39 external, internal library rpath/built library/meson.build (renamed from test cases/unit/38 external, internal library rpath/built library/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/39 external, internal library rpath/built library/meson_options.txt (renamed from test cases/unit/38 external, internal library rpath/built library/meson_options.txt) | 0 | ||||
-rw-r--r-- | test cases/unit/39 external, internal library rpath/built library/prog.c (renamed from test cases/unit/38 external, internal library rpath/built library/prog.c) | 0 | ||||
-rw-r--r-- | test cases/unit/39 external, internal library rpath/external library/faa.c (renamed from test cases/unit/38 external, internal library rpath/external library/faa.c) | 0 | ||||
-rw-r--r-- | test cases/unit/39 external, internal library rpath/external library/foo.c (renamed from test cases/unit/38 external, internal library rpath/external library/foo.c) | 0 | ||||
-rw-r--r-- | test cases/unit/39 external, internal library rpath/external library/meson.build (renamed from test cases/unit/38 external, internal library rpath/external library/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/40 featurenew subprojects/meson.build (renamed from test cases/unit/39 featurenew subprojects/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/40 featurenew subprojects/subprojects/bar/meson.build (renamed from test cases/unit/39 featurenew subprojects/subprojects/bar/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/40 featurenew subprojects/subprojects/foo/meson.build (renamed from test cases/unit/39 featurenew subprojects/subprojects/foo/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/41 rpath order/meson.build (renamed from test cases/unit/40 rpath order/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/41 rpath order/myexe.c (renamed from test cases/unit/40 rpath order/myexe.c) | 0 | ||||
-rw-r--r-- | test cases/unit/41 rpath order/subprojects/sub1/lib.c (renamed from test cases/unit/40 rpath order/subprojects/sub2/lib.c) | 0 | ||||
-rw-r--r-- | test cases/unit/41 rpath order/subprojects/sub1/meson.build (renamed from test cases/unit/40 rpath order/subprojects/sub1/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/41 rpath order/subprojects/sub2/lib.c (renamed from test cases/unit/41 dep order/lib1.c) | 0 | ||||
-rw-r--r-- | test cases/unit/41 rpath order/subprojects/sub2/meson.build (renamed from test cases/unit/40 rpath order/subprojects/sub2/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/42 dep order/lib1.c (renamed from test cases/unit/41 dep order/lib2.c) | 0 | ||||
-rw-r--r-- | test cases/unit/42 dep order/lib2.c | 0 | ||||
-rw-r--r-- | test cases/unit/42 dep order/meson.build (renamed from test cases/unit/41 dep order/meson.build) | 0 | ||||
-rw-r--r-- | test cases/unit/42 dep order/myexe.c (renamed from test cases/unit/41 dep order/myexe.c) | 0 | ||||
-rw-r--r-- | test cases/unit/43 promote wrap/meson.build | 5 | ||||
-rw-r--r-- | test cases/unit/43 promote wrap/subprojects/s1/meson.build | 2 | ||||
-rw-r--r-- | test cases/unit/43 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build | 2 | ||||
-rw-r--r-- | test cases/unit/43 promote wrap/subprojects/s2/meson.build | 2 | ||||
-rw-r--r-- | test cases/unit/43 promote wrap/subprojects/s2/subprojects/ambiguous.wrap | 2 | ||||
-rw-r--r-- | test cases/vala/10 mixed sources/vala/bar.vala | 2 | ||||
-rw-r--r-- | test cases/vala/5 target glib/GLib.Thread.vala | 72 | ||||
-rw-r--r-- | test cases/vala/9 gir/foo.vala | 8 | ||||
-rw-r--r-- | test cases/windows/16 gui app/console_prog.c | 3 | ||||
-rw-r--r-- | test cases/windows/16 gui app/dummy.c | 0 | ||||
-rw-r--r-- | test cases/windows/16 gui app/gui_app_tester.py | 26 | ||||
-rw-r--r-- | test cases/windows/16 gui app/gui_prog.c | 6 | ||||
-rw-r--r-- | test cases/windows/16 gui app/meson.build | 22 |
991 files changed, 982 insertions, 328 deletions
@@ -3,6 +3,7 @@ /.settings /.cproject /.idea +/.vscode __pycache__ .coverage diff --git a/.travis.yml b/.travis.yml index 197c803..dd5cebb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,9 @@ matrix: before_install: - python ./skip_ci.py --base-branch-env=TRAVIS_BRANCH --is-pull-env=TRAVIS_PULL_REQUEST - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt pkg-config; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install qt; fi + # # Run one macOS build without pkg-config available, and the other (unity=on) with pkg-config + - if [[ "$TRAVIS_OS_NAME" == "osx" && "$MESON_ARGS" =~ .*unity=on.* ]]; then brew install pkg-config; fi # Use a Ninja with QuLogic's patch: https://github.com/ninja-build/ninja/issues/1219 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir -p $HOME/tools; curl -L http://nirbheek.in/files/binaries/ninja/macos/ninja -o $HOME/tools/ninja; chmod +x $HOME/tools/ninja; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull jpakkane/mesonci:bionic; fi diff --git a/docs/markdown/Builtin-options.md b/docs/markdown/Builtin-options.md index b23cc94..05578c7 100644 --- a/docs/markdown/Builtin-options.md +++ b/docs/markdown/Builtin-options.md @@ -74,6 +74,7 @@ platforms or with all compilers: | b_bitcode | false | true, false | Embed Apple bitcode, see below | | b_colorout | always | auto, always, never | Use colored output | | b_coverage | false | true, false | Enable coverage tracking | +| b_vscrt | from_buildtype| none, md, mdd, mt, mtd, from_buildtype | VS runtime library to use (since 0.48.0) | | b_lundef | true | true, false | Don't allow undefined symbols when linking | | b_lto | false | true, false | Use link time optimization | | b_ndebug | false | true, false, if-release | Disable asserts | diff --git a/docs/markdown/Porting-from-autotools.md b/docs/markdown/Porting-from-autotools.md index 5786e0e..5c4c35d 100644 --- a/docs/markdown/Porting-from-autotools.md +++ b/docs/markdown/Porting-from-autotools.md @@ -622,8 +622,8 @@ import subprocess schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas') if not os.environ.get('DESTDIR'): - print('Compiling gsettings schemas...') - subprocess.call(['glib-compile-schemas', schemadir]) + print('Compiling gsettings schemas...') + subprocess.call(['glib-compile-schemas', schemadir]) ``` ### gettext diff --git a/docs/markdown/Reference-manual.md b/docs/markdown/Reference-manual.md index a7b8a2b..3ae740d 100644 --- a/docs/markdown/Reference-manual.md +++ b/docs/markdown/Reference-manual.md @@ -1859,6 +1859,9 @@ statement](Syntax.md#foreach-statements). Dictionaries are available since 0.47.0. +Since 0.48.0 dictionaries can be added (e.g. `d1 = d2 + d3` and `d1 += d2`). +Values from the second dictionary overrides values from the first. + ## Returned objects These are objects returned by the [functions listed above](#functions). diff --git a/docs/markdown/snippets/buildtype_toggles.md b/docs/markdown/snippets/buildtype_toggles.md new file mode 100644 index 0000000..e6ae53d --- /dev/null +++ b/docs/markdown/snippets/buildtype_toggles.md @@ -0,0 +1,21 @@ +## Toggles for build type, optimization and vcrt type + +Since the very beginning Meson has provided different project types to +use, such as *debug* and *minsize*. There is also a *plain* type that +adds nothing by default but instead makes it the user's responsibility +to add everything by hand. This works but is a bit tedious. + +In this release we have added new new options to manually toggle +e.g. optimization levels and debug info so those can be changed +independently of other options. For example by default the debug +buildtype has no optmization enabled at all. If you wish to use GCC's +`-Og` instead, you could set it with the following command: + +``` +meson configure -Doptimization=g +``` + +Similarly we have added a toggle option to select the version of +Visual Studio C runtime to use. By default it uses the debug runtime +DLL debug builds and release DLL for release builds but this can be +manually changed with the new base option `b_vscrt`. diff --git a/docs/markdown/snippets/dict_add.md b/docs/markdown/snippets/dict_add.md new file mode 100644 index 0000000..cde5b57 --- /dev/null +++ b/docs/markdown/snippets/dict_add.md @@ -0,0 +1,10 @@ +## Dictionary addition + +Dictionaries can now be added, values from the second dictionary overrides values +from the first + +```meson +d1 = {'a' : 'b'} +d3 = d1 + {'a' : 'c'} +d3 += {'d' : 'e'} +``` diff --git a/manual tests/7 vala composite widgets/mywidget.vala b/manual tests/7 vala composite widgets/mywidget.vala index 09a2064..68eaecc 100644 --- a/manual tests/7 vala composite widgets/mywidget.vala +++ b/manual tests/7 vala composite widgets/mywidget.vala @@ -2,40 +2,40 @@ using Gtk; [GtkTemplate (ui = "/org/foo/my/mywidget.ui")] public class MyWidget : Box { - public string text { - get { return entry.text; } - set { entry.text = value; } - } + public string text { + get { return entry.text; } + set { entry.text = value; } + } - [GtkChild] - private Entry entry; + [GtkChild] + private Entry entry; - public MyWidget (string text) { - this.text = text; - } + public MyWidget (string text) { + this.text = text; + } - [GtkCallback] - private void on_button_clicked (Button button) { - print ("The button was clicked with entry text: %s\n", entry.text); - } + [GtkCallback] + private void on_button_clicked (Button button) { + print ("The button was clicked with entry text: %s\n", entry.text); + } - [GtkCallback] - private void on_entry_changed (Editable editable) { - print ("The entry text changed: %s\n", entry.text); + [GtkCallback] + private void on_entry_changed (Editable editable) { + print ("The entry text changed: %s\n", entry.text); - notify_property ("text"); - } + notify_property ("text"); + } } void main(string[] args) { - Gtk.init (ref args); - var win = new Window(); - win.destroy.connect (Gtk.main_quit); + Gtk.init (ref args); + var win = new Window(); + win.destroy.connect (Gtk.main_quit); - var widget = new MyWidget ("The entry text!"); + var widget = new MyWidget ("The entry text!"); - win.add (widget); - win.show_all (); + win.add (widget); + win.show_all (); - Gtk.main (); + Gtk.main (); } diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 7306848..7ed97b2 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -532,6 +532,8 @@ class Backend: commands += compiler.get_option_compile_args(copt_proxy) # Add buildtype args: optimization level, debugging, etc. commands += compiler.get_buildtype_args(self.get_option_for_target('buildtype', target)) + commands += compiler.get_optimization_args(self.get_option_for_target('optimization', target)) + commands += compiler.get_debug_args(self.get_option_for_target('debug', target)) # Add compile args added using add_project_arguments() commands += self.build.get_project_args(compiler, target.subproject) # Add compile args added using add_global_arguments() diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 9dcf0fa..ace0693 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -32,7 +32,7 @@ from ..compilers import CompilerArgs, CCompiler from ..linkers import ArLinker from ..mesonlib import File, MesonException, OrderedSet from ..mesonlib import get_compiler_for_source, has_path_sep -from .backends import CleanTrees, InstallData, TargetInstallData +from .backends import CleanTrees from ..build import InvalidArguments if mesonlib.is_windows(): @@ -826,6 +826,8 @@ int dummy; deps = [] commands = CompilerArgs(compiler, target.extra_args.get('cs', [])) commands += compiler.get_buildtype_args(buildtype) + commands += compiler.get_optimization_args(self.get_option_for_target('optimization', target)) + commands += compiler.get_debug_args(self.get_option_for_target('debug', target)) if isinstance(target, build.Executable): commands.append('-target:exe') elif isinstance(target, build.SharedLibrary): @@ -1117,6 +1119,7 @@ int dummy; args.append(cratetype) args += ['--crate-name', target.name] args += rustc.get_buildtype_args(self.get_option_for_target('buildtype', target)) + args += rustc.get_debug_args(self.get_option_for_target('debug', target)) depfile = os.path.join(target.subdir, target.name + '.d') args += ['--emit', 'dep-info={}'.format(depfile), '--emit', 'link'] args += target.get_extra_args('rust') @@ -1241,6 +1244,8 @@ int dummy; raise InvalidArguments('Swift target %s contains a non-swift source file.' % target.get_basename()) os.makedirs(self.get_target_private_dir_abs(target), exist_ok=True) compile_args = swiftc.get_compile_only_args() + compile_args += swiftc.get_optimization_args(self.get_option_for_target('optimization', target)) + compile_args += swiftc.get_debug_args(self.get_option_for_target('debug', target)) compile_args += swiftc.get_module_args(module_name) compile_args += self.build.get_project_args(swiftc, target.subproject) compile_args += self.build.get_global_args(swiftc) @@ -2234,9 +2239,8 @@ rule FORTRAN_DEP_HACK%s if isinstance(target, build.Executable): # Currently only used with the Swift compiler to add '-emit-executable' commands += linker.get_std_exe_link_args() - # If gui_app, and that's significant on this platform - if target.gui_app and hasattr(linker, 'get_gui_app_args'): - commands += linker.get_gui_app_args() + # If gui_app is significant on this platform, add the appropriate linker arguments + commands += linker.get_gui_app_args(target.gui_app) # If export_dynamic, add the appropriate linker arguments if target.export_dynamic: commands += linker.gen_export_dynamic_link_args(self.environment) diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index acbb12d..4c799d0 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -534,9 +534,17 @@ class Vs2010Backend(backends.Backend): pch_out = ET.SubElement(inc_cl, 'PrecompiledHeaderOutputFile') pch_out.text = '$(IntDir)$(TargetName)-%s.pch' % lang + def is_argument_with_msbuild_xml_entry(self, entry): + # Remove arguments that have a top level XML entry so + # they are not used twice. + # FIXME add args as needed. + return entry[1:].startswith('M') + def add_additional_options(self, lang, parent_node, file_args): args = [] for arg in file_args[lang].to_native(): + if self.is_argument_with_msbuild_xml_entry(arg): + continue if arg == '%(AdditionalOptions)': args.append(arg) else: @@ -677,6 +685,7 @@ class Vs2010Backend(backends.Backend): compiler = self._get_cl_compiler(target) buildtype_args = compiler.get_buildtype_args(self.buildtype) buildtype_link_args = compiler.get_buildtype_linker_args(self.buildtype) + vscrt_type = self.environment.coredata.base_options['b_vscrt'] project_name = target.name target_name = target.name root = ET.Element('Project', {'DefaultTargets': "Build", @@ -730,9 +739,24 @@ class Vs2010Backend(backends.Backend): if '/INCREMENTAL:NO' in buildtype_link_args: ET.SubElement(type_config, 'LinkIncremental').text = 'false' # CRT type; debug or release - if '/MDd' in buildtype_args: + if vscrt_type.value == 'from_buildtype': + if self.buildtype == 'debug' or self.buildtype == 'debugoptimized': + ET.SubElement(type_config, 'UseDebugLibraries').text = 'true' + ET.SubElement(type_config, 'RuntimeLibrary').text = 'MultiThreadedDebugDLL' + else: + ET.SubElement(type_config, 'UseDebugLibraries').text = 'false' + ET.SubElement(type_config, 'RuntimeLibrary').text = 'MultiThreaded' + elif vscrt_type.value == 'mdd': ET.SubElement(type_config, 'UseDebugLibraries').text = 'true' ET.SubElement(type_config, 'RuntimeLibrary').text = 'MultiThreadedDebugDLL' + elif vscrt_type.value == 'mt': + # FIXME, wrong + ET.SubElement(type_config, 'UseDebugLibraries').text = 'false' + ET.SubElement(type_config, 'RuntimeLibrary').text = 'MultiThreaded' + elif vscrt_type.value == 'mtd': + # FIXME, wrong + ET.SubElement(type_config, 'UseDebugLibraries').text = 'true' + ET.SubElement(type_config, 'RuntimeLibrary').text = 'MultiThreadedDebug' else: ET.SubElement(type_config, 'UseDebugLibraries').text = 'false' ET.SubElement(type_config, 'RuntimeLibrary').text = 'MultiThreadedDLL' @@ -800,6 +824,7 @@ class Vs2010Backend(backends.Backend): if l in file_args: file_args[l] += compilers.get_base_compile_args(self.get_base_options_for_target(target), comp) file_args[l] += comp.get_option_compile_args(self.environment.coredata.compiler_options) + # Add compile args added using add_project_arguments() for l, args in self.build.projects_args.get(target.subproject, {}).items(): if l in file_args: diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py index 2dfe794..c7092b8 100644 --- a/mesonbuild/compilers/c.py +++ b/mesonbuild/compilers/c.py @@ -30,8 +30,6 @@ from .compilers import ( GCC_MINGW, get_largefile_args, gnu_winlibs, - msvc_buildtype_args, - msvc_buildtype_linker_args, msvc_winlibs, vs32_instruction_set_args, vs64_instruction_set_args, @@ -1197,6 +1195,13 @@ class VisualStudioCCompiler(CCompiler): ignore_libs = gnu_compiler_internal_libs internal_libs = () + crt_args = {'none': [], + 'md': ['/MD'], + 'mdd': ['/MDd'], + 'mt': ['/MT'], + 'mtd': ['/MTd'], + } + def __init__(self, exelist, version, is_cross, exe_wrap, is_64): CCompiler.__init__(self, exelist, version, is_cross, exe_wrap) self.id = 'msvc' @@ -1206,7 +1211,7 @@ class VisualStudioCCompiler(CCompiler): self.warn_args = {'1': ['/W2'], '2': ['/W3'], '3': ['/W4']} - self.base_options = ['b_pch', 'b_ndebug'] # FIXME add lto, pgo and the like + self.base_options = ['b_pch', 'b_ndebug', 'b_vscrt'] # FIXME add lto, pgo and the like self.is_64 = is_64 # Override CCompiler.get_always_args @@ -1225,10 +1230,10 @@ class VisualStudioCCompiler(CCompiler): return ['/MDd'] def get_buildtype_args(self, buildtype): - return msvc_buildtype_args[buildtype] + return compilers.msvc_buildtype_args[buildtype] def get_buildtype_linker_args(self, buildtype): - return msvc_buildtype_linker_args[buildtype] + return compilers.msvc_buildtype_linker_args[buildtype] def get_pch_suffix(self): return 'pch' @@ -1258,6 +1263,12 @@ class VisualStudioCCompiler(CCompiler): return ['/Fe' + target] return ['/Fo' + target] + def get_optimization_args(self, optimization_level): + return compilers.msvc_optimization_args[optimization_level] + + def get_debug_args(self, is_debug): + return compilers.msvc_debug_args[is_debug] + def get_dependency_gen_args(self, outtarget, outfile): return [] @@ -1276,8 +1287,13 @@ class VisualStudioCCompiler(CCompiler): def linker_to_compiler_args(self, args): return ['/link'] + args - def get_gui_app_args(self): - return ['/SUBSYSTEM:WINDOWS'] + def get_gui_app_args(self, value): + # the default is for the linker to guess the subsystem based on presence + # of main or WinMain symbols, so always be explicit + if value: + return ['/SUBSYSTEM:WINDOWS'] + else: + return ['/SUBSYSTEM:CONSOLE'] def get_pic_args(self): return [] # PIC is handled by the loader on Windows @@ -1435,6 +1451,24 @@ class VisualStudioCCompiler(CCompiler): return [] return os.environ['INCLUDE'].split(os.pathsep) + def get_crt_compile_args(self, crt_val, buildtype): + if crt_val in self.crt_args: + return self.crt_args[crt_val] + assert(crt_val == 'from_buildtype') + # Match what build type flags used to do. + if buildtype == 'plain': + return [] + elif buildtype == 'debug': + return self.crt_args['mdd'] + elif buildtype == 'debugoptimized': + return self.crt_args['md'] + elif buildtype == 'release': + return self.crt_args['md'] + elif buildtype == 'minsize': + return self.crt_args['md'] + else: + assert(buildtype == 'custom') + raise EnvironmentException('Requested C runtime based on buildtype, but buildtype is "custom".') class ArmCCompiler(ArmCompiler, CCompiler): def __init__(self, exelist, version, is_cross, exe_wrapper=None, **kwargs): diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py index ea0fc2c..b8ae399 100644 --- a/mesonbuild/compilers/compilers.py +++ b/mesonbuild/compilers/compilers.py @@ -124,12 +124,10 @@ def is_library(fname): return suffix in lib_suffixes gnulike_buildtype_args = {'plain': [], - # -O0 is passed for improved debugging information with gcc - # See https://github.com/mesonbuild/meson/pull/509 - 'debug': ['-O0', '-g'], - 'debugoptimized': ['-O2', '-g'], - 'release': ['-O3'], - 'minsize': ['-Os', '-g']} + 'debug': [], + 'debugoptimized': [], + 'release': [], + 'minsize': []} armclang_buildtype_args = {'plain': [], 'debug': ['-O0', '-g'], @@ -145,10 +143,10 @@ arm_buildtype_args = {'plain': [], } msvc_buildtype_args = {'plain': [], - 'debug': ["/MDd", "/ZI", "/Ob0", "/Od", "/RTC1"], - 'debugoptimized': ["/MD", "/Zi", "/O2", "/Ob1"], - 'release': ["/MD", "/O2", "/Ob2"], - 'minsize': ["/MD", "/Zi", "/Os", "/Ob1"], + 'debug': ["/ZI", "/Ob0", "/Od", "/RTC1"], + 'debugoptimized': ["/Zi", "/Ob1"], + 'release': ["/Ob2"], + 'minsize': ["/Zi", "/Ob1"], } apple_buildtype_linker_args = {'plain': [], @@ -190,44 +188,44 @@ java_buildtype_args = {'plain': [], } rust_buildtype_args = {'plain': [], - 'debug': ['-C', 'debuginfo=2'], - 'debugoptimized': ['-C', 'debuginfo=2', '-C', 'opt-level=2'], - 'release': ['-C', 'opt-level=3'], - 'minsize': [], # In a future release: ['-C', 'opt-level=s'], + 'debug': [], + 'debugoptimized': [], + 'release': [], + 'minsize': [], } d_gdc_buildtype_args = {'plain': [], - 'debug': ['-g', '-O0'], - 'debugoptimized': ['-g', '-O'], + 'debug': [], + 'debugoptimized': ['-O'], 'release': ['-O3', '-frelease'], 'minsize': [], } d_ldc_buildtype_args = {'plain': [], - 'debug': ['-g', '-O0'], - 'debugoptimized': ['-g', '-O'], + 'debug': [], + 'debugoptimized': ['-O'], 'release': ['-O3', '-release'], 'minsize': [], } d_dmd_buildtype_args = {'plain': [], - 'debug': ['-g'], - 'debugoptimized': ['-g', '-O'], + 'debug': [], + 'debugoptimized': ['-O'], 'release': ['-O', '-release'], 'minsize': [], } mono_buildtype_args = {'plain': [], - 'debug': ['-debug'], - 'debugoptimized': ['-debug', '-optimize+'], + 'debug': [], + 'debugoptimized': ['-optimize+'], 'release': ['-optimize+'], 'minsize': [], } swift_buildtype_args = {'plain': [], - 'debug': ['-g'], - 'debugoptimized': ['-g', '-O'], - 'release': ['-O'], + 'debug': [], + 'debugoptimized': [], + 'release': [], 'minsize': [], } @@ -248,6 +246,36 @@ clang_color_args = {'auto': ['-Xclang', '-fcolor-diagnostics'], 'never': ['-Xclang', '-fno-color-diagnostics'], } +clike_optimization_args = {'0': [], + 'g': [], + '1': ['-O1'], + '2': ['-O2'], + '3': ['-O3'], + 's': ['-Os'], + } + +gnu_optimization_args = {'0': [], + 'g': ['-Og'], + '1': ['-O1'], + '2': ['-O2'], + '3': ['-O3'], + 's': ['-Os'], + } + +msvc_optimization_args = {'0': [], + 'g': ['/O0'], + '1': ['/O1'], + '2': ['/O2'], + '3': ['/O3'], + 's': ['/Os'], + } + +clike_debug_args = {False: [], + True: ['-g']} + +msvc_debug_args = {False: [], + True: []} # Fixme! + base_options = {'b_pch': coredata.UserBooleanOption('b_pch', 'Use precompiled headers', True), 'b_lto': coredata.UserBooleanOption('b_lto', 'Use link time optimization', False), 'b_sanitize': coredata.UserComboOption('b_sanitize', @@ -273,6 +301,9 @@ base_options = {'b_pch': coredata.UserBooleanOption('b_pch', 'Use precompiled he 'b_bitcode': coredata.UserBooleanOption('b_bitcode', 'Generate and embed bitcode (only macOS and iOS)', False), + 'b_vscrt': coredata.UserComboOption('b_vscrt', 'VS run-time library type to use.', + ['none', 'md', 'mdd', 'mt', 'mtd', 'from_buildtype'], + 'from_buildtype'), } gnulike_instruction_set_args = {'mmx': ['-mmmx'], @@ -380,6 +411,15 @@ def get_base_compile_args(options, compiler): # This does not need a try...except if option_enabled(compiler.base_options, options, 'b_bitcode'): args.append('-fembed-bitcode') + try: + crt_val = options['b_vscrt'].value + buildtype = options['buildtype'].value + try: + args += compiler.get_crt_compile_args(crt_val, buildtype) + except AttributeError: + pass + except KeyError: + pass return args def get_base_link_args(options, linker, is_shared_module): @@ -1076,6 +1116,9 @@ class Compiler: def gnu_symbol_visibility_args(self, vistype): return [] + def get_gui_app_args(self, value): + return [] + GCC_STANDARD = 0 GCC_OSX = 1 GCC_MINGW = 2 @@ -1247,6 +1290,12 @@ class GnuCompiler: def get_buildtype_args(self, buildtype): return gnulike_buildtype_args[buildtype] + def get_optimization_args(self, optimization_level): + return gnu_optimization_args[optimization_level] + + def get_debug_args(self, is_debug): + return clike_debug_args[is_debug] + def get_buildtype_linker_args(self, buildtype): if self.gcc_type == GCC_OSX: return apple_buildtype_linker_args[buildtype] @@ -1277,8 +1326,8 @@ class GnuCompiler: # For other targets, discard the .def file. return [] - def get_gui_app_args(self): - if self.gcc_type in (GCC_CYGWIN, GCC_MINGW): + def get_gui_app_args(self, value): + if self.gcc_type in (GCC_CYGWIN, GCC_MINGW) and value: return ['-mwindows'] return [] @@ -1368,6 +1417,12 @@ class ClangCompiler: return apple_buildtype_linker_args[buildtype] return gnulike_buildtype_linker_args[buildtype] + def get_optimization_args(self, optimization_level): + return clike_optimization_args[optimization_level] + + def get_debug_args(self, is_debug): + return clike_debug_args[is_debug] + def get_pch_suffix(self): return 'pch' diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py index 2280f46..d8203dd 100644 --- a/mesonbuild/compilers/cpp.py +++ b/mesonbuild/compilers/cpp.py @@ -89,7 +89,11 @@ class ClangCPPCompiler(ClangCompiler, CPPCompiler): args = [] std = options['cpp_std'] if std.value != 'none': - args.append('-std=' + std.value) + cpp_std_value = std.value + # Clang 3.2, 3.3, 3.4 only understand -std={c,gnu}++1y and not -std={c,gnu}++14 + if version_compare(self.version, '>=3.2') and version_compare(self.version, '<3.5'): + cpp_std_value = cpp_std_value.replace('++14', '++1y') + args.append('-std=' + cpp_std_value) return args def get_option_link_args(self, options): @@ -155,7 +159,11 @@ class GnuCPPCompiler(GnuCompiler, CPPCompiler): args = [] std = options['cpp_std'] if std.value != 'none': - args.append('-std=' + std.value) + cpp_std_value = std.value + # GCC 4.8 only understands -std={c,gnu}++1y and not -std={c,gnu}++14 + if version_compare(self.version, '>=4.8') and version_compare(self.version, '<4.9'): + cpp_std_value = cpp_std_value.replace('++14', '++1y') + args.append('-std=' + cpp_std_value) if options['cpp_debugstl'].value: args.append('-D_GLIBCXX_DEBUG=1') return args @@ -242,7 +250,7 @@ class VisualStudioCPPCompiler(VisualStudioCCompiler, CPPCompiler): def __init__(self, exelist, version, is_cross, exe_wrap, is_64): CPPCompiler.__init__(self, exelist, version, is_cross, exe_wrap) VisualStudioCCompiler.__init__(self, exelist, version, is_cross, exe_wrap, is_64) - self.base_options = ['b_pch'] # FIXME add lto, pgo and the like + self.base_options = ['b_pch', 'b_vscrt'] # FIXME add lto, pgo and the like def get_options(self): opts = CPPCompiler.get_options(self) diff --git a/mesonbuild/compilers/cs.py b/mesonbuild/compilers/cs.py index e17cd4e..a6c74d2 100644 --- a/mesonbuild/compilers/cs.py +++ b/mesonbuild/compilers/cs.py @@ -19,6 +19,14 @@ from ..mesonlib import is_windows from .compilers import Compiler, mono_buildtype_args +cs_optimization_args = {'0': [], + 'g': [], + '1': ['-optimize+'], + '2': ['-optimize+'], + '3': ['-optimize+'], + 's': ['-optimize+'], + } + class CsCompiler(Compiler): def __init__(self, exelist, version, id, runner=None): self.language = 'cs' @@ -118,6 +126,11 @@ class CsCompiler(Compiler): def get_buildtype_args(self, buildtype): return mono_buildtype_args[buildtype] + def get_debug_args(self, is_debug): + return ['-debug'] if is_debug else [] + + def get_optimization_args(self, optimization_level): + return cs_optimization_args[optimization_level] class MonoCompiler(CsCompiler): def __init__(self, exelist, version): diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py index f0f3d54..e67683b 100644 --- a/mesonbuild/compilers/d.py +++ b/mesonbuild/compilers/d.py @@ -14,15 +14,19 @@ import os.path, subprocess -from ..mesonlib import EnvironmentException, version_compare +from ..mesonlib import EnvironmentException, version_compare, is_windows, is_osx from .compilers import ( GCC_STANDARD, + GCC_CYGWIN, + GCC_OSX, d_dmd_buildtype_args, d_gdc_buildtype_args, d_ldc_buildtype_args, get_gcc_soname_args, gnu_color_args, + gnu_optimization_args, + clike_debug_args, Compiler, CompilerArgs, ) @@ -41,6 +45,22 @@ d_feature_args = {'gcc': {'unittest': '-funittest', } } +ldc_optimization_args = {'0': [], + 'g': [], + '1': ['-O1'], + '2': ['-O2'], + '3': ['-O3'], + 's': ['-Os'], + } + +dmd_optimization_args = {'0': [], + 'g': [], + '1': ['-O'], + '2': ['-O'], + '3': ['-O'], + 's': ['-O'], + } + class DCompiler(Compiler): def __init__(self, exelist, version, is_cross, **kwargs): self.language = 'd' @@ -90,8 +110,15 @@ class DCompiler(Compiler): return ['-shared'] def get_soname_args(self, prefix, shlib_name, suffix, soversion, is_shared_module): - # FIXME: Make this work for Windows, MacOS and cross-compiling - return get_gcc_soname_args(GCC_STANDARD, prefix, shlib_name, suffix, soversion, is_shared_module) + # FIXME: Make this work for cross-compiling + gcc_type = GCC_STANDARD + if is_windows(): + gcc_type = GCC_CYGWIN + if is_osx(): + gcc_type = GCC_OSX + + return get_gcc_soname_args(gcc_type, prefix, shlib_name, suffix, soversion, is_shared_module) + def get_feature_args(self, kwargs, build_to_src): res = [] @@ -212,6 +239,9 @@ class DCompiler(Compiler): for la in linkargs: dcargs.append('-L' + la.strip()) continue + elif arg.startswith('-install-name'): + dcargs.append('-L' + arg) + continue elif arg.startswith('-link-defaultlib') or arg.startswith('-linker'): # these are special arguments to the LDC linker call, # arguments like "-link-defaultlib-shared" do *not* @@ -238,6 +268,8 @@ class DCompiler(Compiler): return dcargs + def get_debug_args(self, is_debug): + return clike_debug_args[is_debug] class GnuDCompiler(DCompiler): def __init__(self, exelist, version, is_cross, **kwargs): @@ -288,6 +320,8 @@ class GnuDCompiler(DCompiler): def build_rpath_args(self, build_dir, from_dir, rpath_paths, build_rpath, install_rpath): return self.build_unix_rpath_args(build_dir, from_dir, rpath_paths, build_rpath, install_rpath) + def get_optimization_args(self, optimization_level): + return gnu_optimization_args[optimization_level] class LLVMDCompiler(DCompiler): def __init__(self, exelist, version, is_cross, **kwargs): @@ -342,6 +376,9 @@ class LLVMDCompiler(DCompiler): def unix_args_to_native(cls, args): return cls.translate_args_to_nongnu(args) + def get_optimization_args(self, optimization_level): + return ldc_optimization_args[optimization_level] + class DmdDCompiler(DCompiler): def __init__(self, exelist, version, is_cross, **kwargs): @@ -392,3 +429,6 @@ class DmdDCompiler(DCompiler): @classmethod def unix_args_to_native(cls, args): return cls.translate_args_to_nongnu(args) + + def get_optimization_args(self, optimization_level): + return dmd_optimization_args[optimization_level] diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py index d6e41e3..5648a6f 100644 --- a/mesonbuild/compilers/fortran.py +++ b/mesonbuild/compilers/fortran.py @@ -15,12 +15,20 @@ from .c import CCompiler from .compilers import ( ICC_STANDARD, + apple_buildtype_linker_args, + gnulike_buildtype_args, + gnulike_buildtype_linker_args, + gnu_optimization_args, + clike_debug_args, Compiler, GnuCompiler, ElbrusCompiler, IntelCompiler, ) +from mesonbuild.mesonlib import EnvironmentException, is_osx +import subprocess, os + class FortranCompiler(Compiler): library_dirs_cache = CCompiler.library_dirs_cache program_dirs_cache = CCompiler.library_dirs_cache @@ -61,6 +69,48 @@ class FortranCompiler(Compiler): def get_soname_args(self, *args): return CCompiler.get_soname_args(self, *args) + def sanity_check(self, work_dir, environment): + source_name = os.path.join(work_dir, 'sanitycheckf.f90') + binary_name = os.path.join(work_dir, 'sanitycheckf') + with open(source_name, 'w') as ofile: + ofile.write('''program prog + print *, "Fortran compilation is working." +end program prog +''') + extra_flags = self.get_cross_extra_flags(environment, link=True) + pc = subprocess.Popen(self.exelist + extra_flags + [source_name, '-o', binary_name]) + pc.wait() + if pc.returncode != 0: + raise EnvironmentException('Compiler %s can not compile programs.' % self.name_string()) + if self.is_cross: + if self.exe_wrapper is None: + # Can't check if the binaries run so we have to assume they do + return + cmdlist = self.exe_wrapper + [binary_name] + else: + cmdlist = [binary_name] + pe = subprocess.Popen(cmdlist, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + pe.wait() + if pe.returncode != 0: + raise EnvironmentException('Executables created by Fortran compiler %s are not runnable.' % self.name_string()) + + def get_std_warn_args(self, level): + return FortranCompiler.std_warn_args + + def get_buildtype_args(self, buildtype): + return gnulike_buildtype_args[buildtype] + + def get_optimization_args(self, optimization_level): + return gnu_optimization_args[optimization_level] + + def get_debug_args(self, is_debug): + return clike_debug_args[is_debug] + + def get_buildtype_linker_args(self, buildtype): + if is_osx(): + return apple_buildtype_linker_args[buildtype] + return gnulike_buildtype_linker_args[buildtype] + def split_shlib_to_parts(self, fname): return CCompiler.split_shlib_to_parts(self, fname) @@ -151,13 +201,6 @@ class FortranCompiler(Compiler): def gen_import_library_args(self, implibname): return CCompiler.gen_import_library_args(self, implibname) - def sanity_check(self, work_dir, environment): - code = '''program main - integer :: ret = 0 - call exit(ret) - end program main''' - return CCompiler.sanity_check_impl(self, work_dir, environment, 'sanitycheckf.f90', code) - def _get_compiler_check_args(self, env, extra_args, dependencies, mode='compile'): return CCompiler._get_compiler_check_args(self, env, extra_args, dependencies, mode='compile') diff --git a/mesonbuild/compilers/rust.py b/mesonbuild/compilers/rust.py index d1a05ed..93c2917 100644 --- a/mesonbuild/compilers/rust.py +++ b/mesonbuild/compilers/rust.py @@ -16,7 +16,15 @@ import subprocess, os.path from ..mesonlib import EnvironmentException, Popen_safe -from .compilers import Compiler, rust_buildtype_args +from .compilers import Compiler, rust_buildtype_args, clike_debug_args + +rust_optimization_args = {'0': [], + 'g': ['-C', '--opt-level=0'], + '1': ['-C', '--opt-level=1'], + '2': ['-C', '--opt-level=2'], + '3': ['-C', '--opt-level=3'], + 's': ['-C', '--opt-level=s'], + } class RustCompiler(Compiler): def __init__(self, exelist, version, is_cross, exe_wrapper=None): @@ -68,3 +76,9 @@ class RustCompiler(Compiler): cmd = self.exelist + ['--print', 'sysroot'] p, stdo, stde = Popen_safe(cmd) return stdo.split('\n')[0] + + def get_debug_args(self, is_debug): + return clike_debug_args[is_debug] + + def get_optimization_args(self, optimization_level): + return rust_optimization_args[optimization_level] diff --git a/mesonbuild/compilers/swift.py b/mesonbuild/compilers/swift.py index 59997d6..4d5dd0c 100644 --- a/mesonbuild/compilers/swift.py +++ b/mesonbuild/compilers/swift.py @@ -16,7 +16,15 @@ import subprocess, os.path from ..mesonlib import EnvironmentException -from .compilers import Compiler, swift_buildtype_args +from .compilers import Compiler, swift_buildtype_args, clike_debug_args + +swift_optimization_args = {'0': [], + 'g': [], + '1': ['-O'], + '2': ['-O'], + '3': ['-O'], + 's': ['-O'], + } class SwiftCompiler(Compiler): def __init__(self, exelist, version): @@ -97,3 +105,9 @@ class SwiftCompiler(Compiler): raise EnvironmentException('Swift compiler %s can not compile programs.' % self.name_string()) if subprocess.call(output_name) != 0: raise EnvironmentException('Executables created by Swift compiler %s are not runnable.' % self.name_string()) + + def get_debug_args(self, is_debug): + return clike_debug_args[is_debug] + + def get_optimization_args(self, optimization_level): + return swift_optimization_args[optimization_level] diff --git a/mesonbuild/compilers/vala.py b/mesonbuild/compilers/vala.py index 6194d1a..46bb210 100644 --- a/mesonbuild/compilers/vala.py +++ b/mesonbuild/compilers/vala.py @@ -34,6 +34,12 @@ class ValaCompiler(Compiler): def needs_static_linker(self): return False # Because compiles into C. + def get_optimization_args(self, optimization_level): + return [] + + def get_debug_args(self, is_debug): + return ['--debug'] + def get_output_args(self, target): return [] # Because compiles into C. diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index 4c24dbd..7520e06 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -349,6 +349,51 @@ class CoreData: raise RuntimeError('Tried to set unknown builtin option %s.' % optname) self.builtins[optname].set_value(value) + # Make sure that buildtype matches other settings. + if optname == 'buildtype': + self.set_others_from_buildtype(value) + else: + self.set_buildtype_from_others() + + def set_others_from_buildtype(self, value): + if value == 'plain': + opt = '0' + debug = False + elif value == 'debug': + opt = '0' + debug = True + elif value == 'debugoptimized': + opt = '2' + debug = True + elif value == 'release': + opt = '3' + debug = False + elif value == 'minsize': + opt = 's' + debug = True + else: + assert(value == 'custom') + return + self.builtins['optimization'].set_value(opt) + self.builtins['debug'].set_value(debug) + + def set_buildtype_from_others(self): + opt = self.builtins['optimization'].value + debug = self.builtins['debug'].value + if opt == '0' and not debug: + mode = 'plain' + elif opt == '0' and debug: + mode = 'debug' + elif opt == '2' and debug: + mode = 'debugoptimized' + elif opt == '3' and not debug: + mode = 'release' + elif opt == 's' and debug: + mode = 'minsize' + else: + mode = 'custom' + self.builtins['buildtype'].set_value(mode) + def validate_option_value(self, option_name, override_value): for opts in (self.builtins, self.base_options, self.compiler_options, self.user_options): if option_name in opts: @@ -389,8 +434,7 @@ class CoreData: if k == 'prefix': pass elif k in self.builtins: - tgt = self.builtins[k] - tgt.set_value(self.sanitize_dir_option_value(prefix, k, v)) + self.set_builtin_option(k, v) elif k in self.backend_options: tgt = self.backend_options[k] tgt.set_value(v) @@ -544,7 +588,7 @@ def parse_cmd_line_options(args): delattr(args, name) builtin_options = { - 'buildtype': [UserComboOption, 'Build type to use.', ['plain', 'debug', 'debugoptimized', 'release', 'minsize'], 'debug'], + 'buildtype': [UserComboOption, 'Build type to use.', ['plain', 'debug', 'debugoptimized', 'release', 'minsize', 'custom'], 'debug'], 'strip': [UserBooleanOption, 'Strip targets on install.', False], 'unity': [UserComboOption, 'Unity build.', ['on', 'off', 'subprojects'], 'off'], 'prefix': [UserStringOption, 'Installation prefix.', default_prefix()], @@ -569,6 +613,8 @@ builtin_options = { 'errorlogs': [UserBooleanOption, "Whether to print the logs from failing tests.", True], 'install_umask': [UserUmaskOption, 'Default umask to apply on permissions of installed files.', '022'], 'auto_features': [UserFeatureOption, "Override value of all 'auto' features.", 'auto'], + 'optimization': [UserComboOption, 'Optimization level', ['0', 'g', '1', '2', '3', 's'], '0'], + 'debug': [UserBooleanOption, 'Debug', True] } # Special prefix-dependent defaults for installation directories that reside in diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py index c4f9630..20ba06c 100644 --- a/mesonbuild/dependencies/base.py +++ b/mesonbuild/dependencies/base.py @@ -1191,7 +1191,7 @@ class ExternalLibrary(ExternalDependency): class ExtraFrameworkDependency(ExternalDependency): def __init__(self, name, required, path, env, lang, kwargs): super().__init__('extraframeworks', env, lang, kwargs) - self.name = None + self.name = name self.required = required self.detect(name, path) if self.found(): diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 6688c62..c64fe59 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -15,7 +15,7 @@ import configparser, os, platform, re, shlex, shutil, subprocess from . import coredata -from .linkers import ArLinker, VisualStudioLinker +from .linkers import ArLinker, ArmarLinker, VisualStudioLinker from . import mesonlib from .mesonlib import EnvironmentException, Popen_safe from . import mlog @@ -885,6 +885,8 @@ This is probably wrong, it should always point to the native compiler.''' % evar continue if '/OUT:' in out or '/OUT:' in err: return VisualStudioLinker(linker) + if p.returncode == 0 and ('armar' in linker or 'armar.exe' in linker): + return ArmarLinker(linker) if p.returncode == 0: return ArLinker(linker) if p.returncode == 1 and err.startswith('usage'): # OSX diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 1cf20f8..707cf9e 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2279,7 +2279,7 @@ external dependencies (including libraries) must go to "dependencies".''') return self.subprojects[dirname] def get_option_internal(self, optname): - undecorated_optname = optname + raw_optname = optname try: return self.coredata.base_options[optname] except KeyError: @@ -2296,9 +2296,20 @@ external dependencies (including libraries) must go to "dependencies".''') optname = self.subproject + ':' + optname try: opt = self.coredata.user_options[optname] - if opt.yielding and ':' in optname: - # If option not present in superproject, keep the original. - opt = self.coredata.user_options.get(undecorated_optname, opt) + if opt.yielding and ':' in optname and raw_optname in self.coredata.user_options: + popt = self.coredata.user_options[raw_optname] + if type(opt) is type(popt): + opt = popt + else: + # Get class name, then option type as a string + opt_type = opt.__class__.__name__[4:][:-6].lower() + popt_type = popt.__class__.__name__[4:][:-6].lower() + # This is not a hard error to avoid dependency hell, the workaround + # when this happens is to simply set the subproject's option directly. + mlog.warning('Option {0!r} of type {1!r} in subproject {2!r} cannot yield ' + 'to parent option of type {3!r}, ignoring parent value. ' + 'Use -D{2}:{0}=value to set the value for this option manually' + '.'.format(raw_optname, opt_type, self.subproject, popt_type)) return opt except KeyError: pass diff --git a/mesonbuild/interpreterbase.py b/mesonbuild/interpreterbase.py index fd732bc..1c74eeb 100644 --- a/mesonbuild/interpreterbase.py +++ b/mesonbuild/interpreterbase.py @@ -573,6 +573,8 @@ The result of this is undefined and will become a hard error in a future Meson r return r if cur.operation == 'add': + if isinstance(l, dict) and isinstance(r, dict): + return {**l, **r} try: return l + r except Exception as e: @@ -651,14 +653,18 @@ The result of this is undefined and will become a hard error in a future Meson r if not isinstance(addition, int): raise InvalidArguments('The += operator requires an int on the right hand side if the variable on the left is an int') new_value = old_variable + addition - elif not isinstance(old_variable, list): - raise InvalidArguments('The += operator currently only works with arrays, strings or ints ') - # Add other data types here. - else: + elif isinstance(old_variable, list): if isinstance(addition, list): new_value = old_variable + addition else: new_value = old_variable + [addition] + elif isinstance(old_variable, dict): + if not isinstance(addition, dict): + raise InvalidArguments('The += operator requires a dict on the right hand side if the variable on the left is a dict') + new_value = {**old_variable, **addition} + # Add other data types here. + else: + raise InvalidArguments('The += operator currently only works with arrays, dicts, strings or ints ') self.set_variable(varname, new_value) def evaluate_indexing(self, node): diff --git a/mesonbuild/linkers.py b/mesonbuild/linkers.py index 7e89de5..6e40ab4 100644 --- a/mesonbuild/linkers.py +++ b/mesonbuild/linkers.py @@ -83,9 +83,6 @@ class ArLinker(StaticLinker): self.std_args = ['csrD'] else: self.std_args = ['csr'] - # For 'armar' the options should be prefixed with '-'. - if 'armar' in stdo: - self.std_args = ['-csr'] def can_linker_accept_rsp(self): return mesonlib.is_windows() @@ -129,3 +126,14 @@ class ArLinker(StaticLinker): def get_link_debugfile_args(self, targetfile): return [] + +class ArmarLinker(ArLinker): + + def __init__(self, exelist): + self.exelist = exelist + self.id = 'armar' + self.std_args = ['-csr'] + + def can_linker_accept_rsp(self): + # armar cann't accept arguments using the @rsp syntax + return False diff --git a/mesonbuild/minstall.py b/mesonbuild/minstall.py index 2c007eb..748f06b 100644 --- a/mesonbuild/minstall.py +++ b/mesonbuild/minstall.py @@ -69,9 +69,9 @@ class DirMaker: for d in self.dirs: append_to_log(self.lf, d) -def is_executable(path): +def is_executable(path, follow_symlinks=False): '''Checks whether any of the "x" bits are set in the source file mode.''' - return bool(os.stat(path).st_mode & 0o111) + return bool(os.stat(path, follow_symlinks=follow_symlinks).st_mode & 0o111) def append_to_log(lf, line): lf.write(line) @@ -79,13 +79,38 @@ def append_to_log(lf, line): lf.write('\n') lf.flush() +def set_chown(path, user=None, group=None, dir_fd=None, follow_symlinks=True): + # shutil.chown will call os.chown without passing all the parameters + # and particularly follow_symlinks, thus we replace it temporary + # with a lambda with all the parameters so that follow_symlinks will + # be actually passed properly. + # Not nice, but better than actually rewriting shutil.chown until + # this python bug is fixed: https://bugs.python.org/issue18108 + real_os_chown = os.chown + try: + os.chown = lambda p, u, g: real_os_chown(p, u, g, + dir_fd=dir_fd, + follow_symlinks=follow_symlinks) + shutil.chown(path, user, group) + except: + raise + finally: + os.chown = real_os_chown + +def set_chmod(path, mode, dir_fd=None, follow_symlinks=True): + try: + os.chmod(path, mode, dir_fd=dir_fd, follow_symlinks=follow_symlinks) + except (NotImplementedError, OSError, SystemError) as e: + if not os.path.islink(path): + os.chmod(path, mode, dir_fd=dir_fd) + def sanitize_permissions(path, umask): if umask is None: return - new_perms = 0o777 if is_executable(path) else 0o666 + new_perms = 0o777 if is_executable(path, follow_symlinks=False) else 0o666 new_perms &= ~umask try: - os.chmod(path, new_perms) + set_chmod(path, new_perms, follow_symlinks=False) except PermissionError as e: msg = '{!r}: Unable to set permissions {!r}: {}, ignoring...' print(msg.format(path, new_perms, e.strerror)) @@ -98,7 +123,7 @@ def set_mode(path, mode, default_umask): # No chown() on Windows, and must set one of owner/group if not is_windows() and (mode.owner or mode.group) is not None: try: - shutil.chown(path, mode.owner, mode.group) + set_chown(path, mode.owner, mode.group, follow_symlinks=False) except PermissionError as e: msg = '{!r}: Unable to set owner {!r} and group {!r}: {}, ignoring...' print(msg.format(path, mode.owner, mode.group, e.strerror)) @@ -116,7 +141,7 @@ def set_mode(path, mode, default_umask): # NOTE: On Windows you can set read/write perms; the rest are ignored if mode.perms_s is not None: try: - os.chmod(path, mode.perms) + set_chmod(path, mode.perms, follow_symlinks=False) except PermissionError as e: msg = '{!r}: Unable to set permissions {!r}: {}, ignoring...' print(msg.format(path, mode.perms_s, e.strerror)) @@ -191,12 +216,16 @@ class Installer: def should_preserve_existing_file(self, from_file, to_file): if not self.options.only_changed: return False + # Always replace danging symlinks + if os.path.islink(from_file) and not os.path.isfile(from_file): + return False from_time = os.stat(from_file).st_mtime to_time = os.stat(to_file).st_mtime return from_time <= to_time def do_copyfile(self, from_file, to_file): - if not os.path.isfile(from_file): + outdir = os.path.split(to_file)[0] + if not os.path.isfile(from_file) and not os.path.islink(from_file): raise RuntimeError('Tried to install something that isn\'t a file:' '{!r}'.format(from_file)) # copyfile fails if the target file already exists, so remove it to @@ -210,11 +239,13 @@ class Installer: append_to_log(self.lf, '# Preserving old file %s\n' % to_file) print('Preserving existing file %s.' % to_file) return False - os.unlink(to_file) - outdir = os.path.split(to_file)[0] + os.remove(to_file) print('Installing %s to %s' % (from_file, outdir)) - shutil.copyfile(from_file, to_file) - shutil.copystat(from_file, to_file) + if os.path.islink(from_file): + shutil.copy(from_file, outdir, follow_symlinks=False) + else: + shutil.copyfile(from_file, to_file) + shutil.copystat(from_file, to_file) selinux_updates.append(to_file) append_to_log(self.lf, to_file) return True @@ -277,7 +308,7 @@ class Installer: if os.path.isdir(abs_dst): print('Tried to copy file %s but a directory of that name already exists.' % abs_dst) if os.path.exists(abs_dst): - os.unlink(abs_dst) + os.remove(abs_dst) parent_dir = os.path.dirname(abs_dst) if not os.path.isdir(parent_dir): os.mkdir(parent_dir) @@ -438,7 +469,7 @@ class Installer: try: symlinkfilename = os.path.join(outdir, alias) try: - os.unlink(symlinkfilename) + os.remove(symlinkfilename) except FileNotFoundError: pass os.symlink(to, symlinkfilename) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 34dcbe8..c5897c0 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -314,10 +314,13 @@ class GnomeModule(ExtensionModule): return link_command def _get_dependencies_flags(self, deps, state, depends, include_rpath=False, - use_gir_args=False): + use_gir_args=False, separate_nodedup=False): cflags = OrderedSet() internal_ldflags = OrderedSet() external_ldflags = OrderedSet() + # External linker flags that can't be de-duped reliably because they + # require two args in order, such as -framework AVFoundation + external_ldflags_nodedup = [] gi_includes = OrderedSet() deps = mesonlib.listify(deps, unholder=True) @@ -329,17 +332,19 @@ class GnomeModule(ExtensionModule): lib = lib.held_object internal_ldflags.update(self._get_link_args(state, lib, depends, include_rpath)) libdepflags = self._get_dependencies_flags(lib.get_external_deps(), state, depends, include_rpath, - use_gir_args) + use_gir_args, True) cflags.update(libdepflags[0]) internal_ldflags.update(libdepflags[1]) external_ldflags.update(libdepflags[2]) - gi_includes.update(libdepflags[3]) + external_ldflags_nodedup += libdepflags[3] + gi_includes.update(libdepflags[4]) extdepflags = self._get_dependencies_flags(dep.ext_deps, state, depends, include_rpath, - use_gir_args) + use_gir_args, True) cflags.update(extdepflags[0]) internal_ldflags.update(extdepflags[1]) external_ldflags.update(extdepflags[2]) - gi_includes.update(extdepflags[3]) + external_ldflags_nodedup += extdepflags[3] + gi_includes.update(extdepflags[4]) for source in dep.sources: if hasattr(source, 'held_object'): source = source.held_object @@ -349,7 +354,8 @@ class GnomeModule(ExtensionModule): # This should be any dependency other than an internal one. elif isinstance(dep, Dependency): cflags.update(dep.get_compile_args()) - for lib in dep.get_link_args(raw=True): + ldflags = iter(dep.get_link_args(raw=True)) + for lib in ldflags: if (os.path.isabs(lib) and # For PkgConfigDependency only: getattr(dep, 'is_libtool', False)): @@ -362,10 +368,15 @@ class GnomeModule(ExtensionModule): libname = libname[3:] libname = libname.split(".so")[0] lib = "-l%s" % libname - # Hack to avoid passing some compiler options in + # FIXME: Hack to avoid passing some compiler options in if lib.startswith("-W"): continue - external_ldflags.update([lib]) + # If it's a framework arg, slurp the framework name too + # to preserve the order of arguments + if lib == '-framework': + external_ldflags_nodedup += [lib, next(ldflags)] + else: + external_ldflags.update([lib]) if isinstance(dep, PkgConfigDependency): girdir = dep.get_pkgconfig_variable("girdir", {'default': ''}) @@ -383,13 +394,16 @@ class GnomeModule(ExtensionModule): fixed_ldflags = OrderedSet() for ldflag in ldflags: if ldflag.startswith("-l"): - fixed_ldflags.add(ldflag.replace('-l', '--extra-library=', 1)) - else: - fixed_ldflags.add(ldflag) + ldflag = ldflag.replace('-l', '--extra-library=', 1) + fixed_ldflags.add(ldflag) return fixed_ldflags internal_ldflags = fix_ldflags(internal_ldflags) external_ldflags = fix_ldflags(external_ldflags) - return cflags, internal_ldflags, external_ldflags, gi_includes + if not separate_nodedup: + external_ldflags.update(external_ldflags_nodedup) + return cflags, internal_ldflags, external_ldflags, gi_includes + else: + return cflags, internal_ldflags, external_ldflags, external_ldflags_nodedup, gi_includes def _unwrap_gir_target(self, girtarget): while hasattr(girtarget, 'held_object'): @@ -679,6 +693,20 @@ class GnomeModule(ExtensionModule): ret += state.environment.coredata.get_external_args(lang) return ret + @staticmethod + def _get_scanner_cflags(cflags): + 'g-ir-scanner only accepts -I/-D/-U; must ignore all other flags' + for f in cflags: + if f.startswith(('-D', '-U', '-I')): + yield f + + @staticmethod + def _get_scanner_ldflags(ldflags): + 'g-ir-scanner only accepts -L/-l; must ignore -F and other linker flags' + for f in ldflags: + if f.startswith(('-L', '-l', '--extra-library')): + yield f + @FeatureNewKwargs('build target', '0.40.0', ['build_by_default']) @permittedKwargs({'sources', 'nsversion', 'namespace', 'symbol_prefix', 'identifier_prefix', 'export_packages', 'includes', 'dependencies', 'link_with', 'include_directories', @@ -718,9 +746,10 @@ class GnomeModule(ExtensionModule): # are not used here. dep_cflags, dep_internal_ldflags, dep_external_ldflags, gi_includes = \ self._get_dependencies_flags(deps, state, depends, use_gir_args=True) - cflags += list(dep_cflags) - internal_ldflags += list(dep_internal_ldflags) - external_ldflags += list(dep_external_ldflags) + cflags += list(self._get_scanner_cflags(dep_cflags)) + cflags += list(self._get_scanner_cflags(self._get_external_args_for_langs(state, [lc[0] for lc in langs_compilers]))) + internal_ldflags += list(self._get_scanner_ldflags(dep_internal_ldflags)) + external_ldflags += list(self._get_scanner_ldflags(dep_external_ldflags)) girtargets_inc_dirs = self._get_gir_targets_inc_dirs(girtargets) inc_dirs = self._scan_inc_dirs(kwargs) @@ -742,7 +771,6 @@ class GnomeModule(ExtensionModule): scan_command += self._scan_export_packages(kwargs) scan_command += ['--cflags-begin'] scan_command += cflags - scan_command += self._get_external_args_for_langs(state, [lc[0] for lc in langs_compilers]) scan_command += ['--cflags-end'] scan_command += get_include_args(inc_dirs) scan_command += get_include_args(list(gi_includes) + gir_inc_dirs + inc_dirs, prefix='--add-include-path=') @@ -988,7 +1016,6 @@ This will become a hard error in the future.''') if ldflags: args += ['--ldflags=%s' % ' '.join(ldflags)] - return args @noKwargs diff --git a/mesonbuild/wrap/wraptool.py b/mesonbuild/wrap/wraptool.py index b88f129..570e691 100644 --- a/mesonbuild/wrap/wraptool.py +++ b/mesonbuild/wrap/wraptool.py @@ -168,23 +168,26 @@ def do_promotion(from_path, spdir_name): def promote(options): argument = options.project_path - path_segment, subproject_name = os.path.split(argument) spdir_name = 'subprojects' sprojs = mesonlib.detect_subprojects(spdir_name) - if subproject_name not in sprojs: - sys.exit('Subproject %s not found in directory tree.' % subproject_name) - matches = sprojs[subproject_name] - if len(matches) == 1: - do_promotion(matches[0], spdir_name) - return - if path_segment == '': - print('There are many versions of %s in tree. Please specify which one to promote:\n' % subproject_name) + + # check if the argument is a full path to a subproject directory or wrap file + system_native_path_argument = argument.replace('/', os.sep) + for _, matches in sprojs.items(): + if system_native_path_argument in matches: + do_promotion(system_native_path_argument, spdir_name) + return + + # otherwise the argument is just a subproject basename which must be unambiguous + if argument not in sprojs: + sys.exit('Subproject %s not found in directory tree.' % argument) + matches = sprojs[argument] + if len(matches) > 1: + print('There is more than one version of %s in tree. Please specify which one to promote:\n' % argument) for s in matches: print(s) sys.exit(1) - system_native_path_argument = argument.replace('/', os.sep) - if system_native_path_argument in matches: - do_promotion(argument, spdir_name) + do_promotion(matches[0], spdir_name) def status(options): print('Subproject status') diff --git a/run_meson_command_tests.py b/run_meson_command_tests.py index 4a05b94..fd33856 100755 --- a/run_meson_command_tests.py +++ b/run_meson_command_tests.py @@ -176,7 +176,7 @@ class CommandTests(unittest.TestCase): builddir = str(self.tmpdir / 'build4') (bindir / 'meson').rename(bindir / 'meson.real') wrapper = (bindir / 'meson') - with open(wrapper, 'w') as f: + with open(str(wrapper), 'w') as f: f.write('#!/bin/sh\n\nmeson.real "$@"') wrapper.chmod(0o755) meson_setup = [str(wrapper), 'setup'] diff --git a/run_project_tests.py b/run_project_tests.py index 1385a78..a373aa0 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -303,7 +303,7 @@ def pass_libdir_to_test(dirname): return False if '38 libdir must be inside prefix' in dirname: return False - if '199 install_mode' in dirname: + if '196 install_mode' in dirname: return False return True @@ -636,10 +636,34 @@ def check_file(fname): linenum += 1 def check_format(): + check_suffixes = {'.c', + '.cpp', + '.cxx', + '.cc', + '.rs', + '.f90', + '.vala', + '.d', + '.s', + '.m', + '.mm', + '.asm', + '.java', + '.txt', + '.py', + '.swift', + '.build', + '.md', + } for (root, _, files) in os.walk('.'): - for file in files: - if file.endswith('.py') or file.endswith('.build') or file == 'meson_options.txt': - fullname = os.path.join(root, file) + if '.dub' in root: # external deps are here + continue + for fname in files: + if os.path.splitext(fname)[1].lower() in check_suffixes: + bn = os.path.basename(fname) + if bn == 'sitemap.txt' or bn == 'meson-test-run.txt': + continue + fullname = os.path.join(root, fname) check_file(fullname) def check_meson_commands_work(): diff --git a/run_unittests.py b/run_unittests.py index 63547ee..2e29af7 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -658,6 +658,9 @@ class InternalTests(unittest.TestCase): # Test ends PkgConfigDependency._call_pkgbin = old_call PkgConfigDependency.check_pkgconfig = old_check + # Reset dependency class to ensure that in-process configure doesn't mess up + PkgConfigDependency.pkgbin_cache = {} + PkgConfigDependency.class_pkgbin = None @unittest.skipIf(is_tarball(), 'Skipping because this is a tarball release') @@ -1030,7 +1033,7 @@ class AllPlatformTests(BasePlatformTests): Can't be an ordinary test because we pass --prefix to meson there. https://github.com/mesonbuild/meson/issues/1349 ''' - testdir = os.path.join(self.common_test_dir, '94 default options') + testdir = os.path.join(self.common_test_dir, '91 default options') self.init(testdir, default_args=False) opts = self.introspect('--buildoptions') for opt in opts: @@ -1045,7 +1048,7 @@ class AllPlatformTests(BasePlatformTests): https://github.com/mesonbuild/meson/issues/1341 https://github.com/mesonbuild/meson/issues/1345 ''' - testdir = os.path.join(self.common_test_dir, '94 default options') + testdir = os.path.join(self.common_test_dir, '91 default options') prefix = '/someabs' libdir = 'libdir' extra_args = ['--prefix=' + prefix, @@ -1127,7 +1130,7 @@ class AllPlatformTests(BasePlatformTests): dependent defaults for other options, and that those defaults can be overridden in default_options or by the command line. ''' - testdir = os.path.join(self.common_test_dir, '172 default options prefix dependent defaults') + testdir = os.path.join(self.common_test_dir, '169 default options prefix dependent defaults') expected = { '': {'prefix': '/usr', @@ -1222,7 +1225,7 @@ class AllPlatformTests(BasePlatformTests): Test that run_targets are run from the correct directory https://github.com/mesonbuild/meson/issues/957 ''' - testdir = os.path.join(self.common_test_dir, '58 run target') + testdir = os.path.join(self.common_test_dir, '55 run target') self.init(testdir) self.run_target('check_exists') @@ -1368,7 +1371,7 @@ class AllPlatformTests(BasePlatformTests): self.assertFailedTestCount(1, self.mtest_command + ['--no-suite', 'subprjfail:fail', '--no-suite', 'subprjmix:fail']) def test_build_by_default(self): - testdir = os.path.join(self.common_test_dir, '137 build by default') + testdir = os.path.join(self.common_test_dir, '134 build by default') self.init(testdir) self.build() genfile1 = os.path.join(self.builddir, 'generated1.dat') @@ -1385,7 +1388,7 @@ class AllPlatformTests(BasePlatformTests): self.assertPathExists(exe2) def test_internal_include_order(self): - testdir = os.path.join(self.common_test_dir, '138 include order') + testdir = os.path.join(self.common_test_dir, '135 include order') self.init(testdir) execmd = fxecmd = None for cmd in self.get_compdb(): @@ -1556,7 +1559,7 @@ class AllPlatformTests(BasePlatformTests): self.assertEqual(cc.is_64, wcc.is_64) def test_always_prefer_c_compiler_for_asm(self): - testdir = os.path.join(self.common_test_dir, '141 c cpp and asm') + testdir = os.path.join(self.common_test_dir, '138 c cpp and asm') # Skip if building with MSVC env = Environment(testdir, self.builddir, get_fake_options(self.prefix)) if env.detect_c_compiler(False).get_id() == 'msvc': @@ -1625,7 +1628,7 @@ class AllPlatformTests(BasePlatformTests): ''' Test that preprocessor compiler checks read CPPFLAGS but not CFLAGS ''' - testdir = os.path.join(self.common_test_dir, '140 get define') + testdir = os.path.join(self.common_test_dir, '137 get define') define = 'MESON_TEST_DEFINE_VALUE' # NOTE: this list can't have \n, ' or " # \n is never substituted by the GNU pre-processor via a -D define @@ -1638,7 +1641,7 @@ class AllPlatformTests(BasePlatformTests): self.init(testdir, ['-D{}={}'.format(define, value)]) def test_custom_target_exe_data_deterministic(self): - testdir = os.path.join(self.common_test_dir, '117 custom target capture') + testdir = os.path.join(self.common_test_dir, '114 custom target capture') self.init(testdir) meson_exe_dat1 = glob(os.path.join(self.privatedir, 'meson_exe*.dat')) self.wipe() @@ -1652,7 +1655,7 @@ class AllPlatformTests(BasePlatformTests): changes to unused files (as determined by the dependency file) in the input files list. ''' - testdir = os.path.join(self.common_test_dir, '22 header in file list') + testdir = os.path.join(self.common_test_dir, '20 header in file list') self.init(testdir) self.build() # Immediately rebuilding should not do anything @@ -1667,7 +1670,7 @@ class AllPlatformTests(BasePlatformTests): ExternalProgram, and any File objects on the command-line cause a rebuild. ''' - testdir = os.path.join(self.common_test_dir, '64 custom header generator') + testdir = os.path.join(self.common_test_dir, '61 custom header generator') self.init(testdir) self.build() # Immediately rebuilding should not do anything @@ -1766,7 +1769,7 @@ int main(int argc, char **argv) { ''' if is_windows() or is_cygwin(): raise unittest.SkipTest('Windows PE/COFF binaries do not use RPATH') - testdir = os.path.join(self.common_test_dir, '46 library chain') + testdir = os.path.join(self.common_test_dir, '43 library chain') self.init(testdir) self.build() for each in ('prog', 'subdir/liblib1.so', ): @@ -1802,10 +1805,10 @@ int main(int argc, char **argv) { def test_all_forbidden_targets_tested(self): ''' - Test that all forbidden targets are tested in the '158 reserved targets' + Test that all forbidden targets are tested in the '155 reserved targets' test. Needs to be a unit test because it accesses Meson internals. ''' - testdir = os.path.join(self.common_test_dir, '158 reserved targets') + testdir = os.path.join(self.common_test_dir, '155 reserved targets') targets = mesonbuild.coredata.forbidden_target_names # We don't actually define a target with this name targets.pop('build.ninja') @@ -1975,7 +1978,7 @@ int main(int argc, char **argv) { @skipIfNoPkgconfig def test_pkgconfig_gen_escaping(self): - testdir = os.path.join(self.common_test_dir, '51 pkgconfig-gen') + testdir = os.path.join(self.common_test_dir, '48 pkgconfig-gen') prefix = '/usr/with spaces' libdir = 'lib' self.init(testdir, extra_args=['--prefix=' + prefix, @@ -2072,7 +2075,7 @@ int main(int argc, char **argv) { self.assertTrue(found, "Array option not found in introspect data.") def test_free_stringarray_setting(self): - testdir = os.path.join(self.common_test_dir, '47 options') + testdir = os.path.join(self.common_test_dir, '44 options') self.init(testdir) self.opt_has('free_array_opt', []) self.setconf('-Dfree_array_opt=foo,bar', will_build=False) @@ -2094,6 +2097,9 @@ int main(int argc, char **argv) { self.assertNotEqual(subprocess.call(self.wrap_command + ['promote', 'scommon'], cwd=workdir, stdout=subprocess.DEVNULL), 0) + self.assertNotEqual(subprocess.call(self.wrap_command + ['promote', 'invalid/path/to/scommon'], + cwd=workdir, + stderr=subprocess.DEVNULL), 0) self.assertFalse(os.path.isdir(scommondir)) subprocess.check_call(self.wrap_command + ['promote', 'subprojects/s2/subprojects/scommon'], cwd=workdir) self.assertTrue(os.path.isdir(scommondir)) @@ -2104,6 +2110,20 @@ int main(int argc, char **argv) { self.init(workdir) self.build() + def test_subproject_promotion_wrap(self): + testdir = os.path.join(self.unit_test_dir, '43 promote wrap') + workdir = os.path.join(self.builddir, 'work') + shutil.copytree(testdir, workdir) + spdir = os.path.join(workdir, 'subprojects') + + ambiguous_wrap = os.path.join(spdir, 'ambiguous.wrap') + self.assertNotEqual(subprocess.call(self.wrap_command + ['promote', 'ambiguous'], + cwd=workdir, + stdout=subprocess.DEVNULL), 0) + self.assertFalse(os.path.isfile(ambiguous_wrap)) + subprocess.check_call(self.wrap_command + ['promote', 'subprojects/s2/subprojects/ambiguous.wrap'], cwd=workdir) + self.assertTrue(os.path.isfile(ambiguous_wrap)) + def test_warning_location(self): tdir = os.path.join(self.unit_test_dir, '22 warning location') out = self.init(tdir) @@ -2211,7 +2231,7 @@ int main(int argc, char **argv) { Test that identical targets in different subprojects do not collide if layout is flat. ''' - testdir = os.path.join(self.common_test_dir, '181 identical target name in subproject flat layout') + testdir = os.path.join(self.common_test_dir, '178 identical target name in subproject flat layout') self.init(testdir, extra_args=['--layout=flat']) self.build() @@ -2220,7 +2240,7 @@ int main(int argc, char **argv) { Test that identical targets in different subdirs do not collide if layout is flat. ''' - testdir = os.path.join(self.common_test_dir, '190 same target name flat layout') + testdir = os.path.join(self.common_test_dir, '187 same target name flat layout') self.init(testdir, extra_args=['--layout=flat']) self.build() @@ -2312,14 +2332,14 @@ recommended as it is not supported on some platforms''') self.assertRebuiltTarget('app') def test_conflicting_d_dash_option(self): - testdir = os.path.join(self.unit_test_dir, '35 mixed command line args') + testdir = os.path.join(self.unit_test_dir, '36 mixed command line args') with self.assertRaises(subprocess.CalledProcessError) as e: self.init(testdir, extra_args=['-Dbindir=foo', '--bindir=bar']) # Just to ensure that we caught the correct error self.assertIn('passed as both', e.stderr) def _test_same_option_twice(self, arg, args): - testdir = os.path.join(self.unit_test_dir, '35 mixed command line args') + testdir = os.path.join(self.unit_test_dir, '36 mixed command line args') self.init(testdir, extra_args=args) opts = self.introspect('--buildoptions') for item in opts: @@ -2338,7 +2358,7 @@ recommended as it is not supported on some platforms''') self._test_same_option_twice('one', ['-Done=foo', '-Done=bar']) def _test_same_option_twice_configure(self, arg, args): - testdir = os.path.join(self.unit_test_dir, '35 mixed command line args') + testdir = os.path.join(self.unit_test_dir, '36 mixed command line args') self.init(testdir) self.setconf(args) opts = self.introspect('--buildoptions') @@ -2482,7 +2502,7 @@ recommended as it is not supported on some platforms''') pass def test_feature_check_usage_subprojects(self): - testdir = os.path.join(self.unit_test_dir, '39 featurenew subprojects') + testdir = os.path.join(self.unit_test_dir, '40 featurenew subprojects') out = self.init(testdir) # Parent project warns correctly self.assertRegex(out, "WARNING: Project targetting '>=0.45'.*'0.47.0': dict") @@ -2497,7 +2517,7 @@ recommended as it is not supported on some platforms''') self.assertRegex(out, " * 0.47.0: {'dict'}") def test_configure_file_warnings(self): - testdir = os.path.join(self.common_test_dir, "16 configure file") + testdir = os.path.join(self.common_test_dir, "14 configure file") out = self.init(testdir) self.assertRegex(out, "WARNING:.*'empty'.*config.h.in.*not present.*") self.assertRegex(out, "WARNING:.*'FOO_BAR'.*nosubst-nocopy2.txt.in.*not present.*") @@ -2535,6 +2555,41 @@ recommended as it is not supported on some platforms''') stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) + def get_opts_as_dict(self): + result = {} + for i in self.introspect('--buildoptions'): + result[i['name']] = i['value'] + return result + + def test_buildtype_setting(self): + testdir = os.path.join(self.common_test_dir, '1 trivial') + self.init(testdir) + opts = self.get_opts_as_dict() + self.assertEqual(opts['buildtype'], 'debug') + self.assertEqual(opts['debug'], True) + self.setconf('-Ddebug=false') + opts = self.get_opts_as_dict() + self.assertEqual(opts['debug'], False) + self.assertEqual(opts['buildtype'], 'plain') + self.assertEqual(opts['optimization'], '0') + + # Setting optimizations to 3 should cause buildtype + # to go to release mode. + self.setconf('-Doptimization=3') + opts = self.get_opts_as_dict() + self.assertEqual(opts['buildtype'], 'release') + self.assertEqual(opts['debug'], False) + self.assertEqual(opts['optimization'], '3') + + # Going to debug build type should reset debugging + # and optimization + self.setconf('-Dbuildtype=debug') + opts = self.get_opts_as_dict() + self.assertEqual(opts['buildtype'], 'debug') + self.assertEqual(opts['debug'], True) + self.assertEqual(opts['optimization'], '0') + + class FailureTests(BasePlatformTests): ''' Tests that test failure conditions. Build files here should be dynamically @@ -2544,6 +2599,7 @@ class FailureTests(BasePlatformTests): and slows down testing. ''' dnf = "[Dd]ependency.*not found" + nopkg = '[Pp]kg-config not found' def setUp(self): super().setUp() @@ -2625,7 +2681,11 @@ class FailureTests(BasePlatformTests): if shutil.which('sdl2-config'): raise unittest.SkipTest('sdl2-config found') self.assertMesonRaises("dependency('sdl2', method : 'sdlconfig')", self.dnf) - self.assertMesonRaises("dependency('sdl2', method : 'pkg-config')", self.dnf) + if shutil.which('pkg-config'): + errmsg = self.dnf + else: + errmsg = self.nopkg + self.assertMesonRaises("dependency('sdl2', method : 'pkg-config')", errmsg) def test_gnustep_notfound_dependency(self): # Want to test failure, so skip if available @@ -2890,7 +2950,7 @@ class LinuxlikeTests(BasePlatformTests): case because we need to run `readelf` and actually check the soname. https://github.com/mesonbuild/meson/issues/785 ''' - testdir = os.path.join(self.common_test_dir, '27 library versions') + testdir = os.path.join(self.common_test_dir, '25 library versions') self.init(testdir) self.build() lib1 = os.path.join(self.builddir, 'prefixsomelib.suffix') @@ -2923,7 +2983,7 @@ class LinuxlikeTests(BasePlatformTests): need to run pkg-config outside of a Meson build file. https://github.com/mesonbuild/meson/issues/889 ''' - testdir = os.path.join(self.common_test_dir, '51 pkgconfig-gen') + testdir = os.path.join(self.common_test_dir, '48 pkgconfig-gen') self.init(testdir) env = Environment(testdir, self.builddir, get_fake_options(self.prefix)) kwargs = {'required': True, 'silent': True} @@ -2939,13 +2999,13 @@ class LinuxlikeTests(BasePlatformTests): ''' Test that generated pkg-config files correctly handle dependencies ''' - testdir = os.path.join(self.common_test_dir, '51 pkgconfig-gen') + testdir = os.path.join(self.common_test_dir, '48 pkgconfig-gen') self.init(testdir) privatedir1 = self.privatedir self.new_builddir() os.environ['PKG_CONFIG_LIBDIR'] = privatedir1 - testdir = os.path.join(self.common_test_dir, '51 pkgconfig-gen', 'dependencies') + testdir = os.path.join(self.common_test_dir, '48 pkgconfig-gen', 'dependencies') self.init(testdir) privatedir2 = self.privatedir @@ -3122,14 +3182,14 @@ class LinuxlikeTests(BasePlatformTests): ''' Oflag = '-O3' os.environ['CFLAGS'] = os.environ['CXXFLAGS'] = Oflag - testdir = os.path.join(self.common_test_dir, '43 has function') + testdir = os.path.join(self.common_test_dir, '40 has function') self.init(testdir) cmds = self.get_meson_log_compiler_checks() for cmd in cmds: if cmd[0] == 'ccache': cmd = cmd[1:] # Verify that -I flags from the `args` kwarg are first - # This is set in the '43 has function' test case + # This is set in the '40 has function' test case self.assertEqual(cmd[1], '-I/tmp') # Verify that -O3 set via the environment is overridden by -O0 Oargs = [arg for arg in cmd if arg.startswith('-O')] @@ -3196,7 +3256,7 @@ class LinuxlikeTests(BasePlatformTests): self._test_stds_impl(testdir, cpp, 'cpp') def test_unity_subproj(self): - testdir = os.path.join(self.common_test_dir, '49 subproject') + testdir = os.path.join(self.common_test_dir, '46 subproject') self.init(testdir, extra_args='--unity=subprojects') self.assertPathExists(os.path.join(self.builddir, 'subprojects/sublib/subprojects@sublib@@simpletest@exe/simpletest-unity.c')) self.assertPathExists(os.path.join(self.builddir, 'subprojects/sublib/subprojects@sublib@@sublib@sha/sublib-unity.c')) @@ -3243,7 +3303,7 @@ class LinuxlikeTests(BasePlatformTests): self.wipe() # Test directory modes - testdir = os.path.join(self.common_test_dir, '66 install subdir') + testdir = os.path.join(self.common_test_dir, '63 install subdir') self.init(testdir) self.install() @@ -3260,7 +3320,7 @@ class LinuxlikeTests(BasePlatformTests): ''' Test that files are installed with correct permissions using install_mode. ''' - testdir = os.path.join(self.common_test_dir, '199 install_mode') + testdir = os.path.join(self.common_test_dir, '196 install_mode') self.init(testdir) self.build() self.install() @@ -3411,6 +3471,7 @@ class LinuxlikeTests(BasePlatformTests): for v in installed.values(): self.assertTrue('prog' in v or 'foo' in v) + @skipIfNoPkgconfig def test_order_of_l_arguments(self): testdir = os.path.join(self.unit_test_dir, '8 -L -l order') os.environ['PKG_CONFIG_PATH'] = testdir @@ -3635,7 +3696,7 @@ endian = 'little' @skipIfNoPkgconfig def test_pkgconfig_formatting(self): - testdir = os.path.join(self.unit_test_dir, '36 pkgconfig format') + testdir = os.path.join(self.unit_test_dir, '37 pkgconfig format') self.init(testdir) myenv = os.environ.copy() myenv['PKG_CONFIG_PATH'] = self.privatedir @@ -3687,7 +3748,7 @@ endian = 'little' ''' if not is_osx(): raise unittest.SkipTest('Apple bitcode not relevant') - testdir = os.path.join(self.common_test_dir, '156 shared module resolving symbol in executable') + testdir = os.path.join(self.common_test_dir, '153 shared module resolving symbol in executable') # Ensure that it builds even with bitcode enabled self.init(testdir, extra_args='-Db_bitcode=true') self.build() @@ -3697,7 +3758,7 @@ endian = 'little' ''' Test that the dependencies are always listed in a deterministic order. ''' - testdir = os.path.join(self.unit_test_dir, '41 dep order') + testdir = os.path.join(self.unit_test_dir, '42 dep order') self.init(testdir) with open(os.path.join(self.builddir, 'build.ninja')) as bfile: for line in bfile: @@ -3712,7 +3773,7 @@ endian = 'little' ''' if is_cygwin(): raise unittest.SkipTest('rpath are not used on Cygwin') - testdir = os.path.join(self.unit_test_dir, '40 rpath order') + testdir = os.path.join(self.unit_test_dir, '41 rpath order') self.init(testdir) if is_osx(): rpathre = re.compile('-rpath,.*/subprojects/sub1.*-rpath,.*/subprojects/sub2') @@ -3739,7 +3800,7 @@ endian = 'little' raise unittest.SkipTest('workflow currently only works on macOS') oldprefix = self.prefix # Install external library so we can find it - testdir = os.path.join(self.unit_test_dir, '38 external, internal library rpath', 'external library') + testdir = os.path.join(self.unit_test_dir, '39 external, internal library rpath', 'external library') # install into installdir without using DESTDIR installdir = self.installdir self.prefix = installdir @@ -3751,7 +3812,7 @@ endian = 'little' self.new_builddir() os.environ['LIBRARY_PATH'] = os.path.join(installdir, self.libdir) os.environ['PKG_CONFIG_PATH'] = os.path.join(installdir, self.libdir, 'pkgconfig') - testdir = os.path.join(self.unit_test_dir, '38 external, internal library rpath', 'built library') + testdir = os.path.join(self.unit_test_dir, '39 external, internal library rpath', 'built library') # install into installdir without using DESTDIR self.prefix = self.installdir self.init(testdir) @@ -3779,6 +3840,42 @@ endian = 'little' # Ensure that the otool output does not contain self.installdir self.assertNotRegex(out, self.installdir + '.*dylib ') + def install_subdir_invalid_symlinks(self, testdir, subdir_path): + ''' + Test that installation of broken symlinks works fine. + https://github.com/mesonbuild/meson/issues/3914 + ''' + testdir = os.path.join(self.common_test_dir, testdir) + subdir = os.path.join(testdir, subdir_path) + curdir = os.getcwd() + os.chdir(subdir) + # Can't distribute broken symlinks in the source tree because it breaks + # the creation of zipapps. Create it dynamically and run the test by + # hand. + src = '../../nonexistent.txt' + os.symlink(src, 'invalid-symlink.txt') + try: + self.init(testdir) + self.build() + self.install() + install_path = subdir_path.split(os.path.sep)[-1] + link = os.path.join(self.installdir, 'usr', 'share', install_path, 'invalid-symlink.txt') + self.assertTrue(os.path.islink(link), msg=link) + self.assertEqual(src, os.readlink(link)) + self.assertFalse(os.path.isfile(link), msg=link) + finally: + os.remove(os.path.join(subdir, 'invalid-symlink.txt')) + os.chdir(curdir) + + def test_install_subdir_symlinks(self): + self.install_subdir_invalid_symlinks('63 install subdir', os.path.join('sub', 'sub1')) + + def test_install_subdir_symlinks_with_default_umask(self): + self.install_subdir_invalid_symlinks('196 install_mode', 'sub2') + + def test_install_subdir_symlinks_with_default_umask_and_mode(self): + self.install_subdir_invalid_symlinks('196 install_mode', 'sub1') + class LinuxCrossArmTests(BasePlatformTests): ''' @@ -3864,7 +3961,7 @@ class PythonTests(BasePlatformTests): if self.backend is not Backend.ninja: raise unittest.SkipTest('Skipping python tests with {} backend'.format(self.backend.name)) - testdir = os.path.join(self.src_root, 'test cases', 'unit', '37 python extmodule') + testdir = os.path.join(self.src_root, 'test cases', 'unit', '38 python extmodule') # No python version specified, this will use meson's python self.init(testdir) diff --git a/test cases/common/103 manygen/depuser.c b/test cases/common/100 manygen/depuser.c index 1a825e0..1a825e0 100644 --- a/test cases/common/103 manygen/depuser.c +++ b/test cases/common/100 manygen/depuser.c diff --git a/test cases/common/103 manygen/meson.build b/test cases/common/100 manygen/meson.build index e70a55a..e70a55a 100644 --- a/test cases/common/103 manygen/meson.build +++ b/test cases/common/100 manygen/meson.build diff --git a/test cases/common/103 manygen/subdir/funcinfo.def b/test cases/common/100 manygen/subdir/funcinfo.def index b074186..b074186 100644 --- a/test cases/common/103 manygen/subdir/funcinfo.def +++ b/test cases/common/100 manygen/subdir/funcinfo.def diff --git a/test cases/common/103 manygen/subdir/manygen.py b/test cases/common/100 manygen/subdir/manygen.py index 7ffd435..7ffd435 100755 --- a/test cases/common/103 manygen/subdir/manygen.py +++ b/test cases/common/100 manygen/subdir/manygen.py diff --git a/test cases/common/103 manygen/subdir/meson.build b/test cases/common/100 manygen/subdir/meson.build index 73b4ff7..73b4ff7 100644 --- a/test cases/common/103 manygen/subdir/meson.build +++ b/test cases/common/100 manygen/subdir/meson.build diff --git a/test cases/common/104 stringdef/meson.build b/test cases/common/101 stringdef/meson.build index 3f9170e..3f9170e 100644 --- a/test cases/common/104 stringdef/meson.build +++ b/test cases/common/101 stringdef/meson.build diff --git a/test cases/common/104 stringdef/stringdef.c b/test cases/common/101 stringdef/stringdef.c index 69ea656..69ea656 100644 --- a/test cases/common/104 stringdef/stringdef.c +++ b/test cases/common/101 stringdef/stringdef.c diff --git a/test cases/common/105 find program path/meson.build b/test cases/common/102 find program path/meson.build index 0a81249..0a81249 100644 --- a/test cases/common/105 find program path/meson.build +++ b/test cases/common/102 find program path/meson.build diff --git a/test cases/common/105 find program path/program.py b/test cases/common/102 find program path/program.py index 2ebc564..2ebc564 100755 --- a/test cases/common/105 find program path/program.py +++ b/test cases/common/102 find program path/program.py diff --git a/test cases/common/106 subproject subdir/meson.build b/test cases/common/103 subproject subdir/meson.build index ec9fad1..ec9fad1 100644 --- a/test cases/common/106 subproject subdir/meson.build +++ b/test cases/common/103 subproject subdir/meson.build diff --git a/test cases/common/106 subproject subdir/prog.c b/test cases/common/103 subproject subdir/prog.c index 02ae337..cf6f425 100644 --- a/test cases/common/106 subproject subdir/prog.c +++ b/test cases/common/103 subproject subdir/prog.c @@ -1,5 +1,5 @@ #include <sub.h> int main() { - return sub(); + return sub(); } diff --git a/test cases/common/106 subproject subdir/subprojects/sub/lib/meson.build b/test cases/common/103 subproject subdir/subprojects/sub/lib/meson.build index 731d22b..731d22b 100644 --- a/test cases/common/106 subproject subdir/subprojects/sub/lib/meson.build +++ b/test cases/common/103 subproject subdir/subprojects/sub/lib/meson.build diff --git a/test cases/common/106 subproject subdir/subprojects/sub/lib/sub.c b/test cases/common/103 subproject subdir/subprojects/sub/lib/sub.c index 3291e3c..068a5b8 100644 --- a/test cases/common/106 subproject subdir/subprojects/sub/lib/sub.c +++ b/test cases/common/103 subproject subdir/subprojects/sub/lib/sub.c @@ -1,5 +1,5 @@ #include "sub.h" int sub() { - return 0; + return 0; } diff --git a/test cases/common/106 subproject subdir/subprojects/sub/lib/sub.h b/test cases/common/103 subproject subdir/subprojects/sub/lib/sub.h index f1ab0e1..f1ab0e1 100644 --- a/test cases/common/106 subproject subdir/subprojects/sub/lib/sub.h +++ b/test cases/common/103 subproject subdir/subprojects/sub/lib/sub.h diff --git a/test cases/common/106 subproject subdir/subprojects/sub/meson.build b/test cases/common/103 subproject subdir/subprojects/sub/meson.build index bf69c25..bf69c25 100644 --- a/test cases/common/106 subproject subdir/subprojects/sub/meson.build +++ b/test cases/common/103 subproject subdir/subprojects/sub/meson.build diff --git a/test cases/common/107 postconf/meson.build b/test cases/common/104 postconf/meson.build index 12b3c5b..12b3c5b 100644 --- a/test cases/common/107 postconf/meson.build +++ b/test cases/common/104 postconf/meson.build diff --git a/test cases/common/107 postconf/postconf.py b/test cases/common/104 postconf/postconf.py index 950c706..950c706 100644 --- a/test cases/common/107 postconf/postconf.py +++ b/test cases/common/104 postconf/postconf.py diff --git a/test cases/common/107 postconf/prog.c b/test cases/common/104 postconf/prog.c index 1e5d4cb..1e5d4cb 100644 --- a/test cases/common/107 postconf/prog.c +++ b/test cases/common/104 postconf/prog.c diff --git a/test cases/common/107 postconf/raw.dat b/test cases/common/104 postconf/raw.dat index ec63514..ec63514 100644 --- a/test cases/common/107 postconf/raw.dat +++ b/test cases/common/104 postconf/raw.dat diff --git a/test cases/common/108 postconf with args/meson.build b/test cases/common/105 postconf with args/meson.build index 8510c5b..8510c5b 100644 --- a/test cases/common/108 postconf with args/meson.build +++ b/test cases/common/105 postconf with args/meson.build diff --git a/test cases/common/108 postconf with args/postconf.py b/test cases/common/105 postconf with args/postconf.py index cef7f79..cef7f79 100644 --- a/test cases/common/108 postconf with args/postconf.py +++ b/test cases/common/105 postconf with args/postconf.py diff --git a/test cases/common/108 postconf with args/prog.c b/test cases/common/105 postconf with args/prog.c index 0e63a8c..0e63a8c 100644 --- a/test cases/common/108 postconf with args/prog.c +++ b/test cases/common/105 postconf with args/prog.c diff --git a/test cases/common/108 postconf with args/raw.dat b/test cases/common/105 postconf with args/raw.dat index ec63514..ec63514 100644 --- a/test cases/common/108 postconf with args/raw.dat +++ b/test cases/common/105 postconf with args/raw.dat diff --git a/test cases/common/109 testframework options/meson.build b/test cases/common/106 testframework options/meson.build index 2773730..2773730 100644 --- a/test cases/common/109 testframework options/meson.build +++ b/test cases/common/106 testframework options/meson.build diff --git a/test cases/common/109 testframework options/meson_options.txt b/test cases/common/106 testframework options/meson_options.txt index 653dd75..653dd75 100644 --- a/test cases/common/109 testframework options/meson_options.txt +++ b/test cases/common/106 testframework options/meson_options.txt diff --git a/test cases/common/109 testframework options/test_args.txt b/test cases/common/106 testframework options/test_args.txt index a667e3a..a667e3a 100644 --- a/test cases/common/109 testframework options/test_args.txt +++ b/test cases/common/106 testframework options/test_args.txt diff --git a/test cases/common/110 extract same name/lib.c b/test cases/common/107 extract same name/lib.c index 6bdeda7..6bdeda7 100644 --- a/test cases/common/110 extract same name/lib.c +++ b/test cases/common/107 extract same name/lib.c diff --git a/test cases/common/110 extract same name/main.c b/test cases/common/107 extract same name/main.c index dc57dd5..dc57dd5 100644 --- a/test cases/common/110 extract same name/main.c +++ b/test cases/common/107 extract same name/main.c diff --git a/test cases/common/110 extract same name/meson.build b/test cases/common/107 extract same name/meson.build index 0bfbb4d..0bfbb4d 100644 --- a/test cases/common/110 extract same name/meson.build +++ b/test cases/common/107 extract same name/meson.build diff --git a/test cases/common/110 extract same name/src/lib.c b/test cases/common/107 extract same name/src/lib.c index 68e6ab9..68e6ab9 100644 --- a/test cases/common/110 extract same name/src/lib.c +++ b/test cases/common/107 extract same name/src/lib.c diff --git a/test cases/common/111 has header symbol/meson.build b/test cases/common/108 has header symbol/meson.build index 54cedce..54cedce 100644 --- a/test cases/common/111 has header symbol/meson.build +++ b/test cases/common/108 has header symbol/meson.build diff --git a/test cases/common/112 has arg/meson.build b/test cases/common/109 has arg/meson.build index ba07311..ba07311 100644 --- a/test cases/common/112 has arg/meson.build +++ b/test cases/common/109 has arg/meson.build diff --git a/test cases/common/113 generatorcustom/catter.py b/test cases/common/110 generatorcustom/catter.py index 198fa98..198fa98 100755 --- a/test cases/common/113 generatorcustom/catter.py +++ b/test cases/common/110 generatorcustom/catter.py diff --git a/test cases/common/113 generatorcustom/gen.py b/test cases/common/110 generatorcustom/gen.py index c1e34ed..c1e34ed 100755 --- a/test cases/common/113 generatorcustom/gen.py +++ b/test cases/common/110 generatorcustom/gen.py diff --git a/test cases/common/113 generatorcustom/main.c b/test cases/common/110 generatorcustom/main.c index 04abcf6..04abcf6 100644 --- a/test cases/common/113 generatorcustom/main.c +++ b/test cases/common/110 generatorcustom/main.c diff --git a/test cases/common/113 generatorcustom/meson.build b/test cases/common/110 generatorcustom/meson.build index 17d27e5..17d27e5 100644 --- a/test cases/common/113 generatorcustom/meson.build +++ b/test cases/common/110 generatorcustom/meson.build diff --git a/test cases/common/113 generatorcustom/res1.txt b/test cases/common/110 generatorcustom/res1.txt index 6487c56..6487c56 100644 --- a/test cases/common/113 generatorcustom/res1.txt +++ b/test cases/common/110 generatorcustom/res1.txt diff --git a/test cases/common/113 generatorcustom/res2.txt b/test cases/common/110 generatorcustom/res2.txt index 0a8879d..0a8879d 100644 --- a/test cases/common/113 generatorcustom/res2.txt +++ b/test cases/common/110 generatorcustom/res2.txt diff --git a/test cases/common/114 multiple dir configure file/meson.build b/test cases/common/111 multiple dir configure file/meson.build index a4615fa..a4615fa 100644 --- a/test cases/common/114 multiple dir configure file/meson.build +++ b/test cases/common/111 multiple dir configure file/meson.build diff --git a/test cases/common/114 multiple dir configure file/subdir/foo.txt b/test cases/common/111 multiple dir configure file/subdir/foo.txt index e69de29..e69de29 100644 --- a/test cases/common/114 multiple dir configure file/subdir/foo.txt +++ b/test cases/common/111 multiple dir configure file/subdir/foo.txt diff --git a/test cases/common/114 multiple dir configure file/subdir/meson.build b/test cases/common/111 multiple dir configure file/subdir/meson.build index 503df96..503df96 100644 --- a/test cases/common/114 multiple dir configure file/subdir/meson.build +++ b/test cases/common/111 multiple dir configure file/subdir/meson.build diff --git a/test cases/common/114 multiple dir configure file/subdir/someinput.in b/test cases/common/111 multiple dir configure file/subdir/someinput.in index e69de29..e69de29 100644 --- a/test cases/common/114 multiple dir configure file/subdir/someinput.in +++ b/test cases/common/111 multiple dir configure file/subdir/someinput.in diff --git a/test cases/common/115 spaces backslash/asm output/meson.build b/test cases/common/112 spaces backslash/asm output/meson.build index b5f13f5..b5f13f5 100644 --- a/test cases/common/115 spaces backslash/asm output/meson.build +++ b/test cases/common/112 spaces backslash/asm output/meson.build diff --git a/test cases/common/115 spaces backslash/comparer-end-notstring.c b/test cases/common/112 spaces backslash/comparer-end-notstring.c index 65bf8bc..65bf8bc 100644 --- a/test cases/common/115 spaces backslash/comparer-end-notstring.c +++ b/test cases/common/112 spaces backslash/comparer-end-notstring.c diff --git a/test cases/common/115 spaces backslash/comparer-end.c b/test cases/common/112 spaces backslash/comparer-end.c index fef25a5..fef25a5 100644 --- a/test cases/common/115 spaces backslash/comparer-end.c +++ b/test cases/common/112 spaces backslash/comparer-end.c diff --git a/test cases/common/115 spaces backslash/comparer.c b/test cases/common/112 spaces backslash/comparer.c index 937cb47..937cb47 100644 --- a/test cases/common/115 spaces backslash/comparer.c +++ b/test cases/common/112 spaces backslash/comparer.c diff --git a/test cases/common/115 spaces backslash/include/comparer.h b/test cases/common/112 spaces backslash/include/comparer.h index 624d96c..624d96c 100644 --- a/test cases/common/115 spaces backslash/include/comparer.h +++ b/test cases/common/112 spaces backslash/include/comparer.h diff --git a/test cases/common/115 spaces backslash/meson.build b/test cases/common/112 spaces backslash/meson.build index bf614e8..bf614e8 100644 --- a/test cases/common/115 spaces backslash/meson.build +++ b/test cases/common/112 spaces backslash/meson.build diff --git a/test cases/common/116 ternary/meson.build b/test cases/common/113 ternary/meson.build index 3e65046..3e65046 100644 --- a/test cases/common/116 ternary/meson.build +++ b/test cases/common/113 ternary/meson.build diff --git a/test cases/common/117 custom target capture/data_source.txt b/test cases/common/114 custom target capture/data_source.txt index 0c23cc0..0c23cc0 100644 --- a/test cases/common/117 custom target capture/data_source.txt +++ b/test cases/common/114 custom target capture/data_source.txt diff --git a/test cases/common/117 custom target capture/installed_files.txt b/test cases/common/114 custom target capture/installed_files.txt index d90a6b0..d90a6b0 100644 --- a/test cases/common/117 custom target capture/installed_files.txt +++ b/test cases/common/114 custom target capture/installed_files.txt diff --git a/test cases/common/117 custom target capture/meson.build b/test cases/common/114 custom target capture/meson.build index 58a69ca..58a69ca 100644 --- a/test cases/common/117 custom target capture/meson.build +++ b/test cases/common/114 custom target capture/meson.build diff --git a/test cases/common/117 custom target capture/my_compiler.py b/test cases/common/114 custom target capture/my_compiler.py index b60722a..b60722a 100755 --- a/test cases/common/117 custom target capture/my_compiler.py +++ b/test cases/common/114 custom target capture/my_compiler.py diff --git a/test cases/common/118 allgenerate/converter.py b/test cases/common/115 allgenerate/converter.py index f8e2ca0..f8e2ca0 100755 --- a/test cases/common/118 allgenerate/converter.py +++ b/test cases/common/115 allgenerate/converter.py diff --git a/test cases/common/118 allgenerate/foobar.cpp.in b/test cases/common/115 allgenerate/foobar.cpp.in index c64f3b5..c64f3b5 100644 --- a/test cases/common/118 allgenerate/foobar.cpp.in +++ b/test cases/common/115 allgenerate/foobar.cpp.in diff --git a/test cases/common/118 allgenerate/meson.build b/test cases/common/115 allgenerate/meson.build index 049e849..049e849 100644 --- a/test cases/common/118 allgenerate/meson.build +++ b/test cases/common/115 allgenerate/meson.build diff --git a/test cases/common/119 pathjoin/meson.build b/test cases/common/116 pathjoin/meson.build index 751ca68..751ca68 100644 --- a/test cases/common/119 pathjoin/meson.build +++ b/test cases/common/116 pathjoin/meson.build diff --git a/test cases/common/120 subdir subproject/meson.build b/test cases/common/117 subdir subproject/meson.build index 54ecfe0..54ecfe0 100644 --- a/test cases/common/120 subdir subproject/meson.build +++ b/test cases/common/117 subdir subproject/meson.build diff --git a/test cases/common/120 subdir subproject/prog/meson.build b/test cases/common/117 subdir subproject/prog/meson.build index 360b5f5..360b5f5 100644 --- a/test cases/common/120 subdir subproject/prog/meson.build +++ b/test cases/common/117 subdir subproject/prog/meson.build diff --git a/test cases/common/120 subdir subproject/prog/prog.c b/test cases/common/117 subdir subproject/prog/prog.c index 02ae337..cf6f425 100644 --- a/test cases/common/120 subdir subproject/prog/prog.c +++ b/test cases/common/117 subdir subproject/prog/prog.c @@ -1,5 +1,5 @@ #include <sub.h> int main() { - return sub(); + return sub(); } diff --git a/test cases/common/120 subdir subproject/subprojects/sub/meson.build b/test cases/common/117 subdir subproject/subprojects/sub/meson.build index 94e9eec..94e9eec 100644 --- a/test cases/common/120 subdir subproject/subprojects/sub/meson.build +++ b/test cases/common/117 subdir subproject/subprojects/sub/meson.build diff --git a/test cases/common/120 subdir subproject/subprojects/sub/sub.c b/test cases/common/117 subdir subproject/subprojects/sub/sub.c index 3291e3c..068a5b8 100644 --- a/test cases/common/120 subdir subproject/subprojects/sub/sub.c +++ b/test cases/common/117 subdir subproject/subprojects/sub/sub.c @@ -1,5 +1,5 @@ #include "sub.h" int sub() { - return 0; + return 0; } diff --git a/test cases/common/120 subdir subproject/subprojects/sub/sub.h b/test cases/common/117 subdir subproject/subprojects/sub/sub.h index f1ab0e1..f1ab0e1 100644 --- a/test cases/common/120 subdir subproject/subprojects/sub/sub.h +++ b/test cases/common/117 subdir subproject/subprojects/sub/sub.h diff --git a/test cases/common/121 interpreter copy mutable var on assignment/meson.build b/test cases/common/118 interpreter copy mutable var on assignment/meson.build index 8b15357..8b15357 100644 --- a/test cases/common/121 interpreter copy mutable var on assignment/meson.build +++ b/test cases/common/118 interpreter copy mutable var on assignment/meson.build diff --git a/test cases/common/122 skip/meson.build b/test cases/common/119 skip/meson.build index 1adedb6..1adedb6 100644 --- a/test cases/common/122 skip/meson.build +++ b/test cases/common/119 skip/meson.build diff --git a/test cases/common/123 subproject project arguments/exe.c b/test cases/common/120 subproject project arguments/exe.c index d6440f0..d6440f0 100644 --- a/test cases/common/123 subproject project arguments/exe.c +++ b/test cases/common/120 subproject project arguments/exe.c diff --git a/test cases/common/123 subproject project arguments/exe.cpp b/test cases/common/120 subproject project arguments/exe.cpp index 8471c6f..8471c6f 100644 --- a/test cases/common/123 subproject project arguments/exe.cpp +++ b/test cases/common/120 subproject project arguments/exe.cpp diff --git a/test cases/common/123 subproject project arguments/meson.build b/test cases/common/120 subproject project arguments/meson.build index 90d4c05..90d4c05 100644 --- a/test cases/common/123 subproject project arguments/meson.build +++ b/test cases/common/120 subproject project arguments/meson.build diff --git a/test cases/common/123 subproject project arguments/subprojects/subexe/meson.build b/test cases/common/120 subproject project arguments/subprojects/subexe/meson.build index ef141dc..ef141dc 100644 --- a/test cases/common/123 subproject project arguments/subprojects/subexe/meson.build +++ b/test cases/common/120 subproject project arguments/subprojects/subexe/meson.build diff --git a/test cases/common/123 subproject project arguments/subprojects/subexe/subexe.c b/test cases/common/120 subproject project arguments/subprojects/subexe/subexe.c index f748afc..f748afc 100644 --- a/test cases/common/123 subproject project arguments/subprojects/subexe/subexe.c +++ b/test cases/common/120 subproject project arguments/subprojects/subexe/subexe.c diff --git a/test cases/common/124 test skip/meson.build b/test cases/common/121 test skip/meson.build index 568527f..568527f 100644 --- a/test cases/common/124 test skip/meson.build +++ b/test cases/common/121 test skip/meson.build diff --git a/test cases/common/121 test skip/test_skip.c b/test cases/common/121 test skip/test_skip.c new file mode 100644 index 0000000..db26681 --- /dev/null +++ b/test cases/common/121 test skip/test_skip.c @@ -0,0 +1,3 @@ +int main(int argc, char *argv[]) { + return 77; +} diff --git a/test cases/common/125 shared module/installed_files.txt b/test cases/common/122 shared module/installed_files.txt index a351490..a351490 100644 --- a/test cases/common/125 shared module/installed_files.txt +++ b/test cases/common/122 shared module/installed_files.txt diff --git a/test cases/common/125 shared module/meson.build b/test cases/common/122 shared module/meson.build index 9f9ad63..9f9ad63 100644 --- a/test cases/common/125 shared module/meson.build +++ b/test cases/common/122 shared module/meson.build diff --git a/test cases/common/125 shared module/module.c b/test cases/common/122 shared module/module.c index 181b760..181b760 100644 --- a/test cases/common/125 shared module/module.c +++ b/test cases/common/122 shared module/module.c diff --git a/test cases/common/125 shared module/nosyms.c b/test cases/common/122 shared module/nosyms.c index 3432b1c..3432b1c 100644 --- a/test cases/common/125 shared module/nosyms.c +++ b/test cases/common/122 shared module/nosyms.c diff --git a/test cases/common/125 shared module/prog.c b/test cases/common/122 shared module/prog.c index 2b63840..2b63840 100644 --- a/test cases/common/125 shared module/prog.c +++ b/test cases/common/122 shared module/prog.c diff --git a/test cases/common/125 shared module/runtime.c b/test cases/common/122 shared module/runtime.c index 03bde86..03bde86 100644 --- a/test cases/common/125 shared module/runtime.c +++ b/test cases/common/122 shared module/runtime.c diff --git a/test cases/common/126 llvm ir and assembly/main.c b/test cases/common/123 llvm ir and assembly/main.c index 97fe723..97fe723 100644 --- a/test cases/common/126 llvm ir and assembly/main.c +++ b/test cases/common/123 llvm ir and assembly/main.c diff --git a/test cases/common/126 llvm ir and assembly/main.cpp b/test cases/common/123 llvm ir and assembly/main.cpp index f2c7de3..f2c7de3 100644 --- a/test cases/common/126 llvm ir and assembly/main.cpp +++ b/test cases/common/123 llvm ir and assembly/main.cpp diff --git a/test cases/common/126 llvm ir and assembly/meson.build b/test cases/common/123 llvm ir and assembly/meson.build index acff93f..51321fb 100644 --- a/test cases/common/126 llvm ir and assembly/meson.build +++ b/test cases/common/123 llvm ir and assembly/meson.build @@ -47,7 +47,7 @@ foreach lang : ['c', 'cpp'] square_impl = custom_target(lang + square_impl, input : square_preproc, output : lang + square_base + '.obj', - command : [ml, '/Fo', '@OUTPUT@', '/c', '@INPUT@']) + command : [ml, '/safeseh', '/Fo', '@OUTPUT@', '/c', '@INPUT@']) endif if supported_cpus.contains(cpu) e = executable('square_asm_' + lang, square_impl, 'main.' + lang, diff --git a/test cases/common/126 llvm ir and assembly/square-arm.S b/test cases/common/123 llvm ir and assembly/square-arm.S index e66fa47..4dd4467 100644 --- a/test cases/common/126 llvm ir and assembly/square-arm.S +++ b/test cases/common/123 llvm ir and assembly/square-arm.S @@ -7,6 +7,6 @@ #endif SYMBOL_NAME(square_unsigned): - mul r1, r0, r0 - mov r0, r1 - mov pc, lr + mul r1, r0, r0 + mov r0, r1 + mov pc, lr diff --git a/test cases/common/126 llvm ir and assembly/square-x86.S b/test cases/common/123 llvm ir and assembly/square-x86.S index 7d1202a..18284c1 100644 --- a/test cases/common/126 llvm ir and assembly/square-x86.S +++ b/test cases/common/123 llvm ir and assembly/square-x86.S @@ -11,9 +11,10 @@ PUBLIC square_unsigned _TEXT SEGMENT square_unsigned PROC var1:DWORD - mov eax, var1 - imul eax, eax - ret + mov eax, var1 + imul eax, eax + ret + square_unsigned ENDP _TEXT ENDS @@ -28,8 +29,8 @@ END #endif SYMBOL_NAME(square_unsigned): - movl 4(%esp), %eax - imull %eax, %eax - retl + movl 4(%esp), %eax + imull %eax, %eax + retl #endif diff --git a/test cases/common/126 llvm ir and assembly/square-x86_64.S b/test cases/common/123 llvm ir and assembly/square-x86_64.S index 09cc7a4..5678d00 100644 --- a/test cases/common/126 llvm ir and assembly/square-x86_64.S +++ b/test cases/common/123 llvm ir and assembly/square-x86_64.S @@ -7,8 +7,8 @@ _TEXT SEGMENT SYMBOL_NAME(square_unsigned) PROC mov eax, ecx - imul eax, eax - ret + imul eax, eax + ret SYMBOL_NAME(square_unsigned) ENDP _TEXT ENDS @@ -24,14 +24,14 @@ END # if defined(_WIN32) || defined(__CYGWIN__) /* msabi */ SYMBOL_NAME(square_unsigned): - imull %ecx, %ecx - movl %ecx, %eax - retq + imull %ecx, %ecx + movl %ecx, %eax + retq # else /* sysvabi */ SYMBOL_NAME(square_unsigned): - imull %edi, %edi - movl %edi, %eax - retq + imull %edi, %edi + movl %edi, %eax + retq # endif #endif diff --git a/test cases/common/126 llvm ir and assembly/square.ll b/test cases/common/123 llvm ir and assembly/square.ll index 7c321aa..7c321aa 100644 --- a/test cases/common/126 llvm ir and assembly/square.ll +++ b/test cases/common/123 llvm ir and assembly/square.ll diff --git a/test cases/common/126 llvm ir and assembly/symbol-underscore.h b/test cases/common/123 llvm ir and assembly/symbol-underscore.h index d0f3ef9..d0f3ef9 100644 --- a/test cases/common/126 llvm ir and assembly/symbol-underscore.h +++ b/test cases/common/123 llvm ir and assembly/symbol-underscore.h diff --git a/test cases/common/127 cpp and asm/meson.build b/test cases/common/124 cpp and asm/meson.build index 9160775..9160775 100644 --- a/test cases/common/127 cpp and asm/meson.build +++ b/test cases/common/124 cpp and asm/meson.build diff --git a/test cases/common/127 cpp and asm/retval-arm.S b/test cases/common/124 cpp and asm/retval-arm.S index a892362..a892362 100644 --- a/test cases/common/127 cpp and asm/retval-arm.S +++ b/test cases/common/124 cpp and asm/retval-arm.S diff --git a/test cases/common/127 cpp and asm/retval-x86.S b/test cases/common/124 cpp and asm/retval-x86.S index f9e8190..f9e8190 100644 --- a/test cases/common/127 cpp and asm/retval-x86.S +++ b/test cases/common/124 cpp and asm/retval-x86.S diff --git a/test cases/common/127 cpp and asm/retval-x86_64.S b/test cases/common/124 cpp and asm/retval-x86_64.S index 1a5f3eb..1a5f3eb 100644 --- a/test cases/common/127 cpp and asm/retval-x86_64.S +++ b/test cases/common/124 cpp and asm/retval-x86_64.S diff --git a/test cases/common/127 cpp and asm/symbol-underscore.h b/test cases/common/124 cpp and asm/symbol-underscore.h index d0f3ef9..d0f3ef9 100644 --- a/test cases/common/127 cpp and asm/symbol-underscore.h +++ b/test cases/common/124 cpp and asm/symbol-underscore.h diff --git a/test cases/common/127 cpp and asm/trivial.cc b/test cases/common/124 cpp and asm/trivial.cc index d2928c0..d2928c0 100644 --- a/test cases/common/127 cpp and asm/trivial.cc +++ b/test cases/common/124 cpp and asm/trivial.cc diff --git a/test cases/common/124 test skip/test_skip.c b/test cases/common/124 test skip/test_skip.c deleted file mode 100644 index d050a61..0000000 --- a/test cases/common/124 test skip/test_skip.c +++ /dev/null @@ -1,4 +0,0 @@ -int main(int argc, char *argv[]) -{ - return 77; -} diff --git a/test cases/common/128 extract all shared library/extractor.h b/test cases/common/125 extract all shared library/extractor.h index d0917a1..d0917a1 100644 --- a/test cases/common/128 extract all shared library/extractor.h +++ b/test cases/common/125 extract all shared library/extractor.h diff --git a/test cases/common/128 extract all shared library/four.c b/test cases/common/125 extract all shared library/four.c index 5ca6696..5ca6696 100644 --- a/test cases/common/128 extract all shared library/four.c +++ b/test cases/common/125 extract all shared library/four.c diff --git a/test cases/common/128 extract all shared library/func1234.def b/test cases/common/125 extract all shared library/func1234.def index d62c08d..d62c08d 100644 --- a/test cases/common/128 extract all shared library/func1234.def +++ b/test cases/common/125 extract all shared library/func1234.def diff --git a/test cases/common/128 extract all shared library/meson.build b/test cases/common/125 extract all shared library/meson.build index 7c24fde..7c24fde 100644 --- a/test cases/common/128 extract all shared library/meson.build +++ b/test cases/common/125 extract all shared library/meson.build diff --git a/test cases/common/128 extract all shared library/one.c b/test cases/common/125 extract all shared library/one.c index cfb0157..cfb0157 100644 --- a/test cases/common/128 extract all shared library/one.c +++ b/test cases/common/125 extract all shared library/one.c diff --git a/test cases/common/128 extract all shared library/prog.c b/test cases/common/125 extract all shared library/prog.c index 57a4c64..57a4c64 100644 --- a/test cases/common/128 extract all shared library/prog.c +++ b/test cases/common/125 extract all shared library/prog.c diff --git a/test cases/common/128 extract all shared library/three.c b/test cases/common/125 extract all shared library/three.c index c410046..c410046 100644 --- a/test cases/common/128 extract all shared library/three.c +++ b/test cases/common/125 extract all shared library/three.c diff --git a/test cases/common/128 extract all shared library/two.c b/test cases/common/125 extract all shared library/two.c index 3ece512..3ece512 100644 --- a/test cases/common/128 extract all shared library/two.c +++ b/test cases/common/125 extract all shared library/two.c diff --git a/test cases/common/129 object only target/installed_files.txt b/test cases/common/126 object only target/installed_files.txt index c7dab9f..c7dab9f 100644 --- a/test cases/common/129 object only target/installed_files.txt +++ b/test cases/common/126 object only target/installed_files.txt diff --git a/test cases/common/129 object only target/meson.build b/test cases/common/126 object only target/meson.build index d83a658..d83a658 100644 --- a/test cases/common/129 object only target/meson.build +++ b/test cases/common/126 object only target/meson.build diff --git a/test cases/common/129 object only target/obj_generator.py b/test cases/common/126 object only target/obj_generator.py index a33872a..a33872a 100755 --- a/test cases/common/129 object only target/obj_generator.py +++ b/test cases/common/126 object only target/obj_generator.py diff --git a/test cases/common/129 object only target/prog.c b/test cases/common/126 object only target/prog.c index 60459d6..60459d6 100644 --- a/test cases/common/129 object only target/prog.c +++ b/test cases/common/126 object only target/prog.c diff --git a/test cases/common/129 object only target/source.c b/test cases/common/126 object only target/source.c index 7779b33..7779b33 100644 --- a/test cases/common/129 object only target/source.c +++ b/test cases/common/126 object only target/source.c diff --git a/test cases/common/129 object only target/source2.c b/test cases/common/126 object only target/source2.c index 29aad40..29aad40 100644 --- a/test cases/common/129 object only target/source2.c +++ b/test cases/common/126 object only target/source2.c diff --git a/test cases/common/129 object only target/source2.def b/test cases/common/126 object only target/source2.def index a993ab8..a993ab8 100644 --- a/test cases/common/129 object only target/source2.def +++ b/test cases/common/126 object only target/source2.def diff --git a/test cases/common/129 object only target/source3.c b/test cases/common/126 object only target/source3.c index 1580f1e..1580f1e 100644 --- a/test cases/common/129 object only target/source3.c +++ b/test cases/common/126 object only target/source3.c diff --git a/test cases/common/130 no buildincdir/include/header.h b/test cases/common/127 no buildincdir/include/header.h index add1850..add1850 100644 --- a/test cases/common/130 no buildincdir/include/header.h +++ b/test cases/common/127 no buildincdir/include/header.h diff --git a/test cases/common/130 no buildincdir/meson.build b/test cases/common/127 no buildincdir/meson.build index ac69e8e..ac69e8e 100644 --- a/test cases/common/130 no buildincdir/meson.build +++ b/test cases/common/127 no buildincdir/meson.build diff --git a/test cases/common/130 no buildincdir/prog.c b/test cases/common/127 no buildincdir/prog.c index 800f0d6..800f0d6 100644 --- a/test cases/common/130 no buildincdir/prog.c +++ b/test cases/common/127 no buildincdir/prog.c diff --git a/test cases/common/131 custom target directory install/docgen.py b/test cases/common/128 custom target directory install/docgen.py index 245f370..245f370 100644 --- a/test cases/common/131 custom target directory install/docgen.py +++ b/test cases/common/128 custom target directory install/docgen.py diff --git a/test cases/common/131 custom target directory install/installed_files.txt b/test cases/common/128 custom target directory install/installed_files.txt index bcf20e0..bcf20e0 100644 --- a/test cases/common/131 custom target directory install/installed_files.txt +++ b/test cases/common/128 custom target directory install/installed_files.txt diff --git a/test cases/common/131 custom target directory install/meson.build b/test cases/common/128 custom target directory install/meson.build index ada9ae1..ada9ae1 100644 --- a/test cases/common/131 custom target directory install/meson.build +++ b/test cases/common/128 custom target directory install/meson.build diff --git a/test cases/common/132 dependency file generation/main .c b/test cases/common/129 dependency file generation/main .c index 0fb4389..0fb4389 100644 --- a/test cases/common/132 dependency file generation/main .c +++ b/test cases/common/129 dependency file generation/main .c diff --git a/test cases/common/132 dependency file generation/meson.build b/test cases/common/129 dependency file generation/meson.build index b5ee47b..b5ee47b 100644 --- a/test cases/common/132 dependency file generation/meson.build +++ b/test cases/common/129 dependency file generation/meson.build diff --git a/test cases/common/13 pch/c/meson.build b/test cases/common/13 pch/c/meson.build new file mode 100644 index 0000000..cb8349d --- /dev/null +++ b/test cases/common/13 pch/c/meson.build @@ -0,0 +1,8 @@ +cc = meson.get_compiler('c') +cc_id = cc.get_id() +if cc_id == 'lcc' + error('MESON_SKIP_TEST: Elbrus compiler does not support PCH.') +endif + +exe = executable('prog', 'prog.c', +c_pch : ['pch/prog_pch.c', 'pch/prog.h']) diff --git a/test cases/common/13 pch/pch/prog.h b/test cases/common/13 pch/c/pch/prog.h index 354499a..354499a 100644 --- a/test cases/common/13 pch/pch/prog.h +++ b/test cases/common/13 pch/c/pch/prog.h diff --git a/test cases/common/13 pch/pch/prog_pch.c b/test cases/common/13 pch/c/pch/prog_pch.c index 4960505..4960505 100644 --- a/test cases/common/13 pch/pch/prog_pch.c +++ b/test cases/common/13 pch/c/pch/prog_pch.c diff --git a/test cases/common/13 pch/prog.c b/test cases/common/13 pch/c/prog.c index 0ce3d0a..0ce3d0a 100644 --- a/test cases/common/13 pch/prog.c +++ b/test cases/common/13 pch/c/prog.c diff --git a/test cases/common/14 cpp pch/meson.build b/test cases/common/13 pch/cpp/meson.build index 6922fd7..802c3e1 100644 --- a/test cases/common/14 cpp pch/meson.build +++ b/test cases/common/13 pch/cpp/meson.build @@ -1,2 +1 @@ -project('c++ pch test', 'cpp') exe = executable('prog', 'prog.cc', cpp_pch : ['pch/prog.hh', 'pch/prog_pch.cc']) diff --git a/test cases/common/14 cpp pch/pch/prog.hh b/test cases/common/13 pch/cpp/pch/prog.hh index 751cc4a..751cc4a 100644 --- a/test cases/common/14 cpp pch/pch/prog.hh +++ b/test cases/common/13 pch/cpp/pch/prog.hh diff --git a/test cases/common/14 cpp pch/pch/prog_pch.cc b/test cases/common/13 pch/cpp/pch/prog_pch.cc index aff1225..aff1225 100644 --- a/test cases/common/14 cpp pch/pch/prog_pch.cc +++ b/test cases/common/13 pch/cpp/pch/prog_pch.cc diff --git a/test cases/common/14 cpp pch/prog.cc b/test cases/common/13 pch/cpp/prog.cc index 629d880..629d880 100644 --- a/test cases/common/14 cpp pch/prog.cc +++ b/test cases/common/13 pch/cpp/prog.cc diff --git a/test cases/common/13 pch/meson.build b/test cases/common/13 pch/meson.build index e144aa5..05b4037 100644 --- a/test cases/common/13 pch/meson.build +++ b/test cases/common/13 pch/meson.build @@ -1,10 +1,5 @@ -project('pch test', 'c') +project('pch test', 'c', 'cpp') -cc = meson.get_compiler('c') -cc_id = cc.get_id() -if cc_id == 'lcc' - error('MESON_SKIP_TEST: Elbrus compiler does not support PCH.') -endif - -exe = executable('prog', 'prog.c', -c_pch : ['pch/prog_pch.c', 'pch/prog.h']) +subdir('c') +subdir('cpp') +subdir('mixed') diff --git a/test cases/common/15 mixed pch/func.c b/test cases/common/13 pch/mixed/func.c index c02722e..c02722e 100644 --- a/test cases/common/15 mixed pch/func.c +++ b/test cases/common/13 pch/mixed/func.c diff --git a/test cases/common/15 mixed pch/main.cc b/test cases/common/13 pch/mixed/main.cc index 44d049e..44d049e 100644 --- a/test cases/common/15 mixed pch/main.cc +++ b/test cases/common/13 pch/mixed/main.cc diff --git a/test cases/common/15 mixed pch/meson.build b/test cases/common/13 pch/mixed/meson.build index 8e9da93..7f6033d 100644 --- a/test cases/common/15 mixed pch/meson.build +++ b/test cases/common/13 pch/mixed/meson.build @@ -1,6 +1,3 @@ -project('mixed C and C++ pch test', 'cpp', 'c') - - exe = executable( 'prog', files('main.cc', 'func.c'), diff --git a/test cases/common/15 mixed pch/pch/func.h b/test cases/common/13 pch/mixed/pch/func.h index 354499a..354499a 100644 --- a/test cases/common/15 mixed pch/pch/func.h +++ b/test cases/common/13 pch/mixed/pch/func.h diff --git a/test cases/common/15 mixed pch/pch/func_pch.c b/test cases/common/13 pch/mixed/pch/func_pch.c index 5566739..5566739 100644 --- a/test cases/common/15 mixed pch/pch/func_pch.c +++ b/test cases/common/13 pch/mixed/pch/func_pch.c diff --git a/test cases/common/15 mixed pch/pch/main.h b/test cases/common/13 pch/mixed/pch/main.h index 751cc4a..751cc4a 100644 --- a/test cases/common/15 mixed pch/pch/main.h +++ b/test cases/common/13 pch/mixed/pch/main.h diff --git a/test cases/common/15 mixed pch/pch/main_pch.cc b/test cases/common/13 pch/mixed/pch/main_pch.cc index acd3f57..acd3f57 100644 --- a/test cases/common/15 mixed pch/pch/main_pch.cc +++ b/test cases/common/13 pch/mixed/pch/main_pch.cc diff --git a/test cases/common/133 configure file in generator/inc/confdata.in b/test cases/common/130 configure file in generator/inc/confdata.in index e44cdea..e44cdea 100644 --- a/test cases/common/133 configure file in generator/inc/confdata.in +++ b/test cases/common/130 configure file in generator/inc/confdata.in diff --git a/test cases/common/133 configure file in generator/inc/meson.build b/test cases/common/130 configure file in generator/inc/meson.build index 05d2dcb..05d2dcb 100644 --- a/test cases/common/133 configure file in generator/inc/meson.build +++ b/test cases/common/130 configure file in generator/inc/meson.build diff --git a/test cases/common/133 configure file in generator/meson.build b/test cases/common/130 configure file in generator/meson.build index e1c26b6..e1c26b6 100644 --- a/test cases/common/133 configure file in generator/meson.build +++ b/test cases/common/130 configure file in generator/meson.build diff --git a/test cases/common/133 configure file in generator/src/gen.py b/test cases/common/130 configure file in generator/src/gen.py index 99b7cdd..99b7cdd 100755 --- a/test cases/common/133 configure file in generator/src/gen.py +++ b/test cases/common/130 configure file in generator/src/gen.py diff --git a/test cases/common/133 configure file in generator/src/main.c b/test cases/common/130 configure file in generator/src/main.c index 54f4f57..54f4f57 100644 --- a/test cases/common/133 configure file in generator/src/main.c +++ b/test cases/common/130 configure file in generator/src/main.c diff --git a/test cases/common/133 configure file in generator/src/meson.build b/test cases/common/130 configure file in generator/src/meson.build index 2fb804e..2fb804e 100644 --- a/test cases/common/133 configure file in generator/src/meson.build +++ b/test cases/common/130 configure file in generator/src/meson.build diff --git a/test cases/common/133 configure file in generator/src/source b/test cases/common/130 configure file in generator/src/source index 4099407..4099407 100644 --- a/test cases/common/133 configure file in generator/src/source +++ b/test cases/common/130 configure file in generator/src/source diff --git a/test cases/common/134 generated llvm ir/copyfile.py b/test cases/common/131 generated llvm ir/copyfile.py index ff42ac3..ff42ac3 100644 --- a/test cases/common/134 generated llvm ir/copyfile.py +++ b/test cases/common/131 generated llvm ir/copyfile.py diff --git a/test cases/common/134 generated llvm ir/main.c b/test cases/common/131 generated llvm ir/main.c index 97fe723..97fe723 100644 --- a/test cases/common/134 generated llvm ir/main.c +++ b/test cases/common/131 generated llvm ir/main.c diff --git a/test cases/common/134 generated llvm ir/meson.build b/test cases/common/131 generated llvm ir/meson.build index 111cdc0..111cdc0 100644 --- a/test cases/common/134 generated llvm ir/meson.build +++ b/test cases/common/131 generated llvm ir/meson.build diff --git a/test cases/common/134 generated llvm ir/square.ll.in b/test cases/common/131 generated llvm ir/square.ll.in index 7c321aa..7c321aa 100644 --- a/test cases/common/134 generated llvm ir/square.ll.in +++ b/test cases/common/131 generated llvm ir/square.ll.in diff --git a/test cases/common/135 generated assembly/copyfile.py b/test cases/common/132 generated assembly/copyfile.py index ff42ac3..ff42ac3 100644 --- a/test cases/common/135 generated assembly/copyfile.py +++ b/test cases/common/132 generated assembly/copyfile.py diff --git a/test cases/common/135 generated assembly/main.c b/test cases/common/132 generated assembly/main.c index b669cba..b669cba 100644 --- a/test cases/common/135 generated assembly/main.c +++ b/test cases/common/132 generated assembly/main.c diff --git a/test cases/common/135 generated assembly/meson.build b/test cases/common/132 generated assembly/meson.build index 6a8744b..6a8744b 100644 --- a/test cases/common/135 generated assembly/meson.build +++ b/test cases/common/132 generated assembly/meson.build diff --git a/test cases/common/135 generated assembly/square-arm.S.in b/test cases/common/132 generated assembly/square-arm.S.in index d2fb7ac..d2fb7ac 100644 --- a/test cases/common/135 generated assembly/square-arm.S.in +++ b/test cases/common/132 generated assembly/square-arm.S.in diff --git a/test cases/common/135 generated assembly/square-x86.S.in b/test cases/common/132 generated assembly/square-x86.S.in index ee77b81..ee77b81 100644 --- a/test cases/common/135 generated assembly/square-x86.S.in +++ b/test cases/common/132 generated assembly/square-x86.S.in diff --git a/test cases/common/135 generated assembly/square-x86_64.S.in b/test cases/common/132 generated assembly/square-x86_64.S.in index 856af13..856af13 100644 --- a/test cases/common/135 generated assembly/square-x86_64.S.in +++ b/test cases/common/132 generated assembly/square-x86_64.S.in diff --git a/test cases/common/135 generated assembly/symbol-underscore.h b/test cases/common/132 generated assembly/symbol-underscore.h index d0f3ef9..d0f3ef9 100644 --- a/test cases/common/135 generated assembly/symbol-underscore.h +++ b/test cases/common/132 generated assembly/symbol-underscore.h diff --git a/test cases/common/136 build by default targets in tests/main.c b/test cases/common/133 build by default targets in tests/main.c index 63a62a1..63a62a1 100644 --- a/test cases/common/136 build by default targets in tests/main.c +++ b/test cases/common/133 build by default targets in tests/main.c diff --git a/test cases/common/136 build by default targets in tests/meson.build b/test cases/common/133 build by default targets in tests/meson.build index 5cc5055..5cc5055 100644 --- a/test cases/common/136 build by default targets in tests/meson.build +++ b/test cases/common/133 build by default targets in tests/meson.build diff --git a/test cases/common/136 build by default targets in tests/write_file.py b/test cases/common/133 build by default targets in tests/write_file.py index ff9c224..ff9c224 100644 --- a/test cases/common/136 build by default targets in tests/write_file.py +++ b/test cases/common/133 build by default targets in tests/write_file.py diff --git a/test cases/common/137 build by default/checkexists.py b/test cases/common/134 build by default/checkexists.py index 6664f72..6664f72 100644 --- a/test cases/common/137 build by default/checkexists.py +++ b/test cases/common/134 build by default/checkexists.py diff --git a/test cases/common/137 build by default/foo.c b/test cases/common/134 build by default/foo.c index ca97916..ca97916 100644 --- a/test cases/common/137 build by default/foo.c +++ b/test cases/common/134 build by default/foo.c diff --git a/test cases/common/137 build by default/meson.build b/test cases/common/134 build by default/meson.build index b28b634..b28b634 100644 --- a/test cases/common/137 build by default/meson.build +++ b/test cases/common/134 build by default/meson.build diff --git a/test cases/common/137 build by default/mygen.py b/test cases/common/134 build by default/mygen.py index 5a74153..5a74153 100644 --- a/test cases/common/137 build by default/mygen.py +++ b/test cases/common/134 build by default/mygen.py diff --git a/test cases/common/137 build by default/source.txt b/test cases/common/134 build by default/source.txt index 3573f4b..3573f4b 100644 --- a/test cases/common/137 build by default/source.txt +++ b/test cases/common/134 build by default/source.txt diff --git a/test cases/common/138 include order/ctsub/copyfile.py b/test cases/common/135 include order/ctsub/copyfile.py index ff42ac3..ff42ac3 100644 --- a/test cases/common/138 include order/ctsub/copyfile.py +++ b/test cases/common/135 include order/ctsub/copyfile.py diff --git a/test cases/common/138 include order/ctsub/emptyfile.c b/test cases/common/135 include order/ctsub/emptyfile.c index e69de29..e69de29 100644 --- a/test cases/common/138 include order/ctsub/emptyfile.c +++ b/test cases/common/135 include order/ctsub/emptyfile.c diff --git a/test cases/common/138 include order/ctsub/main.h b/test cases/common/135 include order/ctsub/main.h index 9d9acf3..9d9acf3 100644 --- a/test cases/common/138 include order/ctsub/main.h +++ b/test cases/common/135 include order/ctsub/main.h diff --git a/test cases/common/138 include order/ctsub/meson.build b/test cases/common/135 include order/ctsub/meson.build index a242e07..a242e07 100644 --- a/test cases/common/138 include order/ctsub/meson.build +++ b/test cases/common/135 include order/ctsub/meson.build diff --git a/test cases/common/138 include order/inc1/hdr.h b/test cases/common/135 include order/inc1/hdr.h index 9d755a8..9d755a8 100644 --- a/test cases/common/138 include order/inc1/hdr.h +++ b/test cases/common/135 include order/inc1/hdr.h diff --git a/test cases/common/138 include order/inc2/hdr.h b/test cases/common/135 include order/inc2/hdr.h index 2ebcaca..2ebcaca 100644 --- a/test cases/common/138 include order/inc2/hdr.h +++ b/test cases/common/135 include order/inc2/hdr.h diff --git a/test cases/common/138 include order/meson.build b/test cases/common/135 include order/meson.build index 9f275b8..9f275b8 100644 --- a/test cases/common/138 include order/meson.build +++ b/test cases/common/135 include order/meson.build diff --git a/test cases/common/138 include order/ordertest.c b/test cases/common/135 include order/ordertest.c index 0d9173f..0d9173f 100644 --- a/test cases/common/138 include order/ordertest.c +++ b/test cases/common/135 include order/ordertest.c diff --git a/test cases/common/138 include order/sub1/main.h b/test cases/common/135 include order/sub1/main.h index acf4a35..acf4a35 100644 --- a/test cases/common/138 include order/sub1/main.h +++ b/test cases/common/135 include order/sub1/main.h diff --git a/test cases/common/138 include order/sub1/meson.build b/test cases/common/135 include order/sub1/meson.build index 9672945..9672945 100644 --- a/test cases/common/138 include order/sub1/meson.build +++ b/test cases/common/135 include order/sub1/meson.build diff --git a/test cases/common/138 include order/sub1/some.c b/test cases/common/135 include order/sub1/some.c index 1ab0db4..1ab0db4 100644 --- a/test cases/common/138 include order/sub1/some.c +++ b/test cases/common/135 include order/sub1/some.c diff --git a/test cases/common/138 include order/sub1/some.h b/test cases/common/135 include order/sub1/some.h index 6479492..6479492 100644 --- a/test cases/common/138 include order/sub1/some.h +++ b/test cases/common/135 include order/sub1/some.h diff --git a/test cases/common/138 include order/sub2/main.h b/test cases/common/135 include order/sub2/main.h index b9c0da9..b9c0da9 100644 --- a/test cases/common/138 include order/sub2/main.h +++ b/test cases/common/135 include order/sub2/main.h diff --git a/test cases/common/138 include order/sub2/meson.build b/test cases/common/135 include order/sub2/meson.build index b1e6190..b1e6190 100644 --- a/test cases/common/138 include order/sub2/meson.build +++ b/test cases/common/135 include order/sub2/meson.build diff --git a/test cases/common/138 include order/sub3/main.h b/test cases/common/135 include order/sub3/main.h index 1ab7231..1ab7231 100644 --- a/test cases/common/138 include order/sub3/main.h +++ b/test cases/common/135 include order/sub3/main.h diff --git a/test cases/common/138 include order/sub3/meson.build b/test cases/common/135 include order/sub3/meson.build index 0bd3906..0bd3906 100644 --- a/test cases/common/138 include order/sub3/meson.build +++ b/test cases/common/135 include order/sub3/meson.build diff --git a/test cases/common/138 include order/sub4/main.c b/test cases/common/135 include order/sub4/main.c index 0b25eed..0b25eed 100644 --- a/test cases/common/138 include order/sub4/main.c +++ b/test cases/common/135 include order/sub4/main.c diff --git a/test cases/common/138 include order/sub4/main.h b/test cases/common/135 include order/sub4/main.h index 194d7fe..194d7fe 100644 --- a/test cases/common/138 include order/sub4/main.h +++ b/test cases/common/135 include order/sub4/main.h diff --git a/test cases/common/138 include order/sub4/meson.build b/test cases/common/135 include order/sub4/meson.build index c01edaa..c01edaa 100644 --- a/test cases/common/138 include order/sub4/meson.build +++ b/test cases/common/135 include order/sub4/meson.build diff --git a/test cases/common/139 override options/four.c b/test cases/common/136 override options/four.c index 54f8491..54f8491 100644 --- a/test cases/common/139 override options/four.c +++ b/test cases/common/136 override options/four.c diff --git a/test cases/common/139 override options/meson.build b/test cases/common/136 override options/meson.build index 4dd8d79..4dd8d79 100644 --- a/test cases/common/139 override options/meson.build +++ b/test cases/common/136 override options/meson.build diff --git a/test cases/common/139 override options/one.c b/test cases/common/136 override options/one.c index 14fe9d6..14fe9d6 100644 --- a/test cases/common/139 override options/one.c +++ b/test cases/common/136 override options/one.c diff --git a/test cases/common/139 override options/three.c b/test cases/common/136 override options/three.c index 305a575..305a575 100644 --- a/test cases/common/139 override options/three.c +++ b/test cases/common/136 override options/three.c diff --git a/test cases/common/139 override options/two.c b/test cases/common/136 override options/two.c index 04b1d3f..04b1d3f 100644 --- a/test cases/common/139 override options/two.c +++ b/test cases/common/136 override options/two.c diff --git a/test cases/common/140 get define/concat.h b/test cases/common/137 get define/concat.h index 6eb3e5e..6eb3e5e 100644 --- a/test cases/common/140 get define/concat.h +++ b/test cases/common/137 get define/concat.h diff --git a/test cases/common/140 get define/meson.build b/test cases/common/137 get define/meson.build index b20c554..b20c554 100644 --- a/test cases/common/140 get define/meson.build +++ b/test cases/common/137 get define/meson.build diff --git a/test cases/common/140 get define/meson_options.txt b/test cases/common/137 get define/meson_options.txt index 7d34a2e..7d34a2e 100644 --- a/test cases/common/140 get define/meson_options.txt +++ b/test cases/common/137 get define/meson_options.txt diff --git a/test cases/common/141 c cpp and asm/main.c b/test cases/common/138 c cpp and asm/main.c index 8976723..8976723 100644 --- a/test cases/common/141 c cpp and asm/main.c +++ b/test cases/common/138 c cpp and asm/main.c diff --git a/test cases/common/141 c cpp and asm/main.cpp b/test cases/common/138 c cpp and asm/main.cpp index c089870..c089870 100644 --- a/test cases/common/141 c cpp and asm/main.cpp +++ b/test cases/common/138 c cpp and asm/main.cpp diff --git a/test cases/common/141 c cpp and asm/meson.build b/test cases/common/138 c cpp and asm/meson.build index 2c3610e..2c3610e 100644 --- a/test cases/common/141 c cpp and asm/meson.build +++ b/test cases/common/138 c cpp and asm/meson.build diff --git a/test cases/common/141 c cpp and asm/retval-arm.S b/test cases/common/138 c cpp and asm/retval-arm.S index a892362..a892362 100644 --- a/test cases/common/141 c cpp and asm/retval-arm.S +++ b/test cases/common/138 c cpp and asm/retval-arm.S diff --git a/test cases/common/141 c cpp and asm/retval-x86.S b/test cases/common/138 c cpp and asm/retval-x86.S index 3cb0237..3cb0237 100644 --- a/test cases/common/141 c cpp and asm/retval-x86.S +++ b/test cases/common/138 c cpp and asm/retval-x86.S diff --git a/test cases/common/141 c cpp and asm/retval-x86_64.S b/test cases/common/138 c cpp and asm/retval-x86_64.S index 1a5f3eb..1a5f3eb 100644 --- a/test cases/common/141 c cpp and asm/retval-x86_64.S +++ b/test cases/common/138 c cpp and asm/retval-x86_64.S diff --git a/test cases/common/141 c cpp and asm/somelib.c b/test cases/common/138 c cpp and asm/somelib.c index e585b8e..e585b8e 100644 --- a/test cases/common/141 c cpp and asm/somelib.c +++ b/test cases/common/138 c cpp and asm/somelib.c diff --git a/test cases/common/141 c cpp and asm/symbol-underscore.h b/test cases/common/138 c cpp and asm/symbol-underscore.h index d0f3ef9..d0f3ef9 100644 --- a/test cases/common/141 c cpp and asm/symbol-underscore.h +++ b/test cases/common/138 c cpp and asm/symbol-underscore.h diff --git a/test cases/common/142 compute int/config.h.in b/test cases/common/139 compute int/config.h.in index 0de63ab..0de63ab 100644 --- a/test cases/common/142 compute int/config.h.in +++ b/test cases/common/139 compute int/config.h.in diff --git a/test cases/common/142 compute int/foobar.h b/test cases/common/139 compute int/foobar.h index fd3cb5e..fd3cb5e 100644 --- a/test cases/common/142 compute int/foobar.h +++ b/test cases/common/139 compute int/foobar.h diff --git a/test cases/common/142 compute int/meson.build b/test cases/common/139 compute int/meson.build index 22bd266..22bd266 100644 --- a/test cases/common/142 compute int/meson.build +++ b/test cases/common/139 compute int/meson.build diff --git a/test cases/common/142 compute int/prog.c.in b/test cases/common/139 compute int/prog.c.in index ff1ad55..ff1ad55 100644 --- a/test cases/common/142 compute int/prog.c.in +++ b/test cases/common/139 compute int/prog.c.in diff --git a/test cases/common/16 configure file/basename.py b/test cases/common/14 configure file/basename.py index d2c8662..d2c8662 100644 --- a/test cases/common/16 configure file/basename.py +++ b/test cases/common/14 configure file/basename.py diff --git a/test cases/common/16 configure file/check_file.py b/test cases/common/14 configure file/check_file.py index 6aa73e0..6aa73e0 100644 --- a/test cases/common/16 configure file/check_file.py +++ b/test cases/common/14 configure file/check_file.py diff --git a/test cases/common/16 configure file/config.h b/test cases/common/14 configure file/config.h index e85b634..e85b634 100644 --- a/test cases/common/16 configure file/config.h +++ b/test cases/common/14 configure file/config.h diff --git a/test cases/common/16 configure file/config.h.in b/test cases/common/14 configure file/config.h.in index 14a1558..14a1558 100644 --- a/test cases/common/16 configure file/config.h.in +++ b/test cases/common/14 configure file/config.h.in diff --git a/test cases/common/16 configure file/config4a.h.in b/test cases/common/14 configure file/config4a.h.in index aafd195..aafd195 100644 --- a/test cases/common/16 configure file/config4a.h.in +++ b/test cases/common/14 configure file/config4a.h.in diff --git a/test cases/common/16 configure file/config4b.h.in b/test cases/common/14 configure file/config4b.h.in index 3408bab..3408bab 100644 --- a/test cases/common/16 configure file/config4b.h.in +++ b/test cases/common/14 configure file/config4b.h.in diff --git a/test cases/common/16 configure file/config5.h.in b/test cases/common/14 configure file/config5.h.in index 323bec6..323bec6 100644 --- a/test cases/common/16 configure file/config5.h.in +++ b/test cases/common/14 configure file/config5.h.in diff --git a/test cases/common/16 configure file/config6.h.in b/test cases/common/14 configure file/config6.h.in index 9719f87..9719f87 100644 --- a/test cases/common/16 configure file/config6.h.in +++ b/test cases/common/14 configure file/config6.h.in diff --git a/test cases/common/16 configure file/config7.h.in b/test cases/common/14 configure file/config7.h.in index edd0bb3..edd0bb3 100644 --- a/test cases/common/16 configure file/config7.h.in +++ b/test cases/common/14 configure file/config7.h.in diff --git a/test cases/common/16 configure file/config8.h.in b/test cases/common/14 configure file/config8.h.in index b854ea0..b854ea0 100644 --- a/test cases/common/16 configure file/config8.h.in +++ b/test cases/common/14 configure file/config8.h.in diff --git a/test cases/common/16 configure file/dummy.dat b/test cases/common/14 configure file/dummy.dat index e69de29..e69de29 100644 --- a/test cases/common/16 configure file/dummy.dat +++ b/test cases/common/14 configure file/dummy.dat diff --git a/test cases/common/16 configure file/dumpprog.c b/test cases/common/14 configure file/dumpprog.c index 39a215e..39a215e 100644 --- a/test cases/common/16 configure file/dumpprog.c +++ b/test cases/common/14 configure file/dumpprog.c diff --git a/test cases/common/16 configure file/file_contains.py b/test cases/common/14 configure file/file_contains.py index 25634f5..25634f5 100644 --- a/test cases/common/16 configure file/file_contains.py +++ b/test cases/common/14 configure file/file_contains.py diff --git a/test cases/common/16 configure file/generator-without-input-file.py b/test cases/common/14 configure file/generator-without-input-file.py index 2ee059e..2ee059e 100755 --- a/test cases/common/16 configure file/generator-without-input-file.py +++ b/test cases/common/14 configure file/generator-without-input-file.py diff --git a/test cases/common/16 configure file/generator.py b/test cases/common/14 configure file/generator.py index e3cc881..e3cc881 100755 --- a/test cases/common/16 configure file/generator.py +++ b/test cases/common/14 configure file/generator.py diff --git a/test cases/common/16 configure file/installed_files.txt b/test cases/common/14 configure file/installed_files.txt index 542516e..542516e 100644 --- a/test cases/common/16 configure file/installed_files.txt +++ b/test cases/common/14 configure file/installed_files.txt diff --git a/test cases/common/16 configure file/invalid-utf8.bin.in b/test cases/common/14 configure file/invalid-utf8.bin.in Binary files differindex 98e9ed9..98e9ed9 100644 --- a/test cases/common/16 configure file/invalid-utf8.bin.in +++ b/test cases/common/14 configure file/invalid-utf8.bin.in diff --git a/test cases/common/16 configure file/meson.build b/test cases/common/14 configure file/meson.build index d7beeb1..d7beeb1 100644 --- a/test cases/common/16 configure file/meson.build +++ b/test cases/common/14 configure file/meson.build diff --git a/test cases/common/16 configure file/nosubst-nocopy1.txt.in b/test cases/common/14 configure file/nosubst-nocopy1.txt.in index 6e893a1..6e893a1 100644 --- a/test cases/common/16 configure file/nosubst-nocopy1.txt.in +++ b/test cases/common/14 configure file/nosubst-nocopy1.txt.in diff --git a/test cases/common/16 configure file/nosubst-nocopy2.txt.in b/test cases/common/14 configure file/nosubst-nocopy2.txt.in index a6a7cca..a6a7cca 100644 --- a/test cases/common/16 configure file/nosubst-nocopy2.txt.in +++ b/test cases/common/14 configure file/nosubst-nocopy2.txt.in diff --git a/test cases/common/16 configure file/prog.c b/test cases/common/14 configure file/prog.c index 89a718e..89a718e 100644 --- a/test cases/common/16 configure file/prog.c +++ b/test cases/common/14 configure file/prog.c diff --git a/test cases/common/16 configure file/prog2.c b/test cases/common/14 configure file/prog2.c index a88c70f..a88c70f 100644 --- a/test cases/common/16 configure file/prog2.c +++ b/test cases/common/14 configure file/prog2.c diff --git a/test cases/common/16 configure file/prog4.c b/test cases/common/14 configure file/prog4.c index 92dc7cb..92dc7cb 100644 --- a/test cases/common/16 configure file/prog4.c +++ b/test cases/common/14 configure file/prog4.c diff --git a/test cases/common/16 configure file/prog5.c b/test cases/common/14 configure file/prog5.c index 42c08f9..42c08f9 100644 --- a/test cases/common/16 configure file/prog5.c +++ b/test cases/common/14 configure file/prog5.c diff --git a/test cases/common/16 configure file/prog6.c b/test cases/common/14 configure file/prog6.c index 7412404..7412404 100644 --- a/test cases/common/16 configure file/prog6.c +++ b/test cases/common/14 configure file/prog6.c diff --git a/test cases/common/16 configure file/prog7.c b/test cases/common/14 configure file/prog7.c index 0bb7d13..0bb7d13 100644 --- a/test cases/common/16 configure file/prog7.c +++ b/test cases/common/14 configure file/prog7.c diff --git a/test cases/common/16 configure file/subdir/meson.build b/test cases/common/14 configure file/subdir/meson.build index 146b7b6..146b7b6 100644 --- a/test cases/common/16 configure file/subdir/meson.build +++ b/test cases/common/14 configure file/subdir/meson.build diff --git a/test cases/common/16 configure file/test.py.in b/test cases/common/14 configure file/test.py.in index 15a61f5..15a61f5 100644 --- a/test cases/common/16 configure file/test.py.in +++ b/test cases/common/14 configure file/test.py.in diff --git a/test cases/common/16 configure file/touch.py b/test cases/common/14 configure file/touch.py index b48f481..b48f481 100644 --- a/test cases/common/16 configure file/touch.py +++ b/test cases/common/14 configure file/touch.py diff --git a/test cases/common/143 custom target object output/meson.build b/test cases/common/140 custom target object output/meson.build index ede165b..ede165b 100644 --- a/test cases/common/143 custom target object output/meson.build +++ b/test cases/common/140 custom target object output/meson.build diff --git a/test cases/common/143 custom target object output/obj_generator.py b/test cases/common/140 custom target object output/obj_generator.py index a33872a..a33872a 100644 --- a/test cases/common/143 custom target object output/obj_generator.py +++ b/test cases/common/140 custom target object output/obj_generator.py diff --git a/test cases/common/143 custom target object output/objdir/meson.build b/test cases/common/140 custom target object output/objdir/meson.build index 0d7f6c2..0d7f6c2 100644 --- a/test cases/common/143 custom target object output/objdir/meson.build +++ b/test cases/common/140 custom target object output/objdir/meson.build diff --git a/test cases/common/143 custom target object output/objdir/source.c b/test cases/common/140 custom target object output/objdir/source.c index 7779b33..7779b33 100644 --- a/test cases/common/143 custom target object output/objdir/source.c +++ b/test cases/common/140 custom target object output/objdir/source.c diff --git a/test cases/common/143 custom target object output/progdir/meson.build b/test cases/common/140 custom target object output/progdir/meson.build index 4216c24..4216c24 100644 --- a/test cases/common/143 custom target object output/progdir/meson.build +++ b/test cases/common/140 custom target object output/progdir/meson.build diff --git a/test cases/common/143 custom target object output/progdir/prog.c b/test cases/common/140 custom target object output/progdir/prog.c index c1ece33..c1ece33 100644 --- a/test cases/common/143 custom target object output/progdir/prog.c +++ b/test cases/common/140 custom target object output/progdir/prog.c diff --git a/test cases/common/144 empty build file/meson.build b/test cases/common/141 empty build file/meson.build index 73d0397..73d0397 100644 --- a/test cases/common/144 empty build file/meson.build +++ b/test cases/common/141 empty build file/meson.build diff --git a/test cases/common/144 empty build file/subdir/meson.build b/test cases/common/141 empty build file/subdir/meson.build index e69de29..e69de29 100644 --- a/test cases/common/144 empty build file/subdir/meson.build +++ b/test cases/common/141 empty build file/subdir/meson.build diff --git a/test cases/common/145 whole archive/exe/meson.build b/test cases/common/142 whole archive/exe/meson.build index 91d298d..91d298d 100644 --- a/test cases/common/145 whole archive/exe/meson.build +++ b/test cases/common/142 whole archive/exe/meson.build diff --git a/test cases/common/145 whole archive/exe2/meson.build b/test cases/common/142 whole archive/exe2/meson.build index 9184864..9184864 100644 --- a/test cases/common/145 whole archive/exe2/meson.build +++ b/test cases/common/142 whole archive/exe2/meson.build diff --git a/test cases/common/145 whole archive/exe3/meson.build b/test cases/common/142 whole archive/exe3/meson.build index 82cf57e..82cf57e 100644 --- a/test cases/common/145 whole archive/exe3/meson.build +++ b/test cases/common/142 whole archive/exe3/meson.build diff --git a/test cases/common/145 whole archive/exe4/meson.build b/test cases/common/142 whole archive/exe4/meson.build index 0781250..0781250 100644 --- a/test cases/common/145 whole archive/exe4/meson.build +++ b/test cases/common/142 whole archive/exe4/meson.build diff --git a/test cases/common/145 whole archive/func1.c b/test cases/common/142 whole archive/func1.c index b2690a0..b2690a0 100644 --- a/test cases/common/145 whole archive/func1.c +++ b/test cases/common/142 whole archive/func1.c diff --git a/test cases/common/145 whole archive/func2.c b/test cases/common/142 whole archive/func2.c index 9e287a4..9e287a4 100644 --- a/test cases/common/145 whole archive/func2.c +++ b/test cases/common/142 whole archive/func2.c diff --git a/test cases/common/145 whole archive/meson.build b/test cases/common/142 whole archive/meson.build index 012df33..012df33 100644 --- a/test cases/common/145 whole archive/meson.build +++ b/test cases/common/142 whole archive/meson.build diff --git a/test cases/common/145 whole archive/mylib.h b/test cases/common/142 whole archive/mylib.h index 813cc67..813cc67 100644 --- a/test cases/common/145 whole archive/mylib.h +++ b/test cases/common/142 whole archive/mylib.h diff --git a/test cases/common/145 whole archive/prog.c b/test cases/common/142 whole archive/prog.c index 9111ad4..9111ad4 100644 --- a/test cases/common/145 whole archive/prog.c +++ b/test cases/common/142 whole archive/prog.c diff --git a/test cases/common/145 whole archive/sh_func2_dep_func1/meson.build b/test cases/common/142 whole archive/sh_func2_dep_func1/meson.build index 92baca6..92baca6 100644 --- a/test cases/common/145 whole archive/sh_func2_dep_func1/meson.build +++ b/test cases/common/142 whole archive/sh_func2_dep_func1/meson.build diff --git a/test cases/common/145 whole archive/sh_func2_linked_func1/meson.build b/test cases/common/142 whole archive/sh_func2_linked_func1/meson.build index 2858f65..2858f65 100644 --- a/test cases/common/145 whole archive/sh_func2_linked_func1/meson.build +++ b/test cases/common/142 whole archive/sh_func2_linked_func1/meson.build diff --git a/test cases/common/145 whole archive/sh_func2_transdep_func1/meson.build b/test cases/common/142 whole archive/sh_func2_transdep_func1/meson.build index 0703077..0703077 100644 --- a/test cases/common/145 whole archive/sh_func2_transdep_func1/meson.build +++ b/test cases/common/142 whole archive/sh_func2_transdep_func1/meson.build diff --git a/test cases/common/145 whole archive/sh_only_link_whole/meson.build b/test cases/common/142 whole archive/sh_only_link_whole/meson.build index 64baabd..64baabd 100644 --- a/test cases/common/145 whole archive/sh_only_link_whole/meson.build +++ b/test cases/common/142 whole archive/sh_only_link_whole/meson.build diff --git a/test cases/common/145 whole archive/st_func1/meson.build b/test cases/common/142 whole archive/st_func1/meson.build index c84d781..c84d781 100644 --- a/test cases/common/145 whole archive/st_func1/meson.build +++ b/test cases/common/142 whole archive/st_func1/meson.build diff --git a/test cases/common/145 whole archive/st_func2/meson.build b/test cases/common/142 whole archive/st_func2/meson.build index 2732f96..2732f96 100644 --- a/test cases/common/145 whole archive/st_func2/meson.build +++ b/test cases/common/142 whole archive/st_func2/meson.build diff --git a/test cases/common/146 C and CPP link/dummy.c b/test cases/common/143 C and CPP link/dummy.c index e69de29..e69de29 100644 --- a/test cases/common/146 C and CPP link/dummy.c +++ b/test cases/common/143 C and CPP link/dummy.c diff --git a/test cases/common/146 C and CPP link/foo.c b/test cases/common/143 C and CPP link/foo.c index 77c7e39..77c7e39 100644 --- a/test cases/common/146 C and CPP link/foo.c +++ b/test cases/common/143 C and CPP link/foo.c diff --git a/test cases/common/146 C and CPP link/foo.cpp b/test cases/common/143 C and CPP link/foo.cpp index 9db7fb2..9db7fb2 100644 --- a/test cases/common/146 C and CPP link/foo.cpp +++ b/test cases/common/143 C and CPP link/foo.cpp diff --git a/test cases/common/146 C and CPP link/foo.h b/test cases/common/143 C and CPP link/foo.h index 1ed8ce9..1ed8ce9 100644 --- a/test cases/common/146 C and CPP link/foo.h +++ b/test cases/common/143 C and CPP link/foo.h diff --git a/test cases/common/146 C and CPP link/foo.hpp b/test cases/common/143 C and CPP link/foo.hpp index e47f01d..e47f01d 100644 --- a/test cases/common/146 C and CPP link/foo.hpp +++ b/test cases/common/143 C and CPP link/foo.hpp diff --git a/test cases/common/146 C and CPP link/foobar.c b/test cases/common/143 C and CPP link/foobar.c index 27928bf..27928bf 100644 --- a/test cases/common/146 C and CPP link/foobar.c +++ b/test cases/common/143 C and CPP link/foobar.c diff --git a/test cases/common/146 C and CPP link/foobar.h b/test cases/common/143 C and CPP link/foobar.h index 6dcb096..6dcb096 100644 --- a/test cases/common/146 C and CPP link/foobar.h +++ b/test cases/common/143 C and CPP link/foobar.h diff --git a/test cases/common/146 C and CPP link/meson.build b/test cases/common/143 C and CPP link/meson.build index 55c1b87..55c1b87 100644 --- a/test cases/common/146 C and CPP link/meson.build +++ b/test cases/common/143 C and CPP link/meson.build diff --git a/test cases/common/146 C and CPP link/sub.c b/test cases/common/143 C and CPP link/sub.c index 7c078f8..7c078f8 100644 --- a/test cases/common/146 C and CPP link/sub.c +++ b/test cases/common/143 C and CPP link/sub.c diff --git a/test cases/common/146 C and CPP link/sub.h b/test cases/common/143 C and CPP link/sub.h index 5b02e17..5b02e17 100644 --- a/test cases/common/146 C and CPP link/sub.h +++ b/test cases/common/143 C and CPP link/sub.h diff --git a/test cases/common/147 mesonintrospect from scripts/check_env.py b/test cases/common/144 mesonintrospect from scripts/check_env.py index 2d46d88..2d46d88 100644 --- a/test cases/common/147 mesonintrospect from scripts/check_env.py +++ b/test cases/common/144 mesonintrospect from scripts/check_env.py diff --git a/test cases/common/147 mesonintrospect from scripts/meson.build b/test cases/common/144 mesonintrospect from scripts/meson.build index f78710b..f78710b 100644 --- a/test cases/common/147 mesonintrospect from scripts/meson.build +++ b/test cases/common/144 mesonintrospect from scripts/meson.build diff --git a/test cases/common/148 custom target multiple outputs/generator.py b/test cases/common/145 custom target multiple outputs/generator.py index 39dbd11..39dbd11 100755 --- a/test cases/common/148 custom target multiple outputs/generator.py +++ b/test cases/common/145 custom target multiple outputs/generator.py diff --git a/test cases/common/148 custom target multiple outputs/installed_files.txt b/test cases/common/145 custom target multiple outputs/installed_files.txt index 21e1249..21e1249 100644 --- a/test cases/common/148 custom target multiple outputs/installed_files.txt +++ b/test cases/common/145 custom target multiple outputs/installed_files.txt diff --git a/test cases/common/148 custom target multiple outputs/meson.build b/test cases/common/145 custom target multiple outputs/meson.build index 6412864..6412864 100644 --- a/test cases/common/148 custom target multiple outputs/meson.build +++ b/test cases/common/145 custom target multiple outputs/meson.build diff --git a/test cases/common/149 special characters/check_quoting.py b/test cases/common/146 special characters/check_quoting.py index d6e50ea..d6e50ea 100644 --- a/test cases/common/149 special characters/check_quoting.py +++ b/test cases/common/146 special characters/check_quoting.py diff --git a/test cases/common/149 special characters/installed_files.txt b/test cases/common/146 special characters/installed_files.txt index f677881..f677881 100644 --- a/test cases/common/149 special characters/installed_files.txt +++ b/test cases/common/146 special characters/installed_files.txt diff --git a/test cases/common/149 special characters/meson.build b/test cases/common/146 special characters/meson.build index ecba650..ecba650 100644 --- a/test cases/common/149 special characters/meson.build +++ b/test cases/common/146 special characters/meson.build diff --git a/test cases/common/150 nested links/meson.build b/test cases/common/147 nested links/meson.build index 0821b03..0821b03 100644 --- a/test cases/common/150 nested links/meson.build +++ b/test cases/common/147 nested links/meson.build diff --git a/test cases/common/150 nested links/xephyr.c b/test cases/common/147 nested links/xephyr.c index 33c14ce..33c14ce 100644 --- a/test cases/common/150 nested links/xephyr.c +++ b/test cases/common/147 nested links/xephyr.c diff --git a/test cases/common/151 list of file sources/foo b/test cases/common/148 list of file sources/foo index 7b57bd2..7b57bd2 100644 --- a/test cases/common/151 list of file sources/foo +++ b/test cases/common/148 list of file sources/foo diff --git a/test cases/common/151 list of file sources/gen.py b/test cases/common/148 list of file sources/gen.py index 2337d3d..2337d3d 100644 --- a/test cases/common/151 list of file sources/gen.py +++ b/test cases/common/148 list of file sources/gen.py diff --git a/test cases/common/151 list of file sources/meson.build b/test cases/common/148 list of file sources/meson.build index 819509d..819509d 100644 --- a/test cases/common/151 list of file sources/meson.build +++ b/test cases/common/148 list of file sources/meson.build diff --git a/test cases/common/152 link depends custom target/foo.c b/test cases/common/149 link depends custom target/foo.c index 8700a9e..8700a9e 100644 --- a/test cases/common/152 link depends custom target/foo.c +++ b/test cases/common/149 link depends custom target/foo.c diff --git a/test cases/common/152 link depends custom target/make_file.py b/test cases/common/149 link depends custom target/make_file.py index ceb6e19..ceb6e19 100755 --- a/test cases/common/152 link depends custom target/make_file.py +++ b/test cases/common/149 link depends custom target/make_file.py diff --git a/test cases/common/152 link depends custom target/meson.build b/test cases/common/149 link depends custom target/meson.build index ee7a865..ee7a865 100644 --- a/test cases/common/152 link depends custom target/meson.build +++ b/test cases/common/149 link depends custom target/meson.build diff --git a/test cases/common/17 if/meson.build b/test cases/common/15 if/meson.build index 2103d20..b0288db 100644 --- a/test cases/common/17 if/meson.build +++ b/test cases/common/15 if/meson.build @@ -28,3 +28,33 @@ endif if get_variable('nonexisting', false) error('Get_variable fail.') endif + + +# Now test elseif + +t = true +f = false + +if true + message('Ok.') +elif true + error('Error') +else + error('Error') +endif + +if f + error('Error.') +elif t + message('Ok') +else + error('Error') +endif + +if f + error('Error.') +elif false + error('Error') +else + message('Ok') +endif diff --git a/test cases/common/17 if/prog.c b/test cases/common/15 if/prog.c index 0314ff1..0314ff1 100644 --- a/test cases/common/17 if/prog.c +++ b/test cases/common/15 if/prog.c diff --git a/test cases/common/153 recursive linking/3rdorderdeps/lib.c.in b/test cases/common/150 recursive linking/3rdorderdeps/lib.c.in index 461f859..461f859 100644 --- a/test cases/common/153 recursive linking/3rdorderdeps/lib.c.in +++ b/test cases/common/150 recursive linking/3rdorderdeps/lib.c.in diff --git a/test cases/common/153 recursive linking/3rdorderdeps/main.c.in b/test cases/common/150 recursive linking/3rdorderdeps/main.c.in index 8155f35..8155f35 100644 --- a/test cases/common/153 recursive linking/3rdorderdeps/main.c.in +++ b/test cases/common/150 recursive linking/3rdorderdeps/main.c.in diff --git a/test cases/common/153 recursive linking/3rdorderdeps/meson.build b/test cases/common/150 recursive linking/3rdorderdeps/meson.build index d4ef745..d4ef745 100644 --- a/test cases/common/153 recursive linking/3rdorderdeps/meson.build +++ b/test cases/common/150 recursive linking/3rdorderdeps/meson.build diff --git a/test cases/common/153 recursive linking/circular/lib1.c b/test cases/common/150 recursive linking/circular/lib1.c index 38889cf..38889cf 100644 --- a/test cases/common/153 recursive linking/circular/lib1.c +++ b/test cases/common/150 recursive linking/circular/lib1.c diff --git a/test cases/common/153 recursive linking/circular/lib2.c b/test cases/common/150 recursive linking/circular/lib2.c index 31cd37c..31cd37c 100644 --- a/test cases/common/153 recursive linking/circular/lib2.c +++ b/test cases/common/150 recursive linking/circular/lib2.c diff --git a/test cases/common/153 recursive linking/circular/lib3.c b/test cases/common/150 recursive linking/circular/lib3.c index 67d473a..67d473a 100644 --- a/test cases/common/153 recursive linking/circular/lib3.c +++ b/test cases/common/150 recursive linking/circular/lib3.c diff --git a/test cases/common/153 recursive linking/circular/main.c b/test cases/common/150 recursive linking/circular/main.c index 5f797a5..5f797a5 100644 --- a/test cases/common/153 recursive linking/circular/main.c +++ b/test cases/common/150 recursive linking/circular/main.c diff --git a/test cases/common/153 recursive linking/circular/meson.build b/test cases/common/150 recursive linking/circular/meson.build index b7a70a8..b7a70a8 100644 --- a/test cases/common/153 recursive linking/circular/meson.build +++ b/test cases/common/150 recursive linking/circular/meson.build diff --git a/test cases/common/153 recursive linking/circular/prop1.c b/test cases/common/150 recursive linking/circular/prop1.c index 4e571f5..4e571f5 100644 --- a/test cases/common/153 recursive linking/circular/prop1.c +++ b/test cases/common/150 recursive linking/circular/prop1.c diff --git a/test cases/common/153 recursive linking/circular/prop2.c b/test cases/common/150 recursive linking/circular/prop2.c index ceabba0..ceabba0 100644 --- a/test cases/common/153 recursive linking/circular/prop2.c +++ b/test cases/common/150 recursive linking/circular/prop2.c diff --git a/test cases/common/153 recursive linking/circular/prop3.c b/test cases/common/150 recursive linking/circular/prop3.c index 246206c..246206c 100644 --- a/test cases/common/153 recursive linking/circular/prop3.c +++ b/test cases/common/150 recursive linking/circular/prop3.c diff --git a/test cases/common/153 recursive linking/edge-cases/libsto.c b/test cases/common/150 recursive linking/edge-cases/libsto.c index 93f46a8..93f46a8 100644 --- a/test cases/common/153 recursive linking/edge-cases/libsto.c +++ b/test cases/common/150 recursive linking/edge-cases/libsto.c diff --git a/test cases/common/153 recursive linking/edge-cases/meson.build b/test cases/common/150 recursive linking/edge-cases/meson.build index 6a46266..6a46266 100644 --- a/test cases/common/153 recursive linking/edge-cases/meson.build +++ b/test cases/common/150 recursive linking/edge-cases/meson.build diff --git a/test cases/common/153 recursive linking/edge-cases/shstmain.c b/test cases/common/150 recursive linking/edge-cases/shstmain.c index b44c55f..b44c55f 100644 --- a/test cases/common/153 recursive linking/edge-cases/shstmain.c +++ b/test cases/common/150 recursive linking/edge-cases/shstmain.c diff --git a/test cases/common/153 recursive linking/edge-cases/stobuilt.c b/test cases/common/150 recursive linking/edge-cases/stobuilt.c index 9cc15bc..9cc15bc 100644 --- a/test cases/common/153 recursive linking/edge-cases/stobuilt.c +++ b/test cases/common/150 recursive linking/edge-cases/stobuilt.c diff --git a/test cases/common/153 recursive linking/edge-cases/stomain.c b/test cases/common/150 recursive linking/edge-cases/stomain.c index 90208a7..90208a7 100644 --- a/test cases/common/153 recursive linking/edge-cases/stomain.c +++ b/test cases/common/150 recursive linking/edge-cases/stomain.c diff --git a/test cases/common/153 recursive linking/lib.h b/test cases/common/150 recursive linking/lib.h index b54bf36..b54bf36 100644 --- a/test cases/common/153 recursive linking/lib.h +++ b/test cases/common/150 recursive linking/lib.h diff --git a/test cases/common/153 recursive linking/main.c b/test cases/common/150 recursive linking/main.c index 0851611..0851611 100644 --- a/test cases/common/153 recursive linking/main.c +++ b/test cases/common/150 recursive linking/main.c diff --git a/test cases/common/153 recursive linking/meson.build b/test cases/common/150 recursive linking/meson.build index 2ca7151..2ca7151 100644 --- a/test cases/common/153 recursive linking/meson.build +++ b/test cases/common/150 recursive linking/meson.build diff --git a/test cases/common/153 recursive linking/shnodep/lib.c b/test cases/common/150 recursive linking/shnodep/lib.c index a3b7993..a3b7993 100644 --- a/test cases/common/153 recursive linking/shnodep/lib.c +++ b/test cases/common/150 recursive linking/shnodep/lib.c diff --git a/test cases/common/153 recursive linking/shnodep/meson.build b/test cases/common/150 recursive linking/shnodep/meson.build index 66cfd9b..66cfd9b 100644 --- a/test cases/common/153 recursive linking/shnodep/meson.build +++ b/test cases/common/150 recursive linking/shnodep/meson.build diff --git a/test cases/common/153 recursive linking/shshdep/lib.c b/test cases/common/150 recursive linking/shshdep/lib.c index 715d120..715d120 100644 --- a/test cases/common/153 recursive linking/shshdep/lib.c +++ b/test cases/common/150 recursive linking/shshdep/lib.c diff --git a/test cases/common/153 recursive linking/shshdep/meson.build b/test cases/common/150 recursive linking/shshdep/meson.build index 020b481..020b481 100644 --- a/test cases/common/153 recursive linking/shshdep/meson.build +++ b/test cases/common/150 recursive linking/shshdep/meson.build diff --git a/test cases/common/153 recursive linking/shstdep/lib.c b/test cases/common/150 recursive linking/shstdep/lib.c index 5da8d0b..5da8d0b 100644 --- a/test cases/common/153 recursive linking/shstdep/lib.c +++ b/test cases/common/150 recursive linking/shstdep/lib.c diff --git a/test cases/common/153 recursive linking/shstdep/meson.build b/test cases/common/150 recursive linking/shstdep/meson.build index 008f9f8..008f9f8 100644 --- a/test cases/common/153 recursive linking/shstdep/meson.build +++ b/test cases/common/150 recursive linking/shstdep/meson.build diff --git a/test cases/common/153 recursive linking/stnodep/lib.c b/test cases/common/150 recursive linking/stnodep/lib.c index 4bc50be..4bc50be 100644 --- a/test cases/common/153 recursive linking/stnodep/lib.c +++ b/test cases/common/150 recursive linking/stnodep/lib.c diff --git a/test cases/common/153 recursive linking/stnodep/meson.build b/test cases/common/150 recursive linking/stnodep/meson.build index 77f7129..77f7129 100644 --- a/test cases/common/153 recursive linking/stnodep/meson.build +++ b/test cases/common/150 recursive linking/stnodep/meson.build diff --git a/test cases/common/153 recursive linking/stshdep/lib.c b/test cases/common/150 recursive linking/stshdep/lib.c index 3cfa12b..3cfa12b 100644 --- a/test cases/common/153 recursive linking/stshdep/lib.c +++ b/test cases/common/150 recursive linking/stshdep/lib.c diff --git a/test cases/common/153 recursive linking/stshdep/meson.build b/test cases/common/150 recursive linking/stshdep/meson.build index 0967c1c..0967c1c 100644 --- a/test cases/common/153 recursive linking/stshdep/meson.build +++ b/test cases/common/150 recursive linking/stshdep/meson.build diff --git a/test cases/common/153 recursive linking/ststdep/lib.c b/test cases/common/150 recursive linking/ststdep/lib.c index fca8706..fca8706 100644 --- a/test cases/common/153 recursive linking/ststdep/lib.c +++ b/test cases/common/150 recursive linking/ststdep/lib.c diff --git a/test cases/common/153 recursive linking/ststdep/meson.build b/test cases/common/150 recursive linking/ststdep/meson.build index 3602442..3602442 100644 --- a/test cases/common/153 recursive linking/ststdep/meson.build +++ b/test cases/common/150 recursive linking/ststdep/meson.build diff --git a/test cases/common/154 library at root/lib.c b/test cases/common/151 library at root/lib.c index a5b3dc3..a5b3dc3 100644 --- a/test cases/common/154 library at root/lib.c +++ b/test cases/common/151 library at root/lib.c diff --git a/test cases/common/154 library at root/main/main.c b/test cases/common/151 library at root/main/main.c index c4e1b4e..c4e1b4e 100644 --- a/test cases/common/154 library at root/main/main.c +++ b/test cases/common/151 library at root/main/main.c diff --git a/test cases/common/154 library at root/main/meson.build b/test cases/common/151 library at root/main/meson.build index 557378a..557378a 100644 --- a/test cases/common/154 library at root/main/meson.build +++ b/test cases/common/151 library at root/main/meson.build diff --git a/test cases/common/154 library at root/meson.build b/test cases/common/151 library at root/meson.build index bfdd869..bfdd869 100644 --- a/test cases/common/154 library at root/meson.build +++ b/test cases/common/151 library at root/meson.build diff --git a/test cases/common/155 simd/fallback.c b/test cases/common/152 simd/fallback.c index ab435f4..ab435f4 100644 --- a/test cases/common/155 simd/fallback.c +++ b/test cases/common/152 simd/fallback.c diff --git a/test cases/common/155 simd/include/simdheader.h b/test cases/common/152 simd/include/simdheader.h index 6515e41..6515e41 100644 --- a/test cases/common/155 simd/include/simdheader.h +++ b/test cases/common/152 simd/include/simdheader.h diff --git a/test cases/common/155 simd/meson.build b/test cases/common/152 simd/meson.build index 2628a12..2628a12 100644 --- a/test cases/common/155 simd/meson.build +++ b/test cases/common/152 simd/meson.build diff --git a/test cases/common/155 simd/simd_avx.c b/test cases/common/152 simd/simd_avx.c index 1c84dae..1c84dae 100644 --- a/test cases/common/155 simd/simd_avx.c +++ b/test cases/common/152 simd/simd_avx.c diff --git a/test cases/common/155 simd/simd_avx2.c b/test cases/common/152 simd/simd_avx2.c index 15297eb..15297eb 100644 --- a/test cases/common/155 simd/simd_avx2.c +++ b/test cases/common/152 simd/simd_avx2.c diff --git a/test cases/common/155 simd/simd_mmx.c b/test cases/common/152 simd/simd_mmx.c index 731abd1..731abd1 100644 --- a/test cases/common/155 simd/simd_mmx.c +++ b/test cases/common/152 simd/simd_mmx.c diff --git a/test cases/common/155 simd/simd_neon.c b/test cases/common/152 simd/simd_neon.c index 2082099..2082099 100644 --- a/test cases/common/155 simd/simd_neon.c +++ b/test cases/common/152 simd/simd_neon.c diff --git a/test cases/common/155 simd/simd_sse.c b/test cases/common/152 simd/simd_sse.c index 3c9fe62..3c9fe62 100644 --- a/test cases/common/155 simd/simd_sse.c +++ b/test cases/common/152 simd/simd_sse.c diff --git a/test cases/common/155 simd/simd_sse2.c b/test cases/common/152 simd/simd_sse2.c index 0274533..0274533 100644 --- a/test cases/common/155 simd/simd_sse2.c +++ b/test cases/common/152 simd/simd_sse2.c diff --git a/test cases/common/155 simd/simd_sse3.c b/test cases/common/152 simd/simd_sse3.c index e97d102..e97d102 100644 --- a/test cases/common/155 simd/simd_sse3.c +++ b/test cases/common/152 simd/simd_sse3.c diff --git a/test cases/common/155 simd/simd_sse41.c b/test cases/common/152 simd/simd_sse41.c index 0308c7e..0308c7e 100644 --- a/test cases/common/155 simd/simd_sse41.c +++ b/test cases/common/152 simd/simd_sse41.c diff --git a/test cases/common/155 simd/simd_sse42.c b/test cases/common/152 simd/simd_sse42.c index 137ffc4..137ffc4 100644 --- a/test cases/common/155 simd/simd_sse42.c +++ b/test cases/common/152 simd/simd_sse42.c diff --git a/test cases/common/155 simd/simd_ssse3.c b/test cases/common/152 simd/simd_ssse3.c index ab4dff4..ab4dff4 100644 --- a/test cases/common/155 simd/simd_ssse3.c +++ b/test cases/common/152 simd/simd_ssse3.c diff --git a/test cases/common/155 simd/simdchecker.c b/test cases/common/152 simd/simdchecker.c index 222fbf3..222fbf3 100644 --- a/test cases/common/155 simd/simdchecker.c +++ b/test cases/common/152 simd/simdchecker.c diff --git a/test cases/common/155 simd/simdfuncs.h b/test cases/common/152 simd/simdfuncs.h index dfb0560..dfb0560 100644 --- a/test cases/common/155 simd/simdfuncs.h +++ b/test cases/common/152 simd/simdfuncs.h diff --git a/test cases/common/156 shared module resolving symbol in executable/meson.build b/test cases/common/153 shared module resolving symbol in executable/meson.build index 282a4d2..282a4d2 100644 --- a/test cases/common/156 shared module resolving symbol in executable/meson.build +++ b/test cases/common/153 shared module resolving symbol in executable/meson.build diff --git a/test cases/common/156 shared module resolving symbol in executable/module.c b/test cases/common/153 shared module resolving symbol in executable/module.c index 64374d5..64374d5 100644 --- a/test cases/common/156 shared module resolving symbol in executable/module.c +++ b/test cases/common/153 shared module resolving symbol in executable/module.c diff --git a/test cases/common/156 shared module resolving symbol in executable/prog.c b/test cases/common/153 shared module resolving symbol in executable/prog.c index 746c192..746c192 100644 --- a/test cases/common/156 shared module resolving symbol in executable/prog.c +++ b/test cases/common/153 shared module resolving symbol in executable/prog.c diff --git a/test cases/common/157 dotinclude/dotproc.c b/test cases/common/154 dotinclude/dotproc.c index 5e65f7b..5e65f7b 100644 --- a/test cases/common/157 dotinclude/dotproc.c +++ b/test cases/common/154 dotinclude/dotproc.c diff --git a/test cases/common/157 dotinclude/meson.build b/test cases/common/154 dotinclude/meson.build index e0c2cd7..e0c2cd7 100644 --- a/test cases/common/157 dotinclude/meson.build +++ b/test cases/common/154 dotinclude/meson.build diff --git a/test cases/common/157 dotinclude/stdio.h b/test cases/common/154 dotinclude/stdio.h index b6bd09f..b6bd09f 100644 --- a/test cases/common/157 dotinclude/stdio.h +++ b/test cases/common/154 dotinclude/stdio.h diff --git a/test cases/common/158 reserved targets/all/meson.build b/test cases/common/155 reserved targets/all/meson.build index adee882..adee882 100644 --- a/test cases/common/158 reserved targets/all/meson.build +++ b/test cases/common/155 reserved targets/all/meson.build diff --git a/test cases/common/158 reserved targets/benchmark/meson.build b/test cases/common/155 reserved targets/benchmark/meson.build index 242cc23..242cc23 100644 --- a/test cases/common/158 reserved targets/benchmark/meson.build +++ b/test cases/common/155 reserved targets/benchmark/meson.build diff --git a/test cases/common/158 reserved targets/clean-ctlist/meson.build b/test cases/common/155 reserved targets/clean-ctlist/meson.build index 75eb207..75eb207 100644 --- a/test cases/common/158 reserved targets/clean-ctlist/meson.build +++ b/test cases/common/155 reserved targets/clean-ctlist/meson.build diff --git a/test cases/common/158 reserved targets/clean-gcda/meson.build b/test cases/common/155 reserved targets/clean-gcda/meson.build index 488a527..488a527 100644 --- a/test cases/common/158 reserved targets/clean-gcda/meson.build +++ b/test cases/common/155 reserved targets/clean-gcda/meson.build diff --git a/test cases/common/158 reserved targets/clean-gcno/meson.build b/test cases/common/155 reserved targets/clean-gcno/meson.build index eec789a..eec789a 100644 --- a/test cases/common/158 reserved targets/clean-gcno/meson.build +++ b/test cases/common/155 reserved targets/clean-gcno/meson.build diff --git a/test cases/common/158 reserved targets/clean/meson.build b/test cases/common/155 reserved targets/clean/meson.build index 4e27b6c..4e27b6c 100644 --- a/test cases/common/158 reserved targets/clean/meson.build +++ b/test cases/common/155 reserved targets/clean/meson.build diff --git a/test cases/common/158 reserved targets/coverage-html/meson.build b/test cases/common/155 reserved targets/coverage-html/meson.build index 10a4cc8..10a4cc8 100644 --- a/test cases/common/158 reserved targets/coverage-html/meson.build +++ b/test cases/common/155 reserved targets/coverage-html/meson.build diff --git a/test cases/common/158 reserved targets/coverage-text/meson.build b/test cases/common/155 reserved targets/coverage-text/meson.build index 21dcae5..21dcae5 100644 --- a/test cases/common/158 reserved targets/coverage-text/meson.build +++ b/test cases/common/155 reserved targets/coverage-text/meson.build diff --git a/test cases/common/158 reserved targets/coverage-xml/meson.build b/test cases/common/155 reserved targets/coverage-xml/meson.build index 44d7bfb..44d7bfb 100644 --- a/test cases/common/158 reserved targets/coverage-xml/meson.build +++ b/test cases/common/155 reserved targets/coverage-xml/meson.build diff --git a/test cases/common/158 reserved targets/coverage/meson.build b/test cases/common/155 reserved targets/coverage/meson.build index b401055..b401055 100644 --- a/test cases/common/158 reserved targets/coverage/meson.build +++ b/test cases/common/155 reserved targets/coverage/meson.build diff --git a/test cases/common/158 reserved targets/dist/meson.build b/test cases/common/155 reserved targets/dist/meson.build index 951bbb4..951bbb4 100644 --- a/test cases/common/158 reserved targets/dist/meson.build +++ b/test cases/common/155 reserved targets/dist/meson.build diff --git a/test cases/common/158 reserved targets/distcheck/meson.build b/test cases/common/155 reserved targets/distcheck/meson.build index 12b9328..12b9328 100644 --- a/test cases/common/158 reserved targets/distcheck/meson.build +++ b/test cases/common/155 reserved targets/distcheck/meson.build diff --git a/test cases/common/158 reserved targets/install/meson.build b/test cases/common/155 reserved targets/install/meson.build index 4839901..4839901 100644 --- a/test cases/common/158 reserved targets/install/meson.build +++ b/test cases/common/155 reserved targets/install/meson.build diff --git a/test cases/common/158 reserved targets/meson.build b/test cases/common/155 reserved targets/meson.build index 24fd937..24fd937 100644 --- a/test cases/common/158 reserved targets/meson.build +++ b/test cases/common/155 reserved targets/meson.build diff --git a/test cases/common/158 reserved targets/phony/meson.build b/test cases/common/155 reserved targets/phony/meson.build index 6710fc1..6710fc1 100644 --- a/test cases/common/158 reserved targets/phony/meson.build +++ b/test cases/common/155 reserved targets/phony/meson.build diff --git a/test cases/common/158 reserved targets/reconfigure/meson.build b/test cases/common/155 reserved targets/reconfigure/meson.build index c3ea3da..c3ea3da 100644 --- a/test cases/common/158 reserved targets/reconfigure/meson.build +++ b/test cases/common/155 reserved targets/reconfigure/meson.build diff --git a/test cases/common/158 reserved targets/runtarget/meson.build b/test cases/common/155 reserved targets/runtarget/meson.build index 52c371b..52c371b 100644 --- a/test cases/common/158 reserved targets/runtarget/meson.build +++ b/test cases/common/155 reserved targets/runtarget/meson.build diff --git a/test cases/common/158 reserved targets/scan-build/meson.build b/test cases/common/155 reserved targets/scan-build/meson.build index 1002053..1002053 100644 --- a/test cases/common/158 reserved targets/scan-build/meson.build +++ b/test cases/common/155 reserved targets/scan-build/meson.build diff --git a/test cases/common/158 reserved targets/test.c b/test cases/common/155 reserved targets/test.c index 0fb4389..0fb4389 100644 --- a/test cases/common/158 reserved targets/test.c +++ b/test cases/common/155 reserved targets/test.c diff --git a/test cases/common/158 reserved targets/test/meson.build b/test cases/common/155 reserved targets/test/meson.build index 4ab123c..4ab123c 100644 --- a/test cases/common/158 reserved targets/test/meson.build +++ b/test cases/common/155 reserved targets/test/meson.build diff --git a/test cases/common/158 reserved targets/uninstall/meson.build b/test cases/common/155 reserved targets/uninstall/meson.build index 21c6ca6..21c6ca6 100644 --- a/test cases/common/158 reserved targets/uninstall/meson.build +++ b/test cases/common/155 reserved targets/uninstall/meson.build diff --git a/test cases/common/159 duplicate source names/dir1/file.c b/test cases/common/156 duplicate source names/dir1/file.c index 094e187..094e187 100644 --- a/test cases/common/159 duplicate source names/dir1/file.c +++ b/test cases/common/156 duplicate source names/dir1/file.c diff --git a/test cases/common/159 duplicate source names/dir1/meson.build b/test cases/common/156 duplicate source names/dir1/meson.build index 00bc85d..00bc85d 100644 --- a/test cases/common/159 duplicate source names/dir1/meson.build +++ b/test cases/common/156 duplicate source names/dir1/meson.build diff --git a/test cases/common/159 duplicate source names/dir2/dir1/file.c b/test cases/common/156 duplicate source names/dir2/dir1/file.c index 5aac8e5..5aac8e5 100644 --- a/test cases/common/159 duplicate source names/dir2/dir1/file.c +++ b/test cases/common/156 duplicate source names/dir2/dir1/file.c diff --git a/test cases/common/159 duplicate source names/dir2/file.c b/test cases/common/156 duplicate source names/dir2/file.c index 6cf8d66..6cf8d66 100644 --- a/test cases/common/159 duplicate source names/dir2/file.c +++ b/test cases/common/156 duplicate source names/dir2/file.c diff --git a/test cases/common/159 duplicate source names/dir2/meson.build b/test cases/common/156 duplicate source names/dir2/meson.build index f116a02..f116a02 100644 --- a/test cases/common/159 duplicate source names/dir2/meson.build +++ b/test cases/common/156 duplicate source names/dir2/meson.build diff --git a/test cases/common/159 duplicate source names/dir3/dir1/file.c b/test cases/common/156 duplicate source names/dir3/dir1/file.c index 04667c2..04667c2 100644 --- a/test cases/common/159 duplicate source names/dir3/dir1/file.c +++ b/test cases/common/156 duplicate source names/dir3/dir1/file.c diff --git a/test cases/common/159 duplicate source names/dir3/file.c b/test cases/common/156 duplicate source names/dir3/file.c index d16d0a8..d16d0a8 100644 --- a/test cases/common/159 duplicate source names/dir3/file.c +++ b/test cases/common/156 duplicate source names/dir3/file.c diff --git a/test cases/common/159 duplicate source names/dir3/meson.build b/test cases/common/156 duplicate source names/dir3/meson.build index 70ddbf2..70ddbf2 100644 --- a/test cases/common/159 duplicate source names/dir3/meson.build +++ b/test cases/common/156 duplicate source names/dir3/meson.build diff --git a/test cases/common/159 duplicate source names/meson.build b/test cases/common/156 duplicate source names/meson.build index cac5194..cac5194 100644 --- a/test cases/common/159 duplicate source names/meson.build +++ b/test cases/common/156 duplicate source names/meson.build diff --git a/test cases/common/160 index customtarget/check_args.py b/test cases/common/157 index customtarget/check_args.py index 8663a6f..8663a6f 100644 --- a/test cases/common/160 index customtarget/check_args.py +++ b/test cases/common/157 index customtarget/check_args.py diff --git a/test cases/common/160 index customtarget/gen_sources.py b/test cases/common/157 index customtarget/gen_sources.py index 0bdb529..0bdb529 100644 --- a/test cases/common/160 index customtarget/gen_sources.py +++ b/test cases/common/157 index customtarget/gen_sources.py diff --git a/test cases/common/160 index customtarget/lib.c b/test cases/common/157 index customtarget/lib.c index 17117d5..17117d5 100644 --- a/test cases/common/160 index customtarget/lib.c +++ b/test cases/common/157 index customtarget/lib.c diff --git a/test cases/common/160 index customtarget/meson.build b/test cases/common/157 index customtarget/meson.build index 27d28b5..27d28b5 100644 --- a/test cases/common/160 index customtarget/meson.build +++ b/test cases/common/157 index customtarget/meson.build diff --git a/test cases/common/160 index customtarget/subdir/foo.c b/test cases/common/157 index customtarget/subdir/foo.c index c620a11..c620a11 100644 --- a/test cases/common/160 index customtarget/subdir/foo.c +++ b/test cases/common/157 index customtarget/subdir/foo.c diff --git a/test cases/common/160 index customtarget/subdir/meson.build b/test cases/common/157 index customtarget/subdir/meson.build index 47bcd32..47bcd32 100644 --- a/test cases/common/160 index customtarget/subdir/meson.build +++ b/test cases/common/157 index customtarget/subdir/meson.build diff --git a/test cases/common/161 wrap file should not failed/meson.build b/test cases/common/158 wrap file should not failed/meson.build index 9cf4e9a..9cf4e9a 100644 --- a/test cases/common/161 wrap file should not failed/meson.build +++ b/test cases/common/158 wrap file should not failed/meson.build diff --git a/test cases/common/161 wrap file should not failed/src/meson.build b/test cases/common/158 wrap file should not failed/src/meson.build index 69f666d..69f666d 100644 --- a/test cases/common/161 wrap file should not failed/src/meson.build +++ b/test cases/common/158 wrap file should not failed/src/meson.build diff --git a/test cases/common/161 wrap file should not failed/src/subprojects/foo/prog2.c b/test cases/common/158 wrap file should not failed/src/subprojects/foo/prog2.c index 56f61a8..56f61a8 100644 --- a/test cases/common/161 wrap file should not failed/src/subprojects/foo/prog2.c +++ b/test cases/common/158 wrap file should not failed/src/subprojects/foo/prog2.c diff --git a/test cases/common/161 wrap file should not failed/src/subprojects/prog.c b/test cases/common/158 wrap file should not failed/src/subprojects/prog.c index 56f61a8..56f61a8 100644 --- a/test cases/common/161 wrap file should not failed/src/subprojects/prog.c +++ b/test cases/common/158 wrap file should not failed/src/subprojects/prog.c diff --git a/test cases/common/161 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip b/test cases/common/158 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip index 421376d..421376d 100644 --- a/test cases/common/161 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip +++ b/test cases/common/158 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip diff --git a/test cases/common/161 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz b/test cases/common/158 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz index 421376d..421376d 100644 --- a/test cases/common/161 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz +++ b/test cases/common/158 wrap file should not failed/subprojects/packagecache/zlib-1.2.8.tar.gz diff --git a/test cases/common/161 wrap file should not failed/subprojects/zlib-1.2.8/foo.c b/test cases/common/158 wrap file should not failed/subprojects/zlib-1.2.8/foo.c index 019f2ba..019f2ba 100644 --- a/test cases/common/161 wrap file should not failed/subprojects/zlib-1.2.8/foo.c +++ b/test cases/common/158 wrap file should not failed/subprojects/zlib-1.2.8/foo.c diff --git a/test cases/common/161 wrap file should not failed/subprojects/zlib-1.2.8/meson.build b/test cases/common/158 wrap file should not failed/subprojects/zlib-1.2.8/meson.build index 8d8008e..8d8008e 100644 --- a/test cases/common/161 wrap file should not failed/subprojects/zlib-1.2.8/meson.build +++ b/test cases/common/158 wrap file should not failed/subprojects/zlib-1.2.8/meson.build diff --git a/test cases/common/161 wrap file should not failed/subprojects/zlib.wrap b/test cases/common/158 wrap file should not failed/subprojects/zlib.wrap index 6d5896f..6d5896f 100644 --- a/test cases/common/161 wrap file should not failed/subprojects/zlib.wrap +++ b/test cases/common/158 wrap file should not failed/subprojects/zlib.wrap diff --git a/test cases/common/162 includedir subproj/meson.build b/test cases/common/159 includedir subproj/meson.build index b3de5af..b3de5af 100644 --- a/test cases/common/162 includedir subproj/meson.build +++ b/test cases/common/159 includedir subproj/meson.build diff --git a/test cases/common/162 includedir subproj/prog.c b/test cases/common/159 includedir subproj/prog.c index 772681e..772681e 100644 --- a/test cases/common/162 includedir subproj/prog.c +++ b/test cases/common/159 includedir subproj/prog.c diff --git a/test cases/common/162 includedir subproj/subprojects/inctest/include/incfile.h b/test cases/common/159 includedir subproj/subprojects/inctest/include/incfile.h index ec740da..ec740da 100644 --- a/test cases/common/162 includedir subproj/subprojects/inctest/include/incfile.h +++ b/test cases/common/159 includedir subproj/subprojects/inctest/include/incfile.h diff --git a/test cases/common/162 includedir subproj/subprojects/inctest/meson.build b/test cases/common/159 includedir subproj/subprojects/inctest/meson.build index 74aabcb..74aabcb 100644 --- a/test cases/common/162 includedir subproj/subprojects/inctest/meson.build +++ b/test cases/common/159 includedir subproj/subprojects/inctest/meson.build diff --git a/test cases/common/18 else/meson.build b/test cases/common/16 else/meson.build index 99cb927..99cb927 100644 --- a/test cases/common/18 else/meson.build +++ b/test cases/common/16 else/meson.build diff --git a/test cases/common/18 else/prog.c b/test cases/common/16 else/prog.c index 0314ff1..0314ff1 100644 --- a/test cases/common/18 else/prog.c +++ b/test cases/common/16 else/prog.c diff --git a/test cases/common/163 subproject dir name collision/a.c b/test cases/common/160 subproject dir name collision/a.c index 6ed96fa..6ed96fa 100644 --- a/test cases/common/163 subproject dir name collision/a.c +++ b/test cases/common/160 subproject dir name collision/a.c diff --git a/test cases/common/163 subproject dir name collision/custom_subproject_dir/B/b.c b/test cases/common/160 subproject dir name collision/custom_subproject_dir/B/b.c index 4c94ee9..4c94ee9 100644 --- a/test cases/common/163 subproject dir name collision/custom_subproject_dir/B/b.c +++ b/test cases/common/160 subproject dir name collision/custom_subproject_dir/B/b.c diff --git a/test cases/common/163 subproject dir name collision/custom_subproject_dir/B/meson.build b/test cases/common/160 subproject dir name collision/custom_subproject_dir/B/meson.build index 280c60c..280c60c 100644 --- a/test cases/common/163 subproject dir name collision/custom_subproject_dir/B/meson.build +++ b/test cases/common/160 subproject dir name collision/custom_subproject_dir/B/meson.build diff --git a/test cases/common/163 subproject dir name collision/custom_subproject_dir/C/c.c b/test cases/common/160 subproject dir name collision/custom_subproject_dir/C/c.c index eebfb9f..eebfb9f 100644 --- a/test cases/common/163 subproject dir name collision/custom_subproject_dir/C/c.c +++ b/test cases/common/160 subproject dir name collision/custom_subproject_dir/C/c.c diff --git a/test cases/common/163 subproject dir name collision/custom_subproject_dir/C/meson.build b/test cases/common/160 subproject dir name collision/custom_subproject_dir/C/meson.build index abf0b1e..abf0b1e 100644 --- a/test cases/common/163 subproject dir name collision/custom_subproject_dir/C/meson.build +++ b/test cases/common/160 subproject dir name collision/custom_subproject_dir/C/meson.build diff --git a/test cases/common/163 subproject dir name collision/meson.build b/test cases/common/160 subproject dir name collision/meson.build index 5531217..5531217 100644 --- a/test cases/common/163 subproject dir name collision/meson.build +++ b/test cases/common/160 subproject dir name collision/meson.build diff --git a/test cases/common/163 subproject dir name collision/other_subdir/custom_subproject_dir/other.c b/test cases/common/160 subproject dir name collision/other_subdir/custom_subproject_dir/other.c index 0c27f84..0c27f84 100644 --- a/test cases/common/163 subproject dir name collision/other_subdir/custom_subproject_dir/other.c +++ b/test cases/common/160 subproject dir name collision/other_subdir/custom_subproject_dir/other.c diff --git a/test cases/common/163 subproject dir name collision/other_subdir/meson.build b/test cases/common/160 subproject dir name collision/other_subdir/meson.build index 90cb67a..90cb67a 100644 --- a/test cases/common/163 subproject dir name collision/other_subdir/meson.build +++ b/test cases/common/160 subproject dir name collision/other_subdir/meson.build diff --git a/test cases/common/164 config tool variable/meson.build b/test cases/common/161 config tool variable/meson.build index 0643042..0643042 100644 --- a/test cases/common/164 config tool variable/meson.build +++ b/test cases/common/161 config tool variable/meson.build diff --git a/test cases/common/165 custom target subdir depend files/copyfile.py b/test cases/common/162 custom target subdir depend files/copyfile.py index ff42ac3..ff42ac3 100644 --- a/test cases/common/165 custom target subdir depend files/copyfile.py +++ b/test cases/common/162 custom target subdir depend files/copyfile.py diff --git a/test cases/common/165 custom target subdir depend files/meson.build b/test cases/common/162 custom target subdir depend files/meson.build index 44f5c71..44f5c71 100644 --- a/test cases/common/165 custom target subdir depend files/meson.build +++ b/test cases/common/162 custom target subdir depend files/meson.build diff --git a/test cases/common/165 custom target subdir depend files/subdir/dep.dat b/test cases/common/162 custom target subdir depend files/subdir/dep.dat index 5daee49..5daee49 100644 --- a/test cases/common/165 custom target subdir depend files/subdir/dep.dat +++ b/test cases/common/162 custom target subdir depend files/subdir/dep.dat diff --git a/test cases/common/165 custom target subdir depend files/subdir/foo.c.in b/test cases/common/162 custom target subdir depend files/subdir/foo.c.in index d53846f..d53846f 100644 --- a/test cases/common/165 custom target subdir depend files/subdir/foo.c.in +++ b/test cases/common/162 custom target subdir depend files/subdir/foo.c.in diff --git a/test cases/common/165 custom target subdir depend files/subdir/meson.build b/test cases/common/162 custom target subdir depend files/subdir/meson.build index f9d31c4..f9d31c4 100644 --- a/test cases/common/165 custom target subdir depend files/subdir/meson.build +++ b/test cases/common/162 custom target subdir depend files/subdir/meson.build diff --git a/test cases/common/166 external program shebang parsing/input.txt b/test cases/common/163 external program shebang parsing/input.txt index 40e30d4..40e30d4 100644 --- a/test cases/common/166 external program shebang parsing/input.txt +++ b/test cases/common/163 external program shebang parsing/input.txt diff --git a/test cases/common/166 external program shebang parsing/main.c b/test cases/common/163 external program shebang parsing/main.c index a90206b..a90206b 100644 --- a/test cases/common/166 external program shebang parsing/main.c +++ b/test cases/common/163 external program shebang parsing/main.c diff --git a/test cases/common/166 external program shebang parsing/meson.build b/test cases/common/163 external program shebang parsing/meson.build index c1cc5af..c1cc5af 100644 --- a/test cases/common/166 external program shebang parsing/meson.build +++ b/test cases/common/163 external program shebang parsing/meson.build diff --git a/test cases/common/166 external program shebang parsing/script.int.in b/test cases/common/163 external program shebang parsing/script.int.in index 77ff909..77ff909 100644 --- a/test cases/common/166 external program shebang parsing/script.int.in +++ b/test cases/common/163 external program shebang parsing/script.int.in diff --git a/test cases/common/167 disabler/meson.build b/test cases/common/164 disabler/meson.build index 1956cd3..1956cd3 100644 --- a/test cases/common/167 disabler/meson.build +++ b/test cases/common/164 disabler/meson.build diff --git a/test cases/common/168 array option/meson.build b/test cases/common/165 array option/meson.build index 034b9a5..034b9a5 100644 --- a/test cases/common/168 array option/meson.build +++ b/test cases/common/165 array option/meson.build diff --git a/test cases/common/168 array option/meson_options.txt b/test cases/common/165 array option/meson_options.txt index 7ed0ac1..7ed0ac1 100644 --- a/test cases/common/168 array option/meson_options.txt +++ b/test cases/common/165 array option/meson_options.txt diff --git a/test cases/common/169 custom target template substitution/checkcopy.py b/test cases/common/166 custom target template substitution/checkcopy.py index ab9f436..ab9f436 100644 --- a/test cases/common/169 custom target template substitution/checkcopy.py +++ b/test cases/common/166 custom target template substitution/checkcopy.py diff --git a/test cases/common/169 custom target template substitution/foo.c.in b/test cases/common/166 custom target template substitution/foo.c.in index d53846f..d53846f 100644 --- a/test cases/common/169 custom target template substitution/foo.c.in +++ b/test cases/common/166 custom target template substitution/foo.c.in diff --git a/test cases/common/169 custom target template substitution/meson.build b/test cases/common/166 custom target template substitution/meson.build index 737408e..737408e 100644 --- a/test cases/common/169 custom target template substitution/meson.build +++ b/test cases/common/166 custom target template substitution/meson.build diff --git a/test cases/common/170 not-found dependency/meson.build b/test cases/common/167 not-found dependency/meson.build index 02072b6..02072b6 100644 --- a/test cases/common/170 not-found dependency/meson.build +++ b/test cases/common/167 not-found dependency/meson.build diff --git a/test cases/common/170 not-found dependency/sub/meson.build b/test cases/common/167 not-found dependency/sub/meson.build index 2a33cae..2a33cae 100644 --- a/test cases/common/170 not-found dependency/sub/meson.build +++ b/test cases/common/167 not-found dependency/sub/meson.build diff --git a/test cases/common/170 not-found dependency/subprojects/trivial/meson.build b/test cases/common/167 not-found dependency/subprojects/trivial/meson.build index 8769c70..8769c70 100644 --- a/test cases/common/170 not-found dependency/subprojects/trivial/meson.build +++ b/test cases/common/167 not-found dependency/subprojects/trivial/meson.build diff --git a/test cases/common/170 not-found dependency/subprojects/trivial/trivial.c b/test cases/common/167 not-found dependency/subprojects/trivial/trivial.c index 35b21e0..35b21e0 100644 --- a/test cases/common/170 not-found dependency/subprojects/trivial/trivial.c +++ b/test cases/common/167 not-found dependency/subprojects/trivial/trivial.c diff --git a/test cases/common/170 not-found dependency/testlib.c b/test cases/common/167 not-found dependency/testlib.c index e69de29..e69de29 100644 --- a/test cases/common/170 not-found dependency/testlib.c +++ b/test cases/common/167 not-found dependency/testlib.c diff --git a/test cases/common/171 subdir if_found/meson.build b/test cases/common/168 subdir if_found/meson.build index 2c640cf..2c640cf 100644 --- a/test cases/common/171 subdir if_found/meson.build +++ b/test cases/common/168 subdir if_found/meson.build diff --git a/test cases/common/171 subdir if_found/subdir/meson.build b/test cases/common/168 subdir if_found/subdir/meson.build index 1030e25..1030e25 100644 --- a/test cases/common/171 subdir if_found/subdir/meson.build +++ b/test cases/common/168 subdir if_found/subdir/meson.build diff --git a/test cases/common/172 default options prefix dependent defaults/meson.build b/test cases/common/169 default options prefix dependent defaults/meson.build index 9ca4ec5..9ca4ec5 100644 --- a/test cases/common/172 default options prefix dependent defaults/meson.build +++ b/test cases/common/169 default options prefix dependent defaults/meson.build diff --git a/test cases/common/19 comparison/meson.build b/test cases/common/17 comparison/meson.build index fb641ed..fb641ed 100644 --- a/test cases/common/19 comparison/meson.build +++ b/test cases/common/17 comparison/meson.build diff --git a/test cases/common/19 comparison/prog.c b/test cases/common/17 comparison/prog.c index 0314ff1..0314ff1 100644 --- a/test cases/common/19 comparison/prog.c +++ b/test cases/common/17 comparison/prog.c diff --git a/test cases/common/173 dependency factory/meson.build b/test cases/common/170 dependency factory/meson.build index 1b8ed17..1b8ed17 100644 --- a/test cases/common/173 dependency factory/meson.build +++ b/test cases/common/170 dependency factory/meson.build diff --git a/test cases/common/174 get project license/bar.c b/test cases/common/171 get project license/bar.c index 864869b..864869b 100644 --- a/test cases/common/174 get project license/bar.c +++ b/test cases/common/171 get project license/bar.c diff --git a/test cases/common/174 get project license/meson.build b/test cases/common/171 get project license/meson.build index 37303e3..37303e3 100644 --- a/test cases/common/174 get project license/meson.build +++ b/test cases/common/171 get project license/meson.build diff --git a/test cases/common/172 yield/meson.build b/test cases/common/172 yield/meson.build new file mode 100644 index 0000000..9b11569 --- /dev/null +++ b/test cases/common/172 yield/meson.build @@ -0,0 +1,7 @@ +project('yield_options', 'c') + +subproject('sub') + +assert(get_option('unshared_option') == 'one', 'Unshared option has wrong value in superproject.') +assert(get_option('shared_option') == 'two', 'Shared option has wrong value in superproject..') +assert(get_option('wrongtype_option') == 'three', 'Wrongtype option has wrong value in superproject..') diff --git a/test cases/common/175 yield/meson_options.txt b/test cases/common/172 yield/meson_options.txt index 36bad4b..9f58fbb 100644 --- a/test cases/common/175 yield/meson_options.txt +++ b/test cases/common/172 yield/meson_options.txt @@ -1,2 +1,3 @@ option('unshared_option', type : 'string', value : 'one') option('shared_option', type : 'string', value : 'two') +option('wrongtype_option', type : 'string', value : 'three') diff --git a/test cases/common/175 yield/subprojects/sub/meson.build b/test cases/common/172 yield/subprojects/sub/meson.build index 3a506e0..832c13c 100644 --- a/test cases/common/175 yield/subprojects/sub/meson.build +++ b/test cases/common/172 yield/subprojects/sub/meson.build @@ -2,3 +2,4 @@ project('subbie', 'c') assert(get_option('unshared_option') == 'three', 'Unshared option has wrong value in subproject.') assert(get_option('shared_option') == 'two', 'Shared option has wrong value in subproject.') +assert(get_option('wrongtype_option') == true, 'Wrongtype option has wrong value in subproject.') diff --git a/test cases/common/175 yield/subprojects/sub/meson_options.txt b/test cases/common/172 yield/subprojects/sub/meson_options.txt index a96c307..101122e 100644 --- a/test cases/common/175 yield/subprojects/sub/meson_options.txt +++ b/test cases/common/172 yield/subprojects/sub/meson_options.txt @@ -1,2 +1,3 @@ option('unshared_option', type : 'string', value : 'three', yield : false) option('shared_option', type : 'string', value : 'four', yield : true) +option('wrongtype_option', type : 'boolean', value : true, yield : true) diff --git a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/a.c b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/a.c index 7ac3e5e..7ac3e5e 100644 --- a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/a.c +++ b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/a.c diff --git a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build index 12f6564..12f6564 100644 --- a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build +++ b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/meson.build diff --git a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here index 8d1c8b6..8d1c8b6 100644 --- a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here +++ b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/alpha/var/subprojects/wrap_files_might_be_here diff --git a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/b.c b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/beta/b.c index a95651b..a95651b 100644 --- a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/b.c +++ b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/beta/b.c diff --git a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/meson.build b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/beta/meson.build index 1720d3e..1720d3e 100644 --- a/test cases/common/176 subproject nested subproject dirs/contrib/subprojects/beta/meson.build +++ b/test cases/common/173 subproject nested subproject dirs/contrib/subprojects/beta/meson.build diff --git a/test cases/common/176 subproject nested subproject dirs/meson.build b/test cases/common/173 subproject nested subproject dirs/meson.build index 875eed3..875eed3 100644 --- a/test cases/common/176 subproject nested subproject dirs/meson.build +++ b/test cases/common/173 subproject nested subproject dirs/meson.build diff --git a/test cases/common/176 subproject nested subproject dirs/prog.c b/test cases/common/173 subproject nested subproject dirs/prog.c index 394f139..394f139 100644 --- a/test cases/common/176 subproject nested subproject dirs/prog.c +++ b/test cases/common/173 subproject nested subproject dirs/prog.c diff --git a/test cases/common/177 preserve gendir/base.inp b/test cases/common/174 preserve gendir/base.inp index df967b9..df967b9 100644 --- a/test cases/common/177 preserve gendir/base.inp +++ b/test cases/common/174 preserve gendir/base.inp diff --git a/test cases/common/177 preserve gendir/com/mesonbuild/subbie.inp b/test cases/common/174 preserve gendir/com/mesonbuild/subbie.inp index df0f4e9..df0f4e9 100644 --- a/test cases/common/177 preserve gendir/com/mesonbuild/subbie.inp +++ b/test cases/common/174 preserve gendir/com/mesonbuild/subbie.inp diff --git a/test cases/common/177 preserve gendir/genprog.py b/test cases/common/174 preserve gendir/genprog.py index 1e10998..1e10998 100755 --- a/test cases/common/177 preserve gendir/genprog.py +++ b/test cases/common/174 preserve gendir/genprog.py diff --git a/test cases/common/177 preserve gendir/meson.build b/test cases/common/174 preserve gendir/meson.build index ce219f0..ce219f0 100644 --- a/test cases/common/177 preserve gendir/meson.build +++ b/test cases/common/174 preserve gendir/meson.build diff --git a/test cases/common/177 preserve gendir/testprog.c b/test cases/common/174 preserve gendir/testprog.c index 46b4602..46b4602 100644 --- a/test cases/common/177 preserve gendir/testprog.c +++ b/test cases/common/174 preserve gendir/testprog.c diff --git a/test cases/common/178 source in dep/bar.cpp b/test cases/common/175 source in dep/bar.cpp index bda8cb6..bda8cb6 100644 --- a/test cases/common/178 source in dep/bar.cpp +++ b/test cases/common/175 source in dep/bar.cpp diff --git a/test cases/common/178 source in dep/foo.c b/test cases/common/175 source in dep/foo.c index 1ecfa8c..1ecfa8c 100644 --- a/test cases/common/178 source in dep/foo.c +++ b/test cases/common/175 source in dep/foo.c diff --git a/test cases/common/178 source in dep/generated/funname b/test cases/common/175 source in dep/generated/funname index 79f3c86..79f3c86 100644 --- a/test cases/common/178 source in dep/generated/funname +++ b/test cases/common/175 source in dep/generated/funname diff --git a/test cases/common/178 source in dep/generated/genheader.py b/test cases/common/175 source in dep/generated/genheader.py index eafc075..eafc075 100755 --- a/test cases/common/178 source in dep/generated/genheader.py +++ b/test cases/common/175 source in dep/generated/genheader.py diff --git a/test cases/common/178 source in dep/generated/main.c b/test cases/common/175 source in dep/generated/main.c index 07e7c93..07e7c93 100644 --- a/test cases/common/178 source in dep/generated/main.c +++ b/test cases/common/175 source in dep/generated/main.c diff --git a/test cases/common/178 source in dep/generated/meson.build b/test cases/common/175 source in dep/generated/meson.build index 2862709..2862709 100644 --- a/test cases/common/178 source in dep/generated/meson.build +++ b/test cases/common/175 source in dep/generated/meson.build diff --git a/test cases/common/178 source in dep/meson.build b/test cases/common/175 source in dep/meson.build index 7111ba1..7111ba1 100644 --- a/test cases/common/178 source in dep/meson.build +++ b/test cases/common/175 source in dep/meson.build diff --git a/test cases/common/175 yield/meson.build b/test cases/common/175 yield/meson.build deleted file mode 100644 index ba3e426..0000000 --- a/test cases/common/175 yield/meson.build +++ /dev/null @@ -1,6 +0,0 @@ -project('yield_options', 'c') - -subproject('sub') - -assert(get_option('unshared_option') == 'one', 'Unshared option has wrong value in superproject.') -assert(get_option('shared_option') == 'two', 'Unshared option has wrong value in superproject..') diff --git a/test cases/common/179 generator link whole/export.h b/test cases/common/176 generator link whole/export.h index f4f6f45..f4f6f45 100644 --- a/test cases/common/179 generator link whole/export.h +++ b/test cases/common/176 generator link whole/export.h diff --git a/test cases/common/179 generator link whole/generator.py b/test cases/common/176 generator link whole/generator.py index 0076b74..0076b74 100755 --- a/test cases/common/179 generator link whole/generator.py +++ b/test cases/common/176 generator link whole/generator.py diff --git a/test cases/common/179 generator link whole/main.c b/test cases/common/176 generator link whole/main.c index acf8717..acf8717 100644 --- a/test cases/common/179 generator link whole/main.c +++ b/test cases/common/176 generator link whole/main.c diff --git a/test cases/common/179 generator link whole/meson.build b/test cases/common/176 generator link whole/meson.build index 30ae9c6..30ae9c6 100644 --- a/test cases/common/179 generator link whole/meson.build +++ b/test cases/common/176 generator link whole/meson.build diff --git a/test cases/common/179 generator link whole/meson_test_function.tmpl b/test cases/common/176 generator link whole/meson_test_function.tmpl index e69de29..e69de29 100644 --- a/test cases/common/179 generator link whole/meson_test_function.tmpl +++ b/test cases/common/176 generator link whole/meson_test_function.tmpl diff --git a/test cases/common/179 generator link whole/pull_meson_test_function.c b/test cases/common/176 generator link whole/pull_meson_test_function.c index c54dda6..c54dda6 100644 --- a/test cases/common/179 generator link whole/pull_meson_test_function.c +++ b/test cases/common/176 generator link whole/pull_meson_test_function.c diff --git a/test cases/common/180 initial c_args/meson.build b/test cases/common/177 initial c_args/meson.build index 169d2bd..169d2bd 100644 --- a/test cases/common/180 initial c_args/meson.build +++ b/test cases/common/177 initial c_args/meson.build diff --git a/test cases/common/180 initial c_args/test_args.txt b/test cases/common/177 initial c_args/test_args.txt index 9a6da06..9a6da06 100644 --- a/test cases/common/180 initial c_args/test_args.txt +++ b/test cases/common/177 initial c_args/test_args.txt diff --git a/test cases/common/181 identical target name in subproject flat layout/foo.c b/test cases/common/178 identical target name in subproject flat layout/foo.c index ed42789..ed42789 100644 --- a/test cases/common/181 identical target name in subproject flat layout/foo.c +++ b/test cases/common/178 identical target name in subproject flat layout/foo.c diff --git a/test cases/common/181 identical target name in subproject flat layout/main.c b/test cases/common/178 identical target name in subproject flat layout/main.c index 6f02aeb..6f02aeb 100644 --- a/test cases/common/181 identical target name in subproject flat layout/main.c +++ b/test cases/common/178 identical target name in subproject flat layout/main.c diff --git a/test cases/common/181 identical target name in subproject flat layout/meson.build b/test cases/common/178 identical target name in subproject flat layout/meson.build index d859fda..d859fda 100644 --- a/test cases/common/181 identical target name in subproject flat layout/meson.build +++ b/test cases/common/178 identical target name in subproject flat layout/meson.build diff --git a/test cases/common/181 identical target name in subproject flat layout/subprojects/subproj/foo.c b/test cases/common/178 identical target name in subproject flat layout/subprojects/subproj/foo.c index f334292..f334292 100644 --- a/test cases/common/181 identical target name in subproject flat layout/subprojects/subproj/foo.c +++ b/test cases/common/178 identical target name in subproject flat layout/subprojects/subproj/foo.c diff --git a/test cases/common/181 identical target name in subproject flat layout/subprojects/subproj/meson.build b/test cases/common/178 identical target name in subproject flat layout/subprojects/subproj/meson.build index c927194..c927194 100644 --- a/test cases/common/181 identical target name in subproject flat layout/subprojects/subproj/meson.build +++ b/test cases/common/178 identical target name in subproject flat layout/subprojects/subproj/meson.build diff --git a/test cases/common/182 as-needed/config.h b/test cases/common/179 as-needed/config.h index b8fb60f..b8fb60f 100644 --- a/test cases/common/182 as-needed/config.h +++ b/test cases/common/179 as-needed/config.h diff --git a/test cases/common/182 as-needed/libA.cpp b/test cases/common/179 as-needed/libA.cpp index 5f45bc0..5f45bc0 100644 --- a/test cases/common/182 as-needed/libA.cpp +++ b/test cases/common/179 as-needed/libA.cpp diff --git a/test cases/common/182 as-needed/libA.h b/test cases/common/179 as-needed/libA.h index 8e76d22..8e76d22 100644 --- a/test cases/common/182 as-needed/libA.h +++ b/test cases/common/179 as-needed/libA.h diff --git a/test cases/common/182 as-needed/libB.cpp b/test cases/common/179 as-needed/libB.cpp index a872394..a872394 100644 --- a/test cases/common/182 as-needed/libB.cpp +++ b/test cases/common/179 as-needed/libB.cpp diff --git a/test cases/common/182 as-needed/main.cpp b/test cases/common/179 as-needed/main.cpp index 191d15c..191d15c 100644 --- a/test cases/common/182 as-needed/main.cpp +++ b/test cases/common/179 as-needed/main.cpp diff --git a/test cases/common/182 as-needed/meson.build b/test cases/common/179 as-needed/meson.build index 3b54aaa..3b54aaa 100644 --- a/test cases/common/182 as-needed/meson.build +++ b/test cases/common/179 as-needed/meson.build diff --git a/test cases/common/20 array/func.c b/test cases/common/18 array/func.c index 7412372..7412372 100644 --- a/test cases/common/20 array/func.c +++ b/test cases/common/18 array/func.c diff --git a/test cases/common/20 array/meson.build b/test cases/common/18 array/meson.build index 0d17374..0d17374 100644 --- a/test cases/common/20 array/meson.build +++ b/test cases/common/18 array/meson.build diff --git a/test cases/common/20 array/prog.c b/test cases/common/18 array/prog.c index ad58a0b..ad58a0b 100644 --- a/test cases/common/20 array/prog.c +++ b/test cases/common/18 array/prog.c diff --git a/test cases/common/183 ndebug if-release enabled/main.c b/test cases/common/180 ndebug if-release enabled/main.c index 984ebca..984ebca 100644 --- a/test cases/common/183 ndebug if-release enabled/main.c +++ b/test cases/common/180 ndebug if-release enabled/main.c diff --git a/test cases/common/183 ndebug if-release enabled/meson.build b/test cases/common/180 ndebug if-release enabled/meson.build index be26375..be26375 100644 --- a/test cases/common/183 ndebug if-release enabled/meson.build +++ b/test cases/common/180 ndebug if-release enabled/meson.build diff --git a/test cases/common/184 ndebug if-release disabled/main.c b/test cases/common/181 ndebug if-release disabled/main.c index cb3ec3f..cb3ec3f 100644 --- a/test cases/common/184 ndebug if-release disabled/main.c +++ b/test cases/common/181 ndebug if-release disabled/main.c diff --git a/test cases/common/184 ndebug if-release disabled/meson.build b/test cases/common/181 ndebug if-release disabled/meson.build index a9a79ea..a9a79ea 100644 --- a/test cases/common/184 ndebug if-release disabled/meson.build +++ b/test cases/common/181 ndebug if-release disabled/meson.build diff --git a/test cases/common/185 subproject version/meson.build b/test cases/common/182 subproject version/meson.build index bd8fc03..bd8fc03 100644 --- a/test cases/common/185 subproject version/meson.build +++ b/test cases/common/182 subproject version/meson.build diff --git a/test cases/common/185 subproject version/subprojects/a/meson.build b/test cases/common/182 subproject version/subprojects/a/meson.build index dae3130..dae3130 100644 --- a/test cases/common/185 subproject version/subprojects/a/meson.build +++ b/test cases/common/182 subproject version/subprojects/a/meson.build diff --git a/test cases/common/186 subdir_done/meson.build b/test cases/common/183 subdir_done/meson.build index 457e613..457e613 100644 --- a/test cases/common/186 subdir_done/meson.build +++ b/test cases/common/183 subdir_done/meson.build diff --git a/test cases/common/187 bothlibraries/libfile.c b/test cases/common/184 bothlibraries/libfile.c index 085ef3b..085ef3b 100644 --- a/test cases/common/187 bothlibraries/libfile.c +++ b/test cases/common/184 bothlibraries/libfile.c diff --git a/test cases/common/187 bothlibraries/main.c b/test cases/common/184 bothlibraries/main.c index 03a8e02..03a8e02 100644 --- a/test cases/common/187 bothlibraries/main.c +++ b/test cases/common/184 bothlibraries/main.c diff --git a/test cases/common/187 bothlibraries/meson.build b/test cases/common/184 bothlibraries/meson.build index 3a13d62..3a13d62 100644 --- a/test cases/common/187 bothlibraries/meson.build +++ b/test cases/common/184 bothlibraries/meson.build diff --git a/test cases/common/187 bothlibraries/mylib.h b/test cases/common/184 bothlibraries/mylib.h index 1038a01..1038a01 100644 --- a/test cases/common/187 bothlibraries/mylib.h +++ b/test cases/common/184 bothlibraries/mylib.h diff --git a/test cases/common/188 escape and unicode/file.c.in b/test cases/common/185 escape and unicode/file.c.in index 413ed42..413ed42 100644 --- a/test cases/common/188 escape and unicode/file.c.in +++ b/test cases/common/185 escape and unicode/file.c.in diff --git a/test cases/common/188 escape and unicode/file.py b/test cases/common/185 escape and unicode/file.py index af67a09..af67a09 100644 --- a/test cases/common/188 escape and unicode/file.py +++ b/test cases/common/185 escape and unicode/file.py diff --git a/test cases/common/188 escape and unicode/find.py b/test cases/common/185 escape and unicode/find.py index 34a3eb8..34a3eb8 100644 --- a/test cases/common/188 escape and unicode/find.py +++ b/test cases/common/185 escape and unicode/find.py diff --git a/test cases/common/188 escape and unicode/fun.c b/test cases/common/185 escape and unicode/fun.c index 8eeb8ea..8eeb8ea 100644 --- a/test cases/common/188 escape and unicode/fun.c +++ b/test cases/common/185 escape and unicode/fun.c diff --git a/test cases/common/188 escape and unicode/main.c b/test cases/common/185 escape and unicode/main.c index 0bcde16..0bcde16 100644 --- a/test cases/common/188 escape and unicode/main.c +++ b/test cases/common/185 escape and unicode/main.c diff --git a/test cases/common/188 escape and unicode/meson.build b/test cases/common/185 escape and unicode/meson.build index 65377b6..65377b6 100644 --- a/test cases/common/188 escape and unicode/meson.build +++ b/test cases/common/185 escape and unicode/meson.build diff --git a/test cases/common/189 has link arg/meson.build b/test cases/common/186 has link arg/meson.build index e166101..e166101 100644 --- a/test cases/common/189 has link arg/meson.build +++ b/test cases/common/186 has link arg/meson.build diff --git a/test cases/common/190 same target name flat layout/foo.c b/test cases/common/187 same target name flat layout/foo.c index ed42789..ed42789 100644 --- a/test cases/common/190 same target name flat layout/foo.c +++ b/test cases/common/187 same target name flat layout/foo.c diff --git a/test cases/common/190 same target name flat layout/main.c b/test cases/common/187 same target name flat layout/main.c index 6f02aeb..6f02aeb 100644 --- a/test cases/common/190 same target name flat layout/main.c +++ b/test cases/common/187 same target name flat layout/main.c diff --git a/test cases/common/190 same target name flat layout/meson.build b/test cases/common/187 same target name flat layout/meson.build index a3c95fa..a3c95fa 100644 --- a/test cases/common/190 same target name flat layout/meson.build +++ b/test cases/common/187 same target name flat layout/meson.build diff --git a/test cases/common/190 same target name flat layout/subdir/foo.c b/test cases/common/187 same target name flat layout/subdir/foo.c index f334292..f334292 100644 --- a/test cases/common/190 same target name flat layout/subdir/foo.c +++ b/test cases/common/187 same target name flat layout/subdir/foo.c diff --git a/test cases/common/190 same target name flat layout/subdir/meson.build b/test cases/common/187 same target name flat layout/subdir/meson.build index 223a5ef..223a5ef 100644 --- a/test cases/common/190 same target name flat layout/subdir/meson.build +++ b/test cases/common/187 same target name flat layout/subdir/meson.build diff --git a/test cases/common/191 find override/meson.build b/test cases/common/188 find override/meson.build index 3b8af80..3b8af80 100644 --- a/test cases/common/191 find override/meson.build +++ b/test cases/common/188 find override/meson.build diff --git a/test cases/common/191 find override/otherdir/main.c b/test cases/common/188 find override/otherdir/main.c index 2cef67c..2cef67c 100644 --- a/test cases/common/191 find override/otherdir/main.c +++ b/test cases/common/188 find override/otherdir/main.c diff --git a/test cases/common/191 find override/otherdir/main2.c b/test cases/common/188 find override/otherdir/main2.c index 6d71688..6d71688 100644 --- a/test cases/common/191 find override/otherdir/main2.c +++ b/test cases/common/188 find override/otherdir/main2.c diff --git a/test cases/common/191 find override/otherdir/meson.build b/test cases/common/188 find override/otherdir/meson.build index dc41f5b..dc41f5b 100644 --- a/test cases/common/191 find override/otherdir/meson.build +++ b/test cases/common/188 find override/otherdir/meson.build diff --git a/test cases/common/191 find override/otherdir/source.desc b/test cases/common/188 find override/otherdir/source.desc index 8b19c9c..8b19c9c 100644 --- a/test cases/common/191 find override/otherdir/source.desc +++ b/test cases/common/188 find override/otherdir/source.desc diff --git a/test cases/common/191 find override/otherdir/source2.desc b/test cases/common/188 find override/otherdir/source2.desc index 965f868..965f868 100644 --- a/test cases/common/191 find override/otherdir/source2.desc +++ b/test cases/common/188 find override/otherdir/source2.desc diff --git a/test cases/common/191 find override/subdir/converter.py b/test cases/common/188 find override/subdir/converter.py index ee2ff85..ee2ff85 100755 --- a/test cases/common/191 find override/subdir/converter.py +++ b/test cases/common/188 find override/subdir/converter.py diff --git a/test cases/common/191 find override/subdir/gencodegen.py.in b/test cases/common/188 find override/subdir/gencodegen.py.in index 57d9c40..57d9c40 100755 --- a/test cases/common/191 find override/subdir/gencodegen.py.in +++ b/test cases/common/188 find override/subdir/gencodegen.py.in diff --git a/test cases/common/191 find override/subdir/meson.build b/test cases/common/188 find override/subdir/meson.build index e5de34d..e5de34d 100644 --- a/test cases/common/191 find override/subdir/meson.build +++ b/test cases/common/188 find override/subdir/meson.build diff --git a/test cases/common/192 partial dependency/declare_dependency/headers/foo.c b/test cases/common/189 partial dependency/declare_dependency/headers/foo.c index 215112c..215112c 100644 --- a/test cases/common/192 partial dependency/declare_dependency/headers/foo.c +++ b/test cases/common/189 partial dependency/declare_dependency/headers/foo.c diff --git a/test cases/common/192 partial dependency/declare_dependency/headers/foo.h b/test cases/common/189 partial dependency/declare_dependency/headers/foo.h index 28c81c9..28c81c9 100644 --- a/test cases/common/192 partial dependency/declare_dependency/headers/foo.h +++ b/test cases/common/189 partial dependency/declare_dependency/headers/foo.h diff --git a/test cases/common/192 partial dependency/declare_dependency/main.c b/test cases/common/189 partial dependency/declare_dependency/main.c index e9ed032..e9ed032 100644 --- a/test cases/common/192 partial dependency/declare_dependency/main.c +++ b/test cases/common/189 partial dependency/declare_dependency/main.c diff --git a/test cases/common/192 partial dependency/declare_dependency/meson.build b/test cases/common/189 partial dependency/declare_dependency/meson.build index 86e2608..86e2608 100644 --- a/test cases/common/192 partial dependency/declare_dependency/meson.build +++ b/test cases/common/189 partial dependency/declare_dependency/meson.build diff --git a/test cases/common/192 partial dependency/declare_dependency/other.c b/test cases/common/189 partial dependency/declare_dependency/other.c index b1e199e..b1e199e 100644 --- a/test cases/common/192 partial dependency/declare_dependency/other.c +++ b/test cases/common/189 partial dependency/declare_dependency/other.c diff --git a/test cases/common/192 partial dependency/meson.build b/test cases/common/189 partial dependency/meson.build index e908487..e908487 100644 --- a/test cases/common/192 partial dependency/meson.build +++ b/test cases/common/189 partial dependency/meson.build diff --git a/test cases/common/21 includedir/include/func.h b/test cases/common/19 includedir/include/func.h index 29ebd0b..29ebd0b 100644 --- a/test cases/common/21 includedir/include/func.h +++ b/test cases/common/19 includedir/include/func.h diff --git a/test cases/common/21 includedir/meson.build b/test cases/common/19 includedir/meson.build index 17eec0e..17eec0e 100644 --- a/test cases/common/21 includedir/meson.build +++ b/test cases/common/19 includedir/meson.build diff --git a/test cases/common/21 includedir/src/func.c b/test cases/common/19 includedir/src/func.c index 193edbb..193edbb 100644 --- a/test cases/common/21 includedir/src/func.c +++ b/test cases/common/19 includedir/src/func.c diff --git a/test cases/common/21 includedir/src/meson.build b/test cases/common/19 includedir/src/meson.build index 87bd224..87bd224 100644 --- a/test cases/common/21 includedir/src/meson.build +++ b/test cases/common/19 includedir/src/meson.build diff --git a/test cases/common/21 includedir/src/prog.c b/test cases/common/19 includedir/src/prog.c index c26b9b3..c26b9b3 100644 --- a/test cases/common/21 includedir/src/prog.c +++ b/test cases/common/19 includedir/src/prog.c diff --git a/test cases/common/193 openmp/main.c b/test cases/common/190 openmp/main.c index cc81f48..cc81f48 100644 --- a/test cases/common/193 openmp/main.c +++ b/test cases/common/190 openmp/main.c diff --git a/test cases/common/193 openmp/main.cpp b/test cases/common/190 openmp/main.cpp index b12be3f..b12be3f 100644 --- a/test cases/common/193 openmp/main.cpp +++ b/test cases/common/190 openmp/main.cpp diff --git a/test cases/common/193 openmp/main.f90 b/test cases/common/190 openmp/main.f90 index c062d86..c062d86 100644 --- a/test cases/common/193 openmp/main.f90 +++ b/test cases/common/190 openmp/main.f90 diff --git a/test cases/common/193 openmp/meson.build b/test cases/common/190 openmp/meson.build index a05ca59..a05ca59 100644 --- a/test cases/common/193 openmp/meson.build +++ b/test cases/common/190 openmp/meson.build diff --git a/test cases/common/194 same target name/file.c b/test cases/common/191 same target name/file.c index 6f1c172..6f1c172 100644 --- a/test cases/common/194 same target name/file.c +++ b/test cases/common/191 same target name/file.c diff --git a/test cases/common/194 same target name/meson.build b/test cases/common/191 same target name/meson.build index 4e585d5..4e585d5 100644 --- a/test cases/common/194 same target name/meson.build +++ b/test cases/common/191 same target name/meson.build diff --git a/test cases/common/194 same target name/sub/file2.c b/test cases/common/191 same target name/sub/file2.c index a5e453d..a5e453d 100644 --- a/test cases/common/194 same target name/sub/file2.c +++ b/test cases/common/191 same target name/sub/file2.c diff --git a/test cases/common/194 same target name/sub/meson.build b/test cases/common/191 same target name/sub/meson.build index 610a4a3..610a4a3 100644 --- a/test cases/common/194 same target name/sub/meson.build +++ b/test cases/common/191 same target name/sub/meson.build diff --git a/test cases/common/195 test depends/gen.py b/test cases/common/192 test depends/gen.py index ee4ed98..ee4ed98 100755 --- a/test cases/common/195 test depends/gen.py +++ b/test cases/common/192 test depends/gen.py diff --git a/test cases/common/195 test depends/main.c b/test cases/common/192 test depends/main.c index 78f2de1..78f2de1 100644 --- a/test cases/common/195 test depends/main.c +++ b/test cases/common/192 test depends/main.c diff --git a/test cases/common/195 test depends/meson.build b/test cases/common/192 test depends/meson.build index 888c451..888c451 100644 --- a/test cases/common/195 test depends/meson.build +++ b/test cases/common/192 test depends/meson.build diff --git a/test cases/common/195 test depends/test.py b/test cases/common/192 test depends/test.py index 5b9f65c..5b9f65c 100755 --- a/test cases/common/195 test depends/test.py +++ b/test cases/common/192 test depends/test.py diff --git a/test cases/common/196 args flattening/meson.build b/test cases/common/193 args flattening/meson.build index 6da2e8f..6da2e8f 100644 --- a/test cases/common/196 args flattening/meson.build +++ b/test cases/common/193 args flattening/meson.build diff --git a/test cases/common/197 dict/meson.build b/test cases/common/194 dict/meson.build index e1ee2e3..41eea31 100644 --- a/test cases/common/197 dict/meson.build +++ b/test cases/common/194 dict/meson.build @@ -21,3 +21,15 @@ empty_dict = {} foreach key, value : empty_dict assert(false, 'This dict should be empty') endforeach + +d1 = empty_dict + {'a' : 'b'} +assert(d1 == {'a' : 'b'}, 'dict addition is not working') + +d2 = d1 + {'a' : 'b2', 'c' : 'd'} +assert(d2 == {'a' : 'b2', 'c' : 'd'}, 'dict addition is not working') +assert(d1 == {'a' : 'b'}, 'dict should be immutable') + +d3 = d2 +d3 += {'e' : 'f'} +assert(d3 == {'a' : 'b2', 'c' : 'd', 'e' : 'f'}, 'dict plusassign is not working') +assert(d2 == {'a' : 'b2', 'c' : 'd'}, 'dict should be immutable') diff --git a/test cases/common/197 dict/prog.c b/test cases/common/194 dict/prog.c index bf0999d..bf0999d 100644 --- a/test cases/common/197 dict/prog.c +++ b/test cases/common/194 dict/prog.c diff --git a/test cases/common/198 check header/meson.build b/test cases/common/195 check header/meson.build index 7b343d7..f2f7fa5 100644 --- a/test cases/common/198 check header/meson.build +++ b/test cases/common/195 check header/meson.build @@ -33,8 +33,8 @@ foreach comp : [meson.get_compiler('c'), meson.get_compiler('cpp')] # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80005 # https://github.com/mesonbuild/meson/issues/1458 if host_system == 'linux' - assert(comp.check_header('linux/if.h', prefix : fallback), - 'Could not find <linux/if.h>') + assert(comp.check_header('linux/socket.h', prefix : fallback), + 'Could not find <linux/socket.h>') if comp.has_header('intrin.h', prefix : fallback) assert(not comp.check_header('intrin.h'), 'intrin.h should not be usable on linux') diff --git a/test cases/common/198 check header/ouagadougou.h b/test cases/common/195 check header/ouagadougou.h index 2f76c49..2f76c49 100644 --- a/test cases/common/198 check header/ouagadougou.h +++ b/test cases/common/195 check header/ouagadougou.h diff --git a/test cases/common/199 install_mode/config.h.in b/test cases/common/196 install_mode/config.h.in index 14a1558..14a1558 100644 --- a/test cases/common/199 install_mode/config.h.in +++ b/test cases/common/196 install_mode/config.h.in diff --git a/test cases/common/199 install_mode/data_source.txt b/test cases/common/196 install_mode/data_source.txt index 0c23cc0..0c23cc0 100644 --- a/test cases/common/199 install_mode/data_source.txt +++ b/test cases/common/196 install_mode/data_source.txt diff --git a/test cases/common/199 install_mode/foo.1 b/test cases/common/196 install_mode/foo.1 index 647c097..647c097 100644 --- a/test cases/common/199 install_mode/foo.1 +++ b/test cases/common/196 install_mode/foo.1 diff --git a/test cases/common/199 install_mode/installed_files.txt b/test cases/common/196 install_mode/installed_files.txt index 00fb231..724d954 100644 --- a/test cases/common/199 install_mode/installed_files.txt +++ b/test cases/common/196 install_mode/installed_files.txt @@ -5,4 +5,5 @@ usr/include/rootdir.h usr/libtest/libstat.a usr/share/man/man1/foo.1.gz usr/share/sub1/second.dat +usr/share/sub2/stub usr/subdir/data.dat diff --git a/test cases/common/199 install_mode/meson.build b/test cases/common/196 install_mode/meson.build index d06371f..18a2948 100644 --- a/test cases/common/199 install_mode/meson.build +++ b/test cases/common/196 install_mode/meson.build @@ -11,6 +11,9 @@ install_subdir('sub1', install_dir : 'share', install_mode : ['rwxr-x--t', 'root']) +install_subdir('sub2', + install_dir : 'share') + # test install_mode in configure_file conf = configuration_data() conf.set('var', 'mystring') diff --git a/test cases/common/199 install_mode/rootdir.h b/test cases/common/196 install_mode/rootdir.h index 72fb132..72fb132 100644 --- a/test cases/common/199 install_mode/rootdir.h +++ b/test cases/common/196 install_mode/rootdir.h diff --git a/test cases/common/199 install_mode/runscript.sh b/test cases/common/196 install_mode/runscript.sh index 8bc5ca6..8bc5ca6 100644 --- a/test cases/common/199 install_mode/runscript.sh +++ b/test cases/common/196 install_mode/runscript.sh diff --git a/test cases/common/199 install_mode/stat.c b/test cases/common/196 install_mode/stat.c index fa76a65..fa76a65 100644 --- a/test cases/common/199 install_mode/stat.c +++ b/test cases/common/196 install_mode/stat.c diff --git a/test cases/common/199 install_mode/sub1/second.dat b/test cases/common/196 install_mode/sub1/second.dat index 48857a8..48857a8 100644 --- a/test cases/common/199 install_mode/sub1/second.dat +++ b/test cases/common/196 install_mode/sub1/second.dat diff --git a/test cases/common/60 install script/no-installed-files b/test cases/common/196 install_mode/sub2/stub index e69de29..e69de29 100644 --- a/test cases/common/60 install script/no-installed-files +++ b/test cases/common/196 install_mode/sub2/stub diff --git a/test cases/common/199 install_mode/trivial.c b/test cases/common/196 install_mode/trivial.c index 24ac454..24ac454 100644 --- a/test cases/common/199 install_mode/trivial.c +++ b/test cases/common/196 install_mode/trivial.c diff --git a/test cases/common/200 subproject array version/meson.build b/test cases/common/197 subproject array version/meson.build index 0870bc4..0870bc4 100644 --- a/test cases/common/200 subproject array version/meson.build +++ b/test cases/common/197 subproject array version/meson.build diff --git a/test cases/common/200 subproject array version/subprojects/foo/meson.build b/test cases/common/197 subproject array version/subprojects/foo/meson.build index f4ff535..f4ff535 100644 --- a/test cases/common/200 subproject array version/subprojects/foo/meson.build +++ b/test cases/common/197 subproject array version/subprojects/foo/meson.build diff --git a/test cases/common/201 feature option/meson.build b/test cases/common/198 feature option/meson.build index ef3fa22..ef3fa22 100644 --- a/test cases/common/201 feature option/meson.build +++ b/test cases/common/198 feature option/meson.build diff --git a/test cases/common/201 feature option/meson_options.txt b/test cases/common/198 feature option/meson_options.txt index 063a35f..063a35f 100644 --- a/test cases/common/201 feature option/meson_options.txt +++ b/test cases/common/198 feature option/meson_options.txt diff --git a/test cases/common/202 feature option disabled/meson.build b/test cases/common/199 feature option disabled/meson.build index 1a83187..1a83187 100644 --- a/test cases/common/202 feature option disabled/meson.build +++ b/test cases/common/199 feature option disabled/meson.build diff --git a/test cases/common/202 feature option disabled/meson_options.txt b/test cases/common/199 feature option disabled/meson_options.txt index 063a35f..063a35f 100644 --- a/test cases/common/202 feature option disabled/meson_options.txt +++ b/test cases/common/199 feature option disabled/meson_options.txt diff --git a/test cases/common/22 header in file list/header.h b/test cases/common/20 header in file list/header.h index 354499a..354499a 100644 --- a/test cases/common/22 header in file list/header.h +++ b/test cases/common/20 header in file list/header.h diff --git a/test cases/common/22 header in file list/meson.build b/test cases/common/20 header in file list/meson.build index 79eec8d..79eec8d 100644 --- a/test cases/common/22 header in file list/meson.build +++ b/test cases/common/20 header in file list/meson.build diff --git a/test cases/common/22 header in file list/prog.c b/test cases/common/20 header in file list/prog.c index fbedab8..fbedab8 100644 --- a/test cases/common/22 header in file list/prog.c +++ b/test cases/common/20 header in file list/prog.c diff --git a/test cases/common/203 static threads/lib1.c b/test cases/common/200 static threads/lib1.c index 1aa786c..1aa786c 100644 --- a/test cases/common/203 static threads/lib1.c +++ b/test cases/common/200 static threads/lib1.c diff --git a/test cases/common/203 static threads/lib2.c b/test cases/common/200 static threads/lib2.c index e988814..e988814 100644 --- a/test cases/common/203 static threads/lib2.c +++ b/test cases/common/200 static threads/lib2.c diff --git a/test cases/common/203 static threads/meson.build b/test cases/common/200 static threads/meson.build index 4279200..4279200 100644 --- a/test cases/common/203 static threads/meson.build +++ b/test cases/common/200 static threads/meson.build diff --git a/test cases/common/203 static threads/prog.c b/test cases/common/200 static threads/prog.c index 14a7c76..14a7c76 100644 --- a/test cases/common/203 static threads/prog.c +++ b/test cases/common/200 static threads/prog.c diff --git a/test cases/common/205 generator in subdir/com/mesonbuild/genprog.py b/test cases/common/201 generator in subdir/com/mesonbuild/genprog.py index 1e10998..1e10998 100644 --- a/test cases/common/205 generator in subdir/com/mesonbuild/genprog.py +++ b/test cases/common/201 generator in subdir/com/mesonbuild/genprog.py diff --git a/test cases/common/205 generator in subdir/com/mesonbuild/meson.build b/test cases/common/201 generator in subdir/com/mesonbuild/meson.build index 4808743..4808743 100644 --- a/test cases/common/205 generator in subdir/com/mesonbuild/meson.build +++ b/test cases/common/201 generator in subdir/com/mesonbuild/meson.build diff --git a/test cases/common/205 generator in subdir/com/mesonbuild/subbie.inp b/test cases/common/201 generator in subdir/com/mesonbuild/subbie.inp index df0f4e9..df0f4e9 100644 --- a/test cases/common/205 generator in subdir/com/mesonbuild/subbie.inp +++ b/test cases/common/201 generator in subdir/com/mesonbuild/subbie.inp diff --git a/test cases/common/205 generator in subdir/com/mesonbuild/testprog.c b/test cases/common/201 generator in subdir/com/mesonbuild/testprog.c index 58867ad..58867ad 100644 --- a/test cases/common/205 generator in subdir/com/mesonbuild/testprog.c +++ b/test cases/common/201 generator in subdir/com/mesonbuild/testprog.c diff --git a/test cases/common/205 generator in subdir/meson.build b/test cases/common/201 generator in subdir/meson.build index 9b8eb7c..9b8eb7c 100644 --- a/test cases/common/205 generator in subdir/meson.build +++ b/test cases/common/201 generator in subdir/meson.build diff --git a/test cases/common/23 global arg/meson.build b/test cases/common/21 global arg/meson.build index d7fd428..d7fd428 100644 --- a/test cases/common/23 global arg/meson.build +++ b/test cases/common/21 global arg/meson.build diff --git a/test cases/common/23 global arg/prog.c b/test cases/common/21 global arg/prog.c index ace5a0a..ace5a0a 100644 --- a/test cases/common/23 global arg/prog.c +++ b/test cases/common/21 global arg/prog.c diff --git a/test cases/common/23 global arg/prog.cc b/test cases/common/21 global arg/prog.cc index 0ffd85e..0ffd85e 100644 --- a/test cases/common/23 global arg/prog.cc +++ b/test cases/common/21 global arg/prog.cc diff --git a/test cases/common/24 target arg/func.c b/test cases/common/22 target arg/func.c index 9b3fe5d..9b3fe5d 100644 --- a/test cases/common/24 target arg/func.c +++ b/test cases/common/22 target arg/func.c diff --git a/test cases/common/24 target arg/func2.c b/test cases/common/22 target arg/func2.c index d3e91a5..d3e91a5 100644 --- a/test cases/common/24 target arg/func2.c +++ b/test cases/common/22 target arg/func2.c diff --git a/test cases/common/24 target arg/meson.build b/test cases/common/22 target arg/meson.build index 11ac006..11ac006 100644 --- a/test cases/common/24 target arg/meson.build +++ b/test cases/common/22 target arg/meson.build diff --git a/test cases/common/24 target arg/prog.cc b/test cases/common/22 target arg/prog.cc index d1893ba..d1893ba 100644 --- a/test cases/common/24 target arg/prog.cc +++ b/test cases/common/22 target arg/prog.cc diff --git a/test cases/common/24 target arg/prog2.cc b/test cases/common/22 target arg/prog2.cc index ef2fc4b..ef2fc4b 100644 --- a/test cases/common/24 target arg/prog2.cc +++ b/test cases/common/22 target arg/prog2.cc diff --git a/test cases/common/25 object extraction/lib.c b/test cases/common/23 object extraction/lib.c index 652f4eb..652f4eb 100644 --- a/test cases/common/25 object extraction/lib.c +++ b/test cases/common/23 object extraction/lib.c diff --git a/test cases/common/25 object extraction/lib2.c b/test cases/common/23 object extraction/lib2.c index c30dde2..c30dde2 100644 --- a/test cases/common/25 object extraction/lib2.c +++ b/test cases/common/23 object extraction/lib2.c diff --git a/test cases/common/25 object extraction/main.c b/test cases/common/23 object extraction/main.c index 394f139..394f139 100644 --- a/test cases/common/25 object extraction/main.c +++ b/test cases/common/23 object extraction/main.c diff --git a/test cases/common/25 object extraction/meson.build b/test cases/common/23 object extraction/meson.build index d99ec84..d99ec84 100644 --- a/test cases/common/25 object extraction/meson.build +++ b/test cases/common/23 object extraction/meson.build diff --git a/test cases/common/25 object extraction/src/lib.c b/test cases/common/23 object extraction/src/lib.c index 652f4eb..652f4eb 100644 --- a/test cases/common/25 object extraction/src/lib.c +++ b/test cases/common/23 object extraction/src/lib.c diff --git a/test cases/common/26 endian/meson.build b/test cases/common/24 endian/meson.build index 80186fe..80186fe 100644 --- a/test cases/common/26 endian/meson.build +++ b/test cases/common/24 endian/meson.build diff --git a/test cases/common/26 endian/prog.c b/test cases/common/24 endian/prog.c index b2a10d0..b2a10d0 100644 --- a/test cases/common/26 endian/prog.c +++ b/test cases/common/24 endian/prog.c diff --git a/test cases/common/27 library versions/installed_files.txt b/test cases/common/25 library versions/installed_files.txt index e10d1dd..e10d1dd 100644 --- a/test cases/common/27 library versions/installed_files.txt +++ b/test cases/common/25 library versions/installed_files.txt diff --git a/test cases/common/27 library versions/lib.c b/test cases/common/25 library versions/lib.c index 67b6f4d..67b6f4d 100644 --- a/test cases/common/27 library versions/lib.c +++ b/test cases/common/25 library versions/lib.c diff --git a/test cases/common/27 library versions/meson.build b/test cases/common/25 library versions/meson.build index 2e2bef7..2e2bef7 100644 --- a/test cases/common/27 library versions/meson.build +++ b/test cases/common/25 library versions/meson.build diff --git a/test cases/common/27 library versions/subdir/meson.build b/test cases/common/25 library versions/subdir/meson.build index a83fdb5..a83fdb5 100644 --- a/test cases/common/27 library versions/subdir/meson.build +++ b/test cases/common/25 library versions/subdir/meson.build diff --git a/test cases/common/28 config subdir/include/config.h.in b/test cases/common/26 config subdir/include/config.h.in index 4c3c62d..4c3c62d 100644 --- a/test cases/common/28 config subdir/include/config.h.in +++ b/test cases/common/26 config subdir/include/config.h.in diff --git a/test cases/common/28 config subdir/include/meson.build b/test cases/common/26 config subdir/include/meson.build index f14111a..f14111a 100644 --- a/test cases/common/28 config subdir/include/meson.build +++ b/test cases/common/26 config subdir/include/meson.build diff --git a/test cases/common/28 config subdir/meson.build b/test cases/common/26 config subdir/meson.build index 25f53db..25f53db 100644 --- a/test cases/common/28 config subdir/meson.build +++ b/test cases/common/26 config subdir/meson.build diff --git a/test cases/common/28 config subdir/src/meson.build b/test cases/common/26 config subdir/src/meson.build index 97598a4..97598a4 100644 --- a/test cases/common/28 config subdir/src/meson.build +++ b/test cases/common/26 config subdir/src/meson.build diff --git a/test cases/common/28 config subdir/src/prog.c b/test cases/common/26 config subdir/src/prog.c index 4c03c20..4c03c20 100644 --- a/test cases/common/28 config subdir/src/prog.c +++ b/test cases/common/26 config subdir/src/prog.c diff --git a/test cases/common/29 pipeline/input_src.dat b/test cases/common/27 pipeline/input_src.dat index 7412372..7412372 100644 --- a/test cases/common/29 pipeline/input_src.dat +++ b/test cases/common/27 pipeline/input_src.dat diff --git a/test cases/common/29 pipeline/meson.build b/test cases/common/27 pipeline/meson.build index 200a6d8..200a6d8 100644 --- a/test cases/common/29 pipeline/meson.build +++ b/test cases/common/27 pipeline/meson.build diff --git a/test cases/common/29 pipeline/prog.c b/test cases/common/27 pipeline/prog.c index 175a90d..175a90d 100644 --- a/test cases/common/29 pipeline/prog.c +++ b/test cases/common/27 pipeline/prog.c diff --git a/test cases/common/29 pipeline/srcgen.c b/test cases/common/27 pipeline/srcgen.c index ceb9ecc..ceb9ecc 100644 --- a/test cases/common/29 pipeline/srcgen.c +++ b/test cases/common/27 pipeline/srcgen.c diff --git a/test cases/common/30 pipeline/meson.build b/test cases/common/28 pipeline/meson.build index 0a430bd..0a430bd 100644 --- a/test cases/common/30 pipeline/meson.build +++ b/test cases/common/28 pipeline/meson.build diff --git a/test cases/common/30 pipeline/src/input_src.dat b/test cases/common/28 pipeline/src/input_src.dat index 354499a..354499a 100644 --- a/test cases/common/30 pipeline/src/input_src.dat +++ b/test cases/common/28 pipeline/src/input_src.dat diff --git a/test cases/common/30 pipeline/src/meson.build b/test cases/common/28 pipeline/src/meson.build index 4e9ac11..4e9ac11 100644 --- a/test cases/common/30 pipeline/src/meson.build +++ b/test cases/common/28 pipeline/src/meson.build diff --git a/test cases/common/30 pipeline/src/prog.c b/test cases/common/28 pipeline/src/prog.c index 29396b9..29396b9 100644 --- a/test cases/common/30 pipeline/src/prog.c +++ b/test cases/common/28 pipeline/src/prog.c diff --git a/test cases/common/30 pipeline/src/srcgen.c b/test cases/common/28 pipeline/src/srcgen.c index 26761d2..26761d2 100644 --- a/test cases/common/30 pipeline/src/srcgen.c +++ b/test cases/common/28 pipeline/src/srcgen.c diff --git a/test cases/common/31 find program/meson.build b/test cases/common/29 find program/meson.build index ba5386d..ba5386d 100644 --- a/test cases/common/31 find program/meson.build +++ b/test cases/common/29 find program/meson.build diff --git a/test cases/common/31 find program/source.in b/test cases/common/29 find program/source.in index 5c2fa9b..5c2fa9b 100644 --- a/test cases/common/31 find program/source.in +++ b/test cases/common/29 find program/source.in diff --git a/test cases/common/32 multiline string/meson.build b/test cases/common/30 multiline string/meson.build index 262cb15..262cb15 100644 --- a/test cases/common/32 multiline string/meson.build +++ b/test cases/common/30 multiline string/meson.build diff --git a/test cases/common/33 try compile/invalid.c b/test cases/common/31 try compile/invalid.c index b623bf8..b623bf8 100644 --- a/test cases/common/33 try compile/invalid.c +++ b/test cases/common/31 try compile/invalid.c diff --git a/test cases/common/33 try compile/meson.build b/test cases/common/31 try compile/meson.build index 09ca395..09ca395 100644 --- a/test cases/common/33 try compile/meson.build +++ b/test cases/common/31 try compile/meson.build diff --git a/test cases/common/33 try compile/valid.c b/test cases/common/31 try compile/valid.c index 3757f5a..3757f5a 100644 --- a/test cases/common/33 try compile/valid.c +++ b/test cases/common/31 try compile/valid.c diff --git a/test cases/common/34 compiler id/meson.build b/test cases/common/32 compiler id/meson.build index 2b5c445..2b5c445 100644 --- a/test cases/common/34 compiler id/meson.build +++ b/test cases/common/32 compiler id/meson.build diff --git a/test cases/common/35 sizeof/config.h.in b/test cases/common/33 sizeof/config.h.in index a442e8a..a442e8a 100644 --- a/test cases/common/35 sizeof/config.h.in +++ b/test cases/common/33 sizeof/config.h.in diff --git a/test cases/common/35 sizeof/meson.build b/test cases/common/33 sizeof/meson.build index 9de5b78..9de5b78 100644 --- a/test cases/common/35 sizeof/meson.build +++ b/test cases/common/33 sizeof/meson.build diff --git a/test cases/common/35 sizeof/prog.c.in b/test cases/common/33 sizeof/prog.c.in index 85b1229..85b1229 100644 --- a/test cases/common/35 sizeof/prog.c.in +++ b/test cases/common/33 sizeof/prog.c.in diff --git a/test cases/common/36 define10/config.h.in b/test cases/common/34 define10/config.h.in index dc77346..dc77346 100644 --- a/test cases/common/36 define10/config.h.in +++ b/test cases/common/34 define10/config.h.in diff --git a/test cases/common/36 define10/meson.build b/test cases/common/34 define10/meson.build index a28e7e4..a28e7e4 100644 --- a/test cases/common/36 define10/meson.build +++ b/test cases/common/34 define10/meson.build diff --git a/test cases/common/36 define10/prog.c b/test cases/common/34 define10/prog.c index 10e94f1..10e94f1 100644 --- a/test cases/common/36 define10/prog.c +++ b/test cases/common/34 define10/prog.c diff --git a/test cases/common/37 has header/meson.build b/test cases/common/35 has header/meson.build index b53849c..b53849c 100644 --- a/test cases/common/37 has header/meson.build +++ b/test cases/common/35 has header/meson.build diff --git a/test cases/common/37 has header/ouagadougou.h b/test cases/common/35 has header/ouagadougou.h index 2f76c49..2f76c49 100644 --- a/test cases/common/37 has header/ouagadougou.h +++ b/test cases/common/35 has header/ouagadougou.h diff --git a/test cases/common/38 run program/get-version.py b/test cases/common/36 run program/get-version.py index a22d559..a22d559 100644 --- a/test cases/common/38 run program/get-version.py +++ b/test cases/common/36 run program/get-version.py diff --git a/test cases/common/38 run program/meson.build b/test cases/common/36 run program/meson.build index a05cea3..a05cea3 100644 --- a/test cases/common/38 run program/meson.build +++ b/test cases/common/36 run program/meson.build diff --git a/test cases/common/38 run program/scripts/hello.bat b/test cases/common/36 run program/scripts/hello.bat index cbc346b..cbc346b 100644 --- a/test cases/common/38 run program/scripts/hello.bat +++ b/test cases/common/36 run program/scripts/hello.bat diff --git a/test cases/common/38 run program/scripts/hello.sh b/test cases/common/36 run program/scripts/hello.sh index 2a22daa..2a22daa 100755 --- a/test cases/common/38 run program/scripts/hello.sh +++ b/test cases/common/36 run program/scripts/hello.sh diff --git a/test cases/common/39 tryrun/error.c b/test cases/common/37 tryrun/error.c index 80eeb5d..80eeb5d 100644 --- a/test cases/common/39 tryrun/error.c +++ b/test cases/common/37 tryrun/error.c diff --git a/test cases/common/39 tryrun/meson.build b/test cases/common/37 tryrun/meson.build index c64446f..c64446f 100644 --- a/test cases/common/39 tryrun/meson.build +++ b/test cases/common/37 tryrun/meson.build diff --git a/test cases/common/39 tryrun/no_compile.c b/test cases/common/37 tryrun/no_compile.c index 86b67ac..86b67ac 100644 --- a/test cases/common/39 tryrun/no_compile.c +++ b/test cases/common/37 tryrun/no_compile.c diff --git a/test cases/common/39 tryrun/ok.c b/test cases/common/37 tryrun/ok.c index 4111c74..4111c74 100644 --- a/test cases/common/39 tryrun/ok.c +++ b/test cases/common/37 tryrun/ok.c diff --git a/test cases/common/40 logic ops/meson.build b/test cases/common/38 logic ops/meson.build index 897054e..897054e 100644 --- a/test cases/common/40 logic ops/meson.build +++ b/test cases/common/38 logic ops/meson.build diff --git a/test cases/common/42 string operations/meson.build b/test cases/common/39 string operations/meson.build index 6596142..6596142 100644 --- a/test cases/common/42 string operations/meson.build +++ b/test cases/common/39 string operations/meson.build diff --git a/test cases/common/43 has function/meson.build b/test cases/common/40 has function/meson.build index eb30acd..eb30acd 100644 --- a/test cases/common/43 has function/meson.build +++ b/test cases/common/40 has function/meson.build diff --git a/test cases/common/41 elif/meson.build b/test cases/common/41 elif/meson.build deleted file mode 100644 index d37df00..0000000 --- a/test cases/common/41 elif/meson.build +++ /dev/null @@ -1,28 +0,0 @@ -project('elseif', 'c') - -t = true -f = false - -if true - message('Ok.') -elif true - error('Error') -else - error('Error') -endif - -if f - error('Error.') -elif t - message('Ok') -else - error('Error') -endif - -if f - error('Error.') -elif false - error('Error') -else - message('Ok') -endif diff --git a/test cases/common/44 has member/meson.build b/test cases/common/41 has member/meson.build index 4e61956..4e61956 100644 --- a/test cases/common/44 has member/meson.build +++ b/test cases/common/41 has member/meson.build diff --git a/test cases/common/45 alignment/meson.build b/test cases/common/42 alignment/meson.build index a9bd65b..a9bd65b 100644 --- a/test cases/common/45 alignment/meson.build +++ b/test cases/common/42 alignment/meson.build diff --git a/test cases/common/46 library chain/installed_files.txt b/test cases/common/43 library chain/installed_files.txt index c7dab9f..c7dab9f 100644 --- a/test cases/common/46 library chain/installed_files.txt +++ b/test cases/common/43 library chain/installed_files.txt diff --git a/test cases/common/46 library chain/main.c b/test cases/common/43 library chain/main.c index 7b015b7..7b015b7 100644 --- a/test cases/common/46 library chain/main.c +++ b/test cases/common/43 library chain/main.c diff --git a/test cases/common/46 library chain/meson.build b/test cases/common/43 library chain/meson.build index 77528d7..77528d7 100644 --- a/test cases/common/46 library chain/meson.build +++ b/test cases/common/43 library chain/meson.build diff --git a/test cases/common/46 library chain/subdir/lib1.c b/test cases/common/43 library chain/subdir/lib1.c index 499ef82..499ef82 100644 --- a/test cases/common/46 library chain/subdir/lib1.c +++ b/test cases/common/43 library chain/subdir/lib1.c diff --git a/test cases/common/46 library chain/subdir/meson.build b/test cases/common/43 library chain/subdir/meson.build index ab71bda..ab71bda 100644 --- a/test cases/common/46 library chain/subdir/meson.build +++ b/test cases/common/43 library chain/subdir/meson.build diff --git a/test cases/common/46 library chain/subdir/subdir2/lib2.c b/test cases/common/43 library chain/subdir/subdir2/lib2.c index 34fadf2..34fadf2 100644 --- a/test cases/common/46 library chain/subdir/subdir2/lib2.c +++ b/test cases/common/43 library chain/subdir/subdir2/lib2.c diff --git a/test cases/common/46 library chain/subdir/subdir2/meson.build b/test cases/common/43 library chain/subdir/subdir2/meson.build index befd94d..befd94d 100644 --- a/test cases/common/46 library chain/subdir/subdir2/meson.build +++ b/test cases/common/43 library chain/subdir/subdir2/meson.build diff --git a/test cases/common/46 library chain/subdir/subdir3/lib3.c b/test cases/common/43 library chain/subdir/subdir3/lib3.c index 7bd88af..7bd88af 100644 --- a/test cases/common/46 library chain/subdir/subdir3/lib3.c +++ b/test cases/common/43 library chain/subdir/subdir3/lib3.c diff --git a/test cases/common/46 library chain/subdir/subdir3/meson.build b/test cases/common/43 library chain/subdir/subdir3/meson.build index 7bd249a..7bd249a 100644 --- a/test cases/common/46 library chain/subdir/subdir3/meson.build +++ b/test cases/common/43 library chain/subdir/subdir3/meson.build diff --git a/test cases/common/47 options/meson.build b/test cases/common/44 options/meson.build index f177aa4..f177aa4 100644 --- a/test cases/common/47 options/meson.build +++ b/test cases/common/44 options/meson.build diff --git a/test cases/common/47 options/meson_options.txt b/test cases/common/44 options/meson_options.txt index 4e1c8d8..4e1c8d8 100644 --- a/test cases/common/47 options/meson_options.txt +++ b/test cases/common/44 options/meson_options.txt diff --git a/test cases/common/48 test args/cmd_args.c b/test cases/common/45 test args/cmd_args.c index 545b795..545b795 100644 --- a/test cases/common/48 test args/cmd_args.c +++ b/test cases/common/45 test args/cmd_args.c diff --git a/test cases/common/48 test args/copyfile.py b/test cases/common/45 test args/copyfile.py index ff42ac3..ff42ac3 100644 --- a/test cases/common/48 test args/copyfile.py +++ b/test cases/common/45 test args/copyfile.py diff --git a/test cases/common/48 test args/env2vars.c b/test cases/common/45 test args/env2vars.c index 19250a8..19250a8 100644 --- a/test cases/common/48 test args/env2vars.c +++ b/test cases/common/45 test args/env2vars.c diff --git a/test cases/common/48 test args/envvars.c b/test cases/common/45 test args/envvars.c index 627e413..627e413 100644 --- a/test cases/common/48 test args/envvars.c +++ b/test cases/common/45 test args/envvars.c diff --git a/test cases/common/48 test args/meson.build b/test cases/common/45 test args/meson.build index 81d3491..81d3491 100644 --- a/test cases/common/48 test args/meson.build +++ b/test cases/common/45 test args/meson.build diff --git a/test cases/common/48 test args/tester.c b/test cases/common/45 test args/tester.c index 419277e..419277e 100644 --- a/test cases/common/48 test args/tester.c +++ b/test cases/common/45 test args/tester.c diff --git a/test cases/common/48 test args/tester.py b/test cases/common/45 test args/tester.py index 0b4010a..0b4010a 100755 --- a/test cases/common/48 test args/tester.py +++ b/test cases/common/45 test args/tester.py diff --git a/test cases/common/48 test args/testfile.txt b/test cases/common/45 test args/testfile.txt index 12f00e9..12f00e9 100644 --- a/test cases/common/48 test args/testfile.txt +++ b/test cases/common/45 test args/testfile.txt diff --git a/test cases/common/49 subproject/installed_files.txt b/test cases/common/46 subproject/installed_files.txt index dc09fb7..dc09fb7 100644 --- a/test cases/common/49 subproject/installed_files.txt +++ b/test cases/common/46 subproject/installed_files.txt diff --git a/test cases/common/49 subproject/meson.build b/test cases/common/46 subproject/meson.build index c6ec116..c6ec116 100644 --- a/test cases/common/49 subproject/meson.build +++ b/test cases/common/46 subproject/meson.build diff --git a/test cases/common/49 subproject/subprojects/sublib/include/subdefs.h b/test cases/common/46 subproject/subprojects/sublib/include/subdefs.h index 681c7b8..681c7b8 100644 --- a/test cases/common/49 subproject/subprojects/sublib/include/subdefs.h +++ b/test cases/common/46 subproject/subprojects/sublib/include/subdefs.h diff --git a/test cases/common/49 subproject/subprojects/sublib/meson.build b/test cases/common/46 subproject/subprojects/sublib/meson.build index acaf1bf..acaf1bf 100644 --- a/test cases/common/49 subproject/subprojects/sublib/meson.build +++ b/test cases/common/46 subproject/subprojects/sublib/meson.build diff --git a/test cases/common/49 subproject/subprojects/sublib/simpletest.c b/test cases/common/46 subproject/subprojects/sublib/simpletest.c index 3801a40..3801a40 100644 --- a/test cases/common/49 subproject/subprojects/sublib/simpletest.c +++ b/test cases/common/46 subproject/subprojects/sublib/simpletest.c diff --git a/test cases/common/49 subproject/subprojects/sublib/sublib.c b/test cases/common/46 subproject/subprojects/sublib/sublib.c index c13326b..c13326b 100644 --- a/test cases/common/49 subproject/subprojects/sublib/sublib.c +++ b/test cases/common/46 subproject/subprojects/sublib/sublib.c diff --git a/test cases/common/49 subproject/user.c b/test cases/common/46 subproject/user.c index cfde532..cfde532 100644 --- a/test cases/common/49 subproject/user.c +++ b/test cases/common/46 subproject/user.c diff --git a/test cases/common/50 subproject options/meson.build b/test cases/common/47 subproject options/meson.build index d4598b6..d4598b6 100644 --- a/test cases/common/50 subproject options/meson.build +++ b/test cases/common/47 subproject options/meson.build diff --git a/test cases/common/50 subproject options/meson_options.txt b/test cases/common/47 subproject options/meson_options.txt index c295ddd..c295ddd 100644 --- a/test cases/common/50 subproject options/meson_options.txt +++ b/test cases/common/47 subproject options/meson_options.txt diff --git a/test cases/common/50 subproject options/subprojects/subproject/meson.build b/test cases/common/47 subproject options/subprojects/subproject/meson.build index 5000b86..5000b86 100644 --- a/test cases/common/50 subproject options/subprojects/subproject/meson.build +++ b/test cases/common/47 subproject options/subprojects/subproject/meson.build diff --git a/test cases/common/50 subproject options/subprojects/subproject/meson_options.txt b/test cases/common/47 subproject options/subprojects/subproject/meson_options.txt index ac78533..ac78533 100644 --- a/test cases/common/50 subproject options/subprojects/subproject/meson_options.txt +++ b/test cases/common/47 subproject options/subprojects/subproject/meson_options.txt diff --git a/test cases/common/51 pkgconfig-gen/dependencies/exposed.c b/test cases/common/48 pkgconfig-gen/dependencies/exposed.c index 005202e..005202e 100644 --- a/test cases/common/51 pkgconfig-gen/dependencies/exposed.c +++ b/test cases/common/48 pkgconfig-gen/dependencies/exposed.c diff --git a/test cases/common/51 pkgconfig-gen/dependencies/internal.c b/test cases/common/48 pkgconfig-gen/dependencies/internal.c index 1a41b11..1a41b11 100644 --- a/test cases/common/51 pkgconfig-gen/dependencies/internal.c +++ b/test cases/common/48 pkgconfig-gen/dependencies/internal.c diff --git a/test cases/common/51 pkgconfig-gen/dependencies/meson.build b/test cases/common/48 pkgconfig-gen/dependencies/meson.build index 047e7e7..047e7e7 100644 --- a/test cases/common/51 pkgconfig-gen/dependencies/meson.build +++ b/test cases/common/48 pkgconfig-gen/dependencies/meson.build diff --git a/test cases/common/51 pkgconfig-gen/installed_files.txt b/test cases/common/48 pkgconfig-gen/installed_files.txt index 3c44d28..3c44d28 100644 --- a/test cases/common/51 pkgconfig-gen/installed_files.txt +++ b/test cases/common/48 pkgconfig-gen/installed_files.txt diff --git a/test cases/common/51 pkgconfig-gen/meson.build b/test cases/common/48 pkgconfig-gen/meson.build index 7e6c670..7e6c670 100644 --- a/test cases/common/51 pkgconfig-gen/meson.build +++ b/test cases/common/48 pkgconfig-gen/meson.build diff --git a/test cases/common/51 pkgconfig-gen/simple.c b/test cases/common/48 pkgconfig-gen/simple.c index e8a6d83..e8a6d83 100644 --- a/test cases/common/51 pkgconfig-gen/simple.c +++ b/test cases/common/48 pkgconfig-gen/simple.c diff --git a/test cases/common/51 pkgconfig-gen/simple.h b/test cases/common/48 pkgconfig-gen/simple.h index bb52e6d..bb52e6d 100644 --- a/test cases/common/51 pkgconfig-gen/simple.h +++ b/test cases/common/48 pkgconfig-gen/simple.h diff --git a/test cases/common/52 custom install dirs/datafile.cat b/test cases/common/49 custom install dirs/datafile.cat index 53d81fc..53d81fc 100644 --- a/test cases/common/52 custom install dirs/datafile.cat +++ b/test cases/common/49 custom install dirs/datafile.cat diff --git a/test cases/common/52 custom install dirs/installed_files.txt b/test cases/common/49 custom install dirs/installed_files.txt index 0cc533a..0cc533a 100644 --- a/test cases/common/52 custom install dirs/installed_files.txt +++ b/test cases/common/49 custom install dirs/installed_files.txt diff --git a/test cases/common/52 custom install dirs/meson.build b/test cases/common/49 custom install dirs/meson.build index 494ff0e..494ff0e 100644 --- a/test cases/common/52 custom install dirs/meson.build +++ b/test cases/common/49 custom install dirs/meson.build diff --git a/test cases/common/52 custom install dirs/prog.1 b/test cases/common/49 custom install dirs/prog.1 index 08ef7da..08ef7da 100644 --- a/test cases/common/52 custom install dirs/prog.1 +++ b/test cases/common/49 custom install dirs/prog.1 diff --git a/test cases/common/52 custom install dirs/prog.c b/test cases/common/49 custom install dirs/prog.c index 0f0061d..0f0061d 100644 --- a/test cases/common/52 custom install dirs/prog.c +++ b/test cases/common/49 custom install dirs/prog.c diff --git a/test cases/common/52 custom install dirs/sample.h b/test cases/common/49 custom install dirs/sample.h index dc030da..dc030da 100644 --- a/test cases/common/52 custom install dirs/sample.h +++ b/test cases/common/49 custom install dirs/sample.h diff --git a/test cases/common/52 custom install dirs/subdir/datafile.dog b/test cases/common/49 custom install dirs/subdir/datafile.dog index 7a5bcb7..7a5bcb7 100644 --- a/test cases/common/52 custom install dirs/subdir/datafile.dog +++ b/test cases/common/49 custom install dirs/subdir/datafile.dog diff --git a/test cases/common/53 subproject subproject/meson.build b/test cases/common/50 subproject subproject/meson.build index f7df361..f7df361 100644 --- a/test cases/common/53 subproject subproject/meson.build +++ b/test cases/common/50 subproject subproject/meson.build diff --git a/test cases/common/53 subproject subproject/prog.c b/test cases/common/50 subproject subproject/prog.c index 394f139..394f139 100644 --- a/test cases/common/53 subproject subproject/prog.c +++ b/test cases/common/50 subproject subproject/prog.c diff --git a/test cases/common/53 subproject subproject/subprojects/a/a.c b/test cases/common/50 subproject subproject/subprojects/a/a.c index 7ac3e5e..7ac3e5e 100644 --- a/test cases/common/53 subproject subproject/subprojects/a/a.c +++ b/test cases/common/50 subproject subproject/subprojects/a/a.c diff --git a/test cases/common/53 subproject subproject/subprojects/a/meson.build b/test cases/common/50 subproject subproject/subprojects/a/meson.build index f0dfc44..f0dfc44 100644 --- a/test cases/common/53 subproject subproject/subprojects/a/meson.build +++ b/test cases/common/50 subproject subproject/subprojects/a/meson.build diff --git a/test cases/common/53 subproject subproject/subprojects/b/b.c b/test cases/common/50 subproject subproject/subprojects/b/b.c index a95651b..a95651b 100644 --- a/test cases/common/53 subproject subproject/subprojects/b/b.c +++ b/test cases/common/50 subproject subproject/subprojects/b/b.c diff --git a/test cases/common/53 subproject subproject/subprojects/b/meson.build b/test cases/common/50 subproject subproject/subprojects/b/meson.build index e7af606..e7af606 100644 --- a/test cases/common/53 subproject subproject/subprojects/b/meson.build +++ b/test cases/common/50 subproject subproject/subprojects/b/meson.build diff --git a/test cases/common/54 same file name/d1/file.c b/test cases/common/51 same file name/d1/file.c index 8084d73..8084d73 100644 --- a/test cases/common/54 same file name/d1/file.c +++ b/test cases/common/51 same file name/d1/file.c diff --git a/test cases/common/54 same file name/d2/file.c b/test cases/common/51 same file name/d2/file.c index d1444a2..d1444a2 100644 --- a/test cases/common/54 same file name/d2/file.c +++ b/test cases/common/51 same file name/d2/file.c diff --git a/test cases/common/54 same file name/meson.build b/test cases/common/51 same file name/meson.build index 3f351af..3f351af 100644 --- a/test cases/common/54 same file name/meson.build +++ b/test cases/common/51 same file name/meson.build diff --git a/test cases/common/54 same file name/prog.c b/test cases/common/51 same file name/prog.c index 3441288..3441288 100644 --- a/test cases/common/54 same file name/prog.c +++ b/test cases/common/51 same file name/prog.c diff --git a/test cases/common/55 file grabber/a.c b/test cases/common/52 file grabber/a.c index bee8ad7..bee8ad7 100644 --- a/test cases/common/55 file grabber/a.c +++ b/test cases/common/52 file grabber/a.c diff --git a/test cases/common/55 file grabber/b.c b/test cases/common/52 file grabber/b.c index 0fdd162..0fdd162 100644 --- a/test cases/common/55 file grabber/b.c +++ b/test cases/common/52 file grabber/b.c diff --git a/test cases/common/55 file grabber/c.c b/test cases/common/52 file grabber/c.c index 63f951c..63f951c 100644 --- a/test cases/common/55 file grabber/c.c +++ b/test cases/common/52 file grabber/c.c diff --git a/test cases/common/55 file grabber/grabber.bat b/test cases/common/52 file grabber/grabber.bat index 8660314..8660314 100644 --- a/test cases/common/55 file grabber/grabber.bat +++ b/test cases/common/52 file grabber/grabber.bat diff --git a/test cases/common/55 file grabber/grabber.sh b/test cases/common/52 file grabber/grabber.sh index 5e8f4b9..5e8f4b9 100755 --- a/test cases/common/55 file grabber/grabber.sh +++ b/test cases/common/52 file grabber/grabber.sh diff --git a/test cases/common/55 file grabber/grabber2.bat b/test cases/common/52 file grabber/grabber2.bat index d1a3f98..d1a3f98 100644 --- a/test cases/common/55 file grabber/grabber2.bat +++ b/test cases/common/52 file grabber/grabber2.bat diff --git a/test cases/common/55 file grabber/meson.build b/test cases/common/52 file grabber/meson.build index e332c0b..e332c0b 100644 --- a/test cases/common/55 file grabber/meson.build +++ b/test cases/common/52 file grabber/meson.build diff --git a/test cases/common/55 file grabber/prog.c b/test cases/common/52 file grabber/prog.c index 3524f60..3524f60 100644 --- a/test cases/common/55 file grabber/prog.c +++ b/test cases/common/52 file grabber/prog.c diff --git a/test cases/common/55 file grabber/subdir/meson.build b/test cases/common/52 file grabber/subdir/meson.build index 230d6f7..230d6f7 100644 --- a/test cases/common/55 file grabber/subdir/meson.build +++ b/test cases/common/52 file grabber/subdir/meson.build diff --git a/test cases/common/55 file grabber/subdir/suba.c b/test cases/common/52 file grabber/subdir/suba.c index bee8ad7..bee8ad7 100644 --- a/test cases/common/55 file grabber/subdir/suba.c +++ b/test cases/common/52 file grabber/subdir/suba.c diff --git a/test cases/common/55 file grabber/subdir/subb.c b/test cases/common/52 file grabber/subdir/subb.c index 0fdd162..0fdd162 100644 --- a/test cases/common/55 file grabber/subdir/subb.c +++ b/test cases/common/52 file grabber/subdir/subb.c diff --git a/test cases/common/55 file grabber/subdir/subc.c b/test cases/common/52 file grabber/subdir/subc.c index 63f951c..63f951c 100644 --- a/test cases/common/55 file grabber/subdir/subc.c +++ b/test cases/common/52 file grabber/subdir/subc.c diff --git a/test cases/common/55 file grabber/subdir/subprog.c b/test cases/common/52 file grabber/subdir/subprog.c index 3524f60..3524f60 100644 --- a/test cases/common/55 file grabber/subdir/subprog.c +++ b/test cases/common/52 file grabber/subdir/subprog.c diff --git a/test cases/common/56 custom target/data_source.txt b/test cases/common/53 custom target/data_source.txt index 0c23cc0..0c23cc0 100644 --- a/test cases/common/56 custom target/data_source.txt +++ b/test cases/common/53 custom target/data_source.txt diff --git a/test cases/common/56 custom target/depfile/dep.py b/test cases/common/53 custom target/depfile/dep.py index aff325b..aff325b 100755 --- a/test cases/common/56 custom target/depfile/dep.py +++ b/test cases/common/53 custom target/depfile/dep.py diff --git a/test cases/common/56 custom target/depfile/meson.build b/test cases/common/53 custom target/depfile/meson.build index 46bca74..46bca74 100644 --- a/test cases/common/56 custom target/depfile/meson.build +++ b/test cases/common/53 custom target/depfile/meson.build diff --git a/test cases/common/56 custom target/installed_files.txt b/test cases/common/53 custom target/installed_files.txt index d90a6b0..d90a6b0 100644 --- a/test cases/common/56 custom target/installed_files.txt +++ b/test cases/common/53 custom target/installed_files.txt diff --git a/test cases/common/56 custom target/meson.build b/test cases/common/53 custom target/meson.build index 2e6f69c..2e6f69c 100644 --- a/test cases/common/56 custom target/meson.build +++ b/test cases/common/53 custom target/meson.build diff --git a/test cases/common/56 custom target/my_compiler.py b/test cases/common/53 custom target/my_compiler.py index f46d23a..f46d23a 100755 --- a/test cases/common/56 custom target/my_compiler.py +++ b/test cases/common/53 custom target/my_compiler.py diff --git a/test cases/common/57 custom target chain/data_source.txt b/test cases/common/54 custom target chain/data_source.txt index 0c23cc0..0c23cc0 100644 --- a/test cases/common/57 custom target chain/data_source.txt +++ b/test cases/common/54 custom target chain/data_source.txt diff --git a/test cases/common/57 custom target chain/installed_files.txt b/test cases/common/54 custom target chain/installed_files.txt index 7feb072..7feb072 100644 --- a/test cases/common/57 custom target chain/installed_files.txt +++ b/test cases/common/54 custom target chain/installed_files.txt diff --git a/test cases/common/57 custom target chain/meson.build b/test cases/common/54 custom target chain/meson.build index 138f795..138f795 100644 --- a/test cases/common/57 custom target chain/meson.build +++ b/test cases/common/54 custom target chain/meson.build diff --git a/test cases/common/57 custom target chain/my_compiler.py b/test cases/common/54 custom target chain/my_compiler.py index 9cf4425..9cf4425 100755 --- a/test cases/common/57 custom target chain/my_compiler.py +++ b/test cases/common/54 custom target chain/my_compiler.py diff --git a/test cases/common/57 custom target chain/my_compiler2.py b/test cases/common/54 custom target chain/my_compiler2.py index 0191f3f..0191f3f 100755 --- a/test cases/common/57 custom target chain/my_compiler2.py +++ b/test cases/common/54 custom target chain/my_compiler2.py diff --git a/test cases/common/57 custom target chain/usetarget/meson.build b/test cases/common/54 custom target chain/usetarget/meson.build index 9aece8c..9aece8c 100644 --- a/test cases/common/57 custom target chain/usetarget/meson.build +++ b/test cases/common/54 custom target chain/usetarget/meson.build diff --git a/test cases/common/57 custom target chain/usetarget/myexe.c b/test cases/common/54 custom target chain/usetarget/myexe.c index f9874fd..f9874fd 100644 --- a/test cases/common/57 custom target chain/usetarget/myexe.c +++ b/test cases/common/54 custom target chain/usetarget/myexe.c diff --git a/test cases/common/57 custom target chain/usetarget/subcomp.py b/test cases/common/54 custom target chain/usetarget/subcomp.py index b5f6eb0..b5f6eb0 100755 --- a/test cases/common/57 custom target chain/usetarget/subcomp.py +++ b/test cases/common/54 custom target chain/usetarget/subcomp.py diff --git a/test cases/common/58 run target/check_exists.py b/test cases/common/55 run target/check_exists.py index b6fc967..b6fc967 100755 --- a/test cases/common/58 run target/check_exists.py +++ b/test cases/common/55 run target/check_exists.py diff --git a/test cases/common/58 run target/configure.in b/test cases/common/55 run target/configure.in index 0d42d04..0d42d04 100755 --- a/test cases/common/58 run target/configure.in +++ b/test cases/common/55 run target/configure.in diff --git a/test cases/common/58 run target/converter.py b/test cases/common/55 run target/converter.py index 8dd31fe..8dd31fe 100644 --- a/test cases/common/58 run target/converter.py +++ b/test cases/common/55 run target/converter.py diff --git a/test cases/common/58 run target/fakeburner.py b/test cases/common/55 run target/fakeburner.py index da3d0ac..da3d0ac 100755 --- a/test cases/common/58 run target/fakeburner.py +++ b/test cases/common/55 run target/fakeburner.py diff --git a/test cases/common/58 run target/helloprinter.c b/test cases/common/55 run target/helloprinter.c index 4a6e0ac..4a6e0ac 100644 --- a/test cases/common/58 run target/helloprinter.c +++ b/test cases/common/55 run target/helloprinter.c diff --git a/test cases/common/58 run target/meson.build b/test cases/common/55 run target/meson.build index 93a4ad0..93a4ad0 100644 --- a/test cases/common/58 run target/meson.build +++ b/test cases/common/55 run target/meson.build diff --git a/test cases/common/58 run target/scripts/script.sh b/test cases/common/55 run target/scripts/script.sh index 0adf263..0adf263 100755 --- a/test cases/common/58 run target/scripts/script.sh +++ b/test cases/common/55 run target/scripts/script.sh diff --git a/test cases/common/59 object generator/meson.build b/test cases/common/56 object generator/meson.build index e20da6f..e20da6f 100644 --- a/test cases/common/59 object generator/meson.build +++ b/test cases/common/56 object generator/meson.build diff --git a/test cases/common/59 object generator/obj_generator.py b/test cases/common/56 object generator/obj_generator.py index a33872a..a33872a 100755 --- a/test cases/common/59 object generator/obj_generator.py +++ b/test cases/common/56 object generator/obj_generator.py diff --git a/test cases/common/59 object generator/prog.c b/test cases/common/56 object generator/prog.c index 60459d6..60459d6 100644 --- a/test cases/common/59 object generator/prog.c +++ b/test cases/common/56 object generator/prog.c diff --git a/test cases/common/59 object generator/source.c b/test cases/common/56 object generator/source.c index 7779b33..7779b33 100644 --- a/test cases/common/59 object generator/source.c +++ b/test cases/common/56 object generator/source.c diff --git a/test cases/common/59 object generator/source2.c b/test cases/common/56 object generator/source2.c index 29aad40..29aad40 100644 --- a/test cases/common/59 object generator/source2.c +++ b/test cases/common/56 object generator/source2.c diff --git a/test cases/common/59 object generator/source3.c b/test cases/common/56 object generator/source3.c index 1580f1e..1580f1e 100644 --- a/test cases/common/59 object generator/source3.c +++ b/test cases/common/56 object generator/source3.c diff --git a/test cases/common/60 install script/installed_files.txt b/test cases/common/57 install script/installed_files.txt index 94c1fed..94c1fed 100644 --- a/test cases/common/60 install script/installed_files.txt +++ b/test cases/common/57 install script/installed_files.txt diff --git a/test cases/common/60 install script/meson.build b/test cases/common/57 install script/meson.build index 6351518..6351518 100644 --- a/test cases/common/60 install script/meson.build +++ b/test cases/common/57 install script/meson.build diff --git a/test cases/common/60 install script/myinstall.py b/test cases/common/57 install script/myinstall.py index 812561e..812561e 100644 --- a/test cases/common/60 install script/myinstall.py +++ b/test cases/common/57 install script/myinstall.py diff --git a/test cases/common/64 custom header generator/somefile.txt b/test cases/common/57 install script/no-installed-files index e69de29..e69de29 100644 --- a/test cases/common/64 custom header generator/somefile.txt +++ b/test cases/common/57 install script/no-installed-files diff --git a/test cases/common/60 install script/prog.c b/test cases/common/57 install script/prog.c index 06bc6b1..06bc6b1 100644 --- a/test cases/common/60 install script/prog.c +++ b/test cases/common/57 install script/prog.c diff --git a/test cases/common/60 install script/src/meson.build b/test cases/common/57 install script/src/meson.build index b23574a..b23574a 100644 --- a/test cases/common/60 install script/src/meson.build +++ b/test cases/common/57 install script/src/meson.build diff --git a/test cases/common/60 install script/src/myinstall.py b/test cases/common/57 install script/src/myinstall.py index 3b7ce37..3b7ce37 100644 --- a/test cases/common/60 install script/src/myinstall.py +++ b/test cases/common/57 install script/src/myinstall.py diff --git a/test cases/common/61 custom target source output/generator.py b/test cases/common/58 custom target source output/generator.py index 3464b0a..3464b0a 100755 --- a/test cases/common/61 custom target source output/generator.py +++ b/test cases/common/58 custom target source output/generator.py diff --git a/test cases/common/61 custom target source output/main.c b/test cases/common/58 custom target source output/main.c index 2813c39..2813c39 100644 --- a/test cases/common/61 custom target source output/main.c +++ b/test cases/common/58 custom target source output/main.c diff --git a/test cases/common/61 custom target source output/meson.build b/test cases/common/58 custom target source output/meson.build index f9d039d..f9d039d 100644 --- a/test cases/common/61 custom target source output/meson.build +++ b/test cases/common/58 custom target source output/meson.build diff --git a/test cases/common/62 exe static shared/meson.build b/test cases/common/59 exe static shared/meson.build index 2888882..2888882 100644 --- a/test cases/common/62 exe static shared/meson.build +++ b/test cases/common/59 exe static shared/meson.build diff --git a/test cases/common/62 exe static shared/prog.c b/test cases/common/59 exe static shared/prog.c index 26603b6..26603b6 100644 --- a/test cases/common/62 exe static shared/prog.c +++ b/test cases/common/59 exe static shared/prog.c diff --git a/test cases/common/62 exe static shared/shlib2.c b/test cases/common/59 exe static shared/shlib2.c index 12bc913..12bc913 100644 --- a/test cases/common/62 exe static shared/shlib2.c +++ b/test cases/common/59 exe static shared/shlib2.c diff --git a/test cases/common/62 exe static shared/stat.c b/test cases/common/59 exe static shared/stat.c index 680ed92..680ed92 100644 --- a/test cases/common/62 exe static shared/stat.c +++ b/test cases/common/59 exe static shared/stat.c diff --git a/test cases/common/62 exe static shared/stat2.c b/test cases/common/59 exe static shared/stat2.c index 4ae3775..4ae3775 100644 --- a/test cases/common/62 exe static shared/stat2.c +++ b/test cases/common/59 exe static shared/stat2.c diff --git a/test cases/common/62 exe static shared/subdir/exports.h b/test cases/common/59 exe static shared/subdir/exports.h index c89ccb2..c89ccb2 100644 --- a/test cases/common/62 exe static shared/subdir/exports.h +++ b/test cases/common/59 exe static shared/subdir/exports.h diff --git a/test cases/common/62 exe static shared/subdir/meson.build b/test cases/common/59 exe static shared/subdir/meson.build index 2b7393b..2b7393b 100644 --- a/test cases/common/62 exe static shared/subdir/meson.build +++ b/test cases/common/59 exe static shared/subdir/meson.build diff --git a/test cases/common/62 exe static shared/subdir/shlib.c b/test cases/common/59 exe static shared/subdir/shlib.c index 002c83f..002c83f 100644 --- a/test cases/common/62 exe static shared/subdir/shlib.c +++ b/test cases/common/59 exe static shared/subdir/shlib.c diff --git a/test cases/common/63 array methods/meson.build b/test cases/common/60 array methods/meson.build index cdda41d..cdda41d 100644 --- a/test cases/common/63 array methods/meson.build +++ b/test cases/common/60 array methods/meson.build diff --git a/test cases/common/64 custom header generator/input.def b/test cases/common/61 custom header generator/input.def index 573541a..573541a 100644 --- a/test cases/common/64 custom header generator/input.def +++ b/test cases/common/61 custom header generator/input.def diff --git a/test cases/common/64 custom header generator/makeheader.py b/test cases/common/61 custom header generator/makeheader.py index f156834..f156834 100644 --- a/test cases/common/64 custom header generator/makeheader.py +++ b/test cases/common/61 custom header generator/makeheader.py diff --git a/test cases/common/64 custom header generator/meson.build b/test cases/common/61 custom header generator/meson.build index d43915a..d43915a 100644 --- a/test cases/common/64 custom header generator/meson.build +++ b/test cases/common/61 custom header generator/meson.build diff --git a/test cases/common/64 custom header generator/prog.c b/test cases/common/61 custom header generator/prog.c index 184973a..184973a 100644 --- a/test cases/common/64 custom header generator/prog.c +++ b/test cases/common/61 custom header generator/prog.c diff --git a/test cases/common/66 install subdir/sub2/dircheck/excluded-three.dat b/test cases/common/61 custom header generator/somefile.txt index e69de29..e69de29 100644 --- a/test cases/common/66 install subdir/sub2/dircheck/excluded-three.dat +++ b/test cases/common/61 custom header generator/somefile.txt diff --git a/test cases/common/65 multiple generators/data2.dat b/test cases/common/62 multiple generators/data2.dat index 0cfbf08..0cfbf08 100644 --- a/test cases/common/65 multiple generators/data2.dat +++ b/test cases/common/62 multiple generators/data2.dat diff --git a/test cases/common/65 multiple generators/main.cpp b/test cases/common/62 multiple generators/main.cpp index 5277063..5277063 100644 --- a/test cases/common/65 multiple generators/main.cpp +++ b/test cases/common/62 multiple generators/main.cpp diff --git a/test cases/common/65 multiple generators/meson.build b/test cases/common/62 multiple generators/meson.build index 66f7fa9..66f7fa9 100644 --- a/test cases/common/65 multiple generators/meson.build +++ b/test cases/common/62 multiple generators/meson.build diff --git a/test cases/common/65 multiple generators/mygen.py b/test cases/common/62 multiple generators/mygen.py index 99dc331..99dc331 100755 --- a/test cases/common/65 multiple generators/mygen.py +++ b/test cases/common/62 multiple generators/mygen.py diff --git a/test cases/common/65 multiple generators/subdir/data.dat b/test cases/common/62 multiple generators/subdir/data.dat index d00491f..d00491f 100644 --- a/test cases/common/65 multiple generators/subdir/data.dat +++ b/test cases/common/62 multiple generators/subdir/data.dat diff --git a/test cases/common/65 multiple generators/subdir/meson.build b/test cases/common/62 multiple generators/subdir/meson.build index 2456ecb..2456ecb 100644 --- a/test cases/common/65 multiple generators/subdir/meson.build +++ b/test cases/common/62 multiple generators/subdir/meson.build diff --git a/test cases/common/66 install subdir/installed_files.txt b/test cases/common/63 install subdir/installed_files.txt index 3f561d5..3f561d5 100644 --- a/test cases/common/66 install subdir/installed_files.txt +++ b/test cases/common/63 install subdir/installed_files.txt diff --git a/test cases/common/66 install subdir/meson.build b/test cases/common/63 install subdir/meson.build index 6f92efd..6f92efd 100644 --- a/test cases/common/66 install subdir/meson.build +++ b/test cases/common/63 install subdir/meson.build diff --git a/test cases/common/66 install subdir/nested_elided/sub/dircheck/nineth.dat b/test cases/common/63 install subdir/nested_elided/sub/dircheck/nineth.dat index c4eaca7..c4eaca7 100644 --- a/test cases/common/66 install subdir/nested_elided/sub/dircheck/nineth.dat +++ b/test cases/common/63 install subdir/nested_elided/sub/dircheck/nineth.dat diff --git a/test cases/common/66 install subdir/nested_elided/sub/eighth.dat b/test cases/common/63 install subdir/nested_elided/sub/eighth.dat index fa9b7b7..fa9b7b7 100644 --- a/test cases/common/66 install subdir/nested_elided/sub/eighth.dat +++ b/test cases/common/63 install subdir/nested_elided/sub/eighth.dat diff --git a/test cases/common/66 install subdir/sub/sub1/third.dat b/test cases/common/63 install subdir/sub/sub1/third.dat index 5ccbc43..5ccbc43 100644 --- a/test cases/common/66 install subdir/sub/sub1/third.dat +++ b/test cases/common/63 install subdir/sub/sub1/third.dat diff --git a/test cases/common/66 install subdir/sub1/second.dat b/test cases/common/63 install subdir/sub1/second.dat index 48857a8..48857a8 100644 --- a/test cases/common/66 install subdir/sub1/second.dat +++ b/test cases/common/63 install subdir/sub1/second.dat diff --git a/test cases/common/66 install subdir/sub2/excluded-three.dat b/test cases/common/63 install subdir/sub2/dircheck/excluded-three.dat index e69de29..e69de29 100644 --- a/test cases/common/66 install subdir/sub2/excluded-three.dat +++ b/test cases/common/63 install subdir/sub2/dircheck/excluded-three.dat diff --git a/test cases/common/66 install subdir/sub2/excluded/two.dat b/test cases/common/63 install subdir/sub2/excluded-three.dat index e69de29..e69de29 100644 --- a/test cases/common/66 install subdir/sub2/excluded/two.dat +++ b/test cases/common/63 install subdir/sub2/excluded-three.dat diff --git a/test cases/common/66 install subdir/sub2/one.dat b/test cases/common/63 install subdir/sub2/excluded/two.dat index e69de29..e69de29 100644 --- a/test cases/common/66 install subdir/sub2/one.dat +++ b/test cases/common/63 install subdir/sub2/excluded/two.dat diff --git a/test cases/common/93 private include/stlib/foo1.def b/test cases/common/63 install subdir/sub2/one.dat index e69de29..e69de29 100644 --- a/test cases/common/93 private include/stlib/foo1.def +++ b/test cases/common/63 install subdir/sub2/one.dat diff --git a/test cases/common/66 install subdir/sub_elided/dircheck/fifth.dat b/test cases/common/63 install subdir/sub_elided/dircheck/fifth.dat index b6ca009..b6ca009 100644 --- a/test cases/common/66 install subdir/sub_elided/dircheck/fifth.dat +++ b/test cases/common/63 install subdir/sub_elided/dircheck/fifth.dat diff --git a/test cases/common/66 install subdir/sub_elided/fourth.dat b/test cases/common/63 install subdir/sub_elided/fourth.dat index ca5f26a..ca5f26a 100644 --- a/test cases/common/66 install subdir/sub_elided/fourth.dat +++ b/test cases/common/63 install subdir/sub_elided/fourth.dat diff --git a/test cases/common/66 install subdir/subdir/meson.build b/test cases/common/63 install subdir/subdir/meson.build index 0f81cdb..0f81cdb 100644 --- a/test cases/common/66 install subdir/subdir/meson.build +++ b/test cases/common/63 install subdir/subdir/meson.build diff --git a/test cases/common/66 install subdir/subdir/sub1/data1.dat b/test cases/common/63 install subdir/subdir/sub1/data1.dat index d83c370..d83c370 100644 --- a/test cases/common/66 install subdir/subdir/sub1/data1.dat +++ b/test cases/common/63 install subdir/subdir/sub1/data1.dat diff --git a/test cases/common/66 install subdir/subdir/sub1/sub2/data2.dat b/test cases/common/63 install subdir/subdir/sub1/sub2/data2.dat index 8ce1392..8ce1392 100644 --- a/test cases/common/66 install subdir/subdir/sub1/sub2/data2.dat +++ b/test cases/common/63 install subdir/subdir/sub1/sub2/data2.dat diff --git a/test cases/common/66 install subdir/subdir/sub_elided/dircheck/seventh.dat b/test cases/common/63 install subdir/subdir/sub_elided/dircheck/seventh.dat index ea0b8dc..ea0b8dc 100644 --- a/test cases/common/66 install subdir/subdir/sub_elided/dircheck/seventh.dat +++ b/test cases/common/63 install subdir/subdir/sub_elided/dircheck/seventh.dat diff --git a/test cases/common/66 install subdir/subdir/sub_elided/sixth.dat b/test cases/common/63 install subdir/subdir/sub_elided/sixth.dat index 140f075..140f075 100644 --- a/test cases/common/66 install subdir/subdir/sub_elided/sixth.dat +++ b/test cases/common/63 install subdir/subdir/sub_elided/sixth.dat diff --git a/test cases/common/67 foreach/installed_files.txt b/test cases/common/64 foreach/installed_files.txt index 2930ff0..2930ff0 100644 --- a/test cases/common/67 foreach/installed_files.txt +++ b/test cases/common/64 foreach/installed_files.txt diff --git a/test cases/common/67 foreach/meson.build b/test cases/common/64 foreach/meson.build index e633de8..e633de8 100644 --- a/test cases/common/67 foreach/meson.build +++ b/test cases/common/64 foreach/meson.build diff --git a/test cases/common/67 foreach/prog1.c b/test cases/common/64 foreach/prog1.c index a5ef0f1..a5ef0f1 100644 --- a/test cases/common/67 foreach/prog1.c +++ b/test cases/common/64 foreach/prog1.c diff --git a/test cases/common/67 foreach/prog2.c b/test cases/common/64 foreach/prog2.c index b9fddbe..b9fddbe 100644 --- a/test cases/common/67 foreach/prog2.c +++ b/test cases/common/64 foreach/prog2.c diff --git a/test cases/common/67 foreach/prog3.c b/test cases/common/64 foreach/prog3.c index 5657396..5657396 100644 --- a/test cases/common/67 foreach/prog3.c +++ b/test cases/common/64 foreach/prog3.c diff --git a/test cases/common/68 number arithmetic/meson.build b/test cases/common/65 number arithmetic/meson.build index e31d7e4..e31d7e4 100644 --- a/test cases/common/68 number arithmetic/meson.build +++ b/test cases/common/65 number arithmetic/meson.build diff --git a/test cases/common/69 string arithmetic/meson.build b/test cases/common/66 string arithmetic/meson.build index 59567de..59567de 100644 --- a/test cases/common/69 string arithmetic/meson.build +++ b/test cases/common/66 string arithmetic/meson.build diff --git a/test cases/common/70 array arithmetic/meson.build b/test cases/common/67 array arithmetic/meson.build index 8b8785a..8b8785a 100644 --- a/test cases/common/70 array arithmetic/meson.build +++ b/test cases/common/67 array arithmetic/meson.build diff --git a/test cases/common/71 arithmetic bidmas/meson.build b/test cases/common/68 arithmetic bidmas/meson.build index c7334b4..c7334b4 100644 --- a/test cases/common/71 arithmetic bidmas/meson.build +++ b/test cases/common/68 arithmetic bidmas/meson.build diff --git a/test cases/common/72 build always/main.c b/test cases/common/69 build always/main.c index f8d9ac9..f8d9ac9 100644 --- a/test cases/common/72 build always/main.c +++ b/test cases/common/69 build always/main.c diff --git a/test cases/common/72 build always/meson.build b/test cases/common/69 build always/meson.build index f720c89..f720c89 100644 --- a/test cases/common/72 build always/meson.build +++ b/test cases/common/69 build always/meson.build diff --git a/test cases/common/72 build always/version.c.in b/test cases/common/69 build always/version.c.in index 619e517..619e517 100644 --- a/test cases/common/72 build always/version.c.in +++ b/test cases/common/69 build always/version.c.in diff --git a/test cases/common/72 build always/version.h b/test cases/common/69 build always/version.h index d3fe5c6..d3fe5c6 100644 --- a/test cases/common/72 build always/version.h +++ b/test cases/common/69 build always/version.h diff --git a/test cases/common/72 build always/version_gen.py b/test cases/common/69 build always/version_gen.py index fbe2df9..fbe2df9 100755 --- a/test cases/common/72 build always/version_gen.py +++ b/test cases/common/69 build always/version_gen.py diff --git a/test cases/common/73 vcstag/meson.build b/test cases/common/70 vcstag/meson.build index 7e5983a..7e5983a 100644 --- a/test cases/common/73 vcstag/meson.build +++ b/test cases/common/70 vcstag/meson.build diff --git a/test cases/common/73 vcstag/tagprog.c b/test cases/common/70 vcstag/tagprog.c index 34146b4..34146b4 100644 --- a/test cases/common/73 vcstag/tagprog.c +++ b/test cases/common/70 vcstag/tagprog.c diff --git a/test cases/common/73 vcstag/vcstag.c.in b/test cases/common/70 vcstag/vcstag.c.in index 09192d9..09192d9 100644 --- a/test cases/common/73 vcstag/vcstag.c.in +++ b/test cases/common/70 vcstag/vcstag.c.in diff --git a/test cases/common/74 modules/meson.build b/test cases/common/71 modules/meson.build index e9750cd..e9750cd 100644 --- a/test cases/common/74 modules/meson.build +++ b/test cases/common/71 modules/meson.build diff --git a/test cases/common/75 should fail/failing.c b/test cases/common/72 should fail/failing.c index adada8d..adada8d 100644 --- a/test cases/common/75 should fail/failing.c +++ b/test cases/common/72 should fail/failing.c diff --git a/test cases/common/75 should fail/meson.build b/test cases/common/72 should fail/meson.build index dffbbb3..dffbbb3 100644 --- a/test cases/common/75 should fail/meson.build +++ b/test cases/common/72 should fail/meson.build diff --git a/test cases/common/76 configure file in custom target/inc/confdata.in b/test cases/common/73 configure file in custom target/inc/confdata.in index e44cdea..e44cdea 100644 --- a/test cases/common/76 configure file in custom target/inc/confdata.in +++ b/test cases/common/73 configure file in custom target/inc/confdata.in diff --git a/test cases/common/76 configure file in custom target/inc/meson.build b/test cases/common/73 configure file in custom target/inc/meson.build index 05d2dcb..05d2dcb 100644 --- a/test cases/common/76 configure file in custom target/inc/meson.build +++ b/test cases/common/73 configure file in custom target/inc/meson.build diff --git a/test cases/common/76 configure file in custom target/meson.build b/test cases/common/73 configure file in custom target/meson.build index 0a850a1..0a850a1 100644 --- a/test cases/common/76 configure file in custom target/meson.build +++ b/test cases/common/73 configure file in custom target/meson.build diff --git a/test cases/common/76 configure file in custom target/src/meson.build b/test cases/common/73 configure file in custom target/src/meson.build index e0ab9eb..e0ab9eb 100644 --- a/test cases/common/76 configure file in custom target/src/meson.build +++ b/test cases/common/73 configure file in custom target/src/meson.build diff --git a/test cases/common/76 configure file in custom target/src/mycompiler.py b/test cases/common/73 configure file in custom target/src/mycompiler.py index b00c862..b00c862 100644 --- a/test cases/common/76 configure file in custom target/src/mycompiler.py +++ b/test cases/common/73 configure file in custom target/src/mycompiler.py diff --git a/test cases/common/77 external test program/meson.build b/test cases/common/74 external test program/meson.build index d18ddcd..d18ddcd 100644 --- a/test cases/common/77 external test program/meson.build +++ b/test cases/common/74 external test program/meson.build diff --git a/test cases/common/77 external test program/mytest.py b/test cases/common/74 external test program/mytest.py index 9947773..9947773 100755 --- a/test cases/common/77 external test program/mytest.py +++ b/test cases/common/74 external test program/mytest.py diff --git a/test cases/common/78 ctarget dependency/gen1.py b/test cases/common/75 ctarget dependency/gen1.py index 0fa6ea1..0fa6ea1 100755 --- a/test cases/common/78 ctarget dependency/gen1.py +++ b/test cases/common/75 ctarget dependency/gen1.py diff --git a/test cases/common/78 ctarget dependency/gen2.py b/test cases/common/75 ctarget dependency/gen2.py index b087b02..b087b02 100755 --- a/test cases/common/78 ctarget dependency/gen2.py +++ b/test cases/common/75 ctarget dependency/gen2.py diff --git a/test cases/common/78 ctarget dependency/input.dat b/test cases/common/75 ctarget dependency/input.dat index 7af91e2..7af91e2 100644 --- a/test cases/common/78 ctarget dependency/input.dat +++ b/test cases/common/75 ctarget dependency/input.dat diff --git a/test cases/common/78 ctarget dependency/meson.build b/test cases/common/75 ctarget dependency/meson.build index cd11951..cd11951 100644 --- a/test cases/common/78 ctarget dependency/meson.build +++ b/test cases/common/75 ctarget dependency/meson.build diff --git a/test cases/common/79 shared subproject/a.c b/test cases/common/76 shared subproject/a.c index 6ed96fa..6ed96fa 100644 --- a/test cases/common/79 shared subproject/a.c +++ b/test cases/common/76 shared subproject/a.c diff --git a/test cases/common/79 shared subproject/meson.build b/test cases/common/76 shared subproject/meson.build index 6803d51..6803d51 100644 --- a/test cases/common/79 shared subproject/meson.build +++ b/test cases/common/76 shared subproject/meson.build diff --git a/test cases/common/79 shared subproject/subprojects/B/b.c b/test cases/common/76 shared subproject/subprojects/B/b.c index a1f3a51..a1f3a51 100644 --- a/test cases/common/79 shared subproject/subprojects/B/b.c +++ b/test cases/common/76 shared subproject/subprojects/B/b.c diff --git a/test cases/common/79 shared subproject/subprojects/B/meson.build b/test cases/common/76 shared subproject/subprojects/B/meson.build index 280c60c..280c60c 100644 --- a/test cases/common/79 shared subproject/subprojects/B/meson.build +++ b/test cases/common/76 shared subproject/subprojects/B/meson.build diff --git a/test cases/common/79 shared subproject/subprojects/C/c.c b/test cases/common/76 shared subproject/subprojects/C/c.c index eebfb9f..eebfb9f 100644 --- a/test cases/common/79 shared subproject/subprojects/C/c.c +++ b/test cases/common/76 shared subproject/subprojects/C/c.c diff --git a/test cases/common/79 shared subproject/subprojects/C/meson.build b/test cases/common/76 shared subproject/subprojects/C/meson.build index abf0b1e..abf0b1e 100644 --- a/test cases/common/79 shared subproject/subprojects/C/meson.build +++ b/test cases/common/76 shared subproject/subprojects/C/meson.build diff --git a/test cases/common/80 shared subproject 2/a.c b/test cases/common/77 shared subproject 2/a.c index 6ed96fa..6ed96fa 100644 --- a/test cases/common/80 shared subproject 2/a.c +++ b/test cases/common/77 shared subproject 2/a.c diff --git a/test cases/common/80 shared subproject 2/meson.build b/test cases/common/77 shared subproject 2/meson.build index 0647325..0647325 100644 --- a/test cases/common/80 shared subproject 2/meson.build +++ b/test cases/common/77 shared subproject 2/meson.build diff --git a/test cases/common/80 shared subproject 2/subprojects/B/b.c b/test cases/common/77 shared subproject 2/subprojects/B/b.c index 4c94ee9..4c94ee9 100644 --- a/test cases/common/80 shared subproject 2/subprojects/B/b.c +++ b/test cases/common/77 shared subproject 2/subprojects/B/b.c diff --git a/test cases/common/80 shared subproject 2/subprojects/B/meson.build b/test cases/common/77 shared subproject 2/subprojects/B/meson.build index 280c60c..280c60c 100644 --- a/test cases/common/80 shared subproject 2/subprojects/B/meson.build +++ b/test cases/common/77 shared subproject 2/subprojects/B/meson.build diff --git a/test cases/common/80 shared subproject 2/subprojects/C/c.c b/test cases/common/77 shared subproject 2/subprojects/C/c.c index eebfb9f..eebfb9f 100644 --- a/test cases/common/80 shared subproject 2/subprojects/C/c.c +++ b/test cases/common/77 shared subproject 2/subprojects/C/c.c diff --git a/test cases/common/80 shared subproject 2/subprojects/C/meson.build b/test cases/common/77 shared subproject 2/subprojects/C/meson.build index abf0b1e..abf0b1e 100644 --- a/test cases/common/80 shared subproject 2/subprojects/C/meson.build +++ b/test cases/common/77 shared subproject 2/subprojects/C/meson.build diff --git a/test cases/common/81 file object/lib.c b/test cases/common/78 file object/lib.c index 6f1c172..6f1c172 100644 --- a/test cases/common/81 file object/lib.c +++ b/test cases/common/78 file object/lib.c diff --git a/test cases/common/81 file object/meson.build b/test cases/common/78 file object/meson.build index c3ecb7b..c3ecb7b 100644 --- a/test cases/common/81 file object/meson.build +++ b/test cases/common/78 file object/meson.build diff --git a/test cases/common/81 file object/prog.c b/test cases/common/78 file object/prog.c index 884d678..884d678 100644 --- a/test cases/common/81 file object/prog.c +++ b/test cases/common/78 file object/prog.c diff --git a/test cases/common/81 file object/subdir1/lib.c b/test cases/common/78 file object/subdir1/lib.c index bc1e7b0..bc1e7b0 100644 --- a/test cases/common/81 file object/subdir1/lib.c +++ b/test cases/common/78 file object/subdir1/lib.c diff --git a/test cases/common/81 file object/subdir1/meson.build b/test cases/common/78 file object/subdir1/meson.build index f5066f0..f5066f0 100644 --- a/test cases/common/81 file object/subdir1/meson.build +++ b/test cases/common/78 file object/subdir1/meson.build diff --git a/test cases/common/81 file object/subdir1/prog.c b/test cases/common/78 file object/subdir1/prog.c index 37ccf72..37ccf72 100644 --- a/test cases/common/81 file object/subdir1/prog.c +++ b/test cases/common/78 file object/subdir1/prog.c diff --git a/test cases/common/81 file object/subdir2/lib.c b/test cases/common/78 file object/subdir2/lib.c index cfef4d0..cfef4d0 100644 --- a/test cases/common/81 file object/subdir2/lib.c +++ b/test cases/common/78 file object/subdir2/lib.c diff --git a/test cases/common/81 file object/subdir2/meson.build b/test cases/common/78 file object/subdir2/meson.build index 5886510..5886510 100644 --- a/test cases/common/81 file object/subdir2/meson.build +++ b/test cases/common/78 file object/subdir2/meson.build diff --git a/test cases/common/81 file object/subdir2/prog.c b/test cases/common/78 file object/subdir2/prog.c index 3a90b0a..3a90b0a 100644 --- a/test cases/common/81 file object/subdir2/prog.c +++ b/test cases/common/78 file object/subdir2/prog.c diff --git a/test cases/common/82 custom subproject dir/a.c b/test cases/common/79 custom subproject dir/a.c index 6ed96fa..6ed96fa 100644 --- a/test cases/common/82 custom subproject dir/a.c +++ b/test cases/common/79 custom subproject dir/a.c diff --git a/test cases/common/82 custom subproject dir/custom_subproject_dir/B/b.c b/test cases/common/79 custom subproject dir/custom_subproject_dir/B/b.c index 4c94ee9..4c94ee9 100644 --- a/test cases/common/82 custom subproject dir/custom_subproject_dir/B/b.c +++ b/test cases/common/79 custom subproject dir/custom_subproject_dir/B/b.c diff --git a/test cases/common/82 custom subproject dir/custom_subproject_dir/B/meson.build b/test cases/common/79 custom subproject dir/custom_subproject_dir/B/meson.build index 280c60c..280c60c 100644 --- a/test cases/common/82 custom subproject dir/custom_subproject_dir/B/meson.build +++ b/test cases/common/79 custom subproject dir/custom_subproject_dir/B/meson.build diff --git a/test cases/common/82 custom subproject dir/custom_subproject_dir/C/c.c b/test cases/common/79 custom subproject dir/custom_subproject_dir/C/c.c index eebfb9f..eebfb9f 100644 --- a/test cases/common/82 custom subproject dir/custom_subproject_dir/C/c.c +++ b/test cases/common/79 custom subproject dir/custom_subproject_dir/C/c.c diff --git a/test cases/common/82 custom subproject dir/custom_subproject_dir/C/meson.build b/test cases/common/79 custom subproject dir/custom_subproject_dir/C/meson.build index abf0b1e..abf0b1e 100644 --- a/test cases/common/82 custom subproject dir/custom_subproject_dir/C/meson.build +++ b/test cases/common/79 custom subproject dir/custom_subproject_dir/C/meson.build diff --git a/test cases/common/82 custom subproject dir/meson.build b/test cases/common/79 custom subproject dir/meson.build index d9ba649..d9ba649 100644 --- a/test cases/common/82 custom subproject dir/meson.build +++ b/test cases/common/79 custom subproject dir/meson.build diff --git a/test cases/common/83 has type/meson.build b/test cases/common/80 has type/meson.build index de8dbc8..de8dbc8 100644 --- a/test cases/common/83 has type/meson.build +++ b/test cases/common/80 has type/meson.build diff --git a/test cases/common/84 extract from nested subdir/meson.build b/test cases/common/81 extract from nested subdir/meson.build index 3a42806..3a42806 100644 --- a/test cases/common/84 extract from nested subdir/meson.build +++ b/test cases/common/81 extract from nested subdir/meson.build diff --git a/test cases/common/81 extract from nested subdir/src/first/lib_first.c b/test cases/common/81 extract from nested subdir/src/first/lib_first.c new file mode 100644 index 0000000..3004906 --- /dev/null +++ b/test cases/common/81 extract from nested subdir/src/first/lib_first.c @@ -0,0 +1,3 @@ +int first() { + return 1001; +} diff --git a/test cases/common/84 extract from nested subdir/src/first/meson.build b/test cases/common/81 extract from nested subdir/src/first/meson.build index b97aef4..b97aef4 100644 --- a/test cases/common/84 extract from nested subdir/src/first/meson.build +++ b/test cases/common/81 extract from nested subdir/src/first/meson.build diff --git a/test cases/common/84 extract from nested subdir/src/meson.build b/test cases/common/81 extract from nested subdir/src/meson.build index 3f5ec32..3f5ec32 100644 --- a/test cases/common/84 extract from nested subdir/src/meson.build +++ b/test cases/common/81 extract from nested subdir/src/meson.build diff --git a/test cases/common/84 extract from nested subdir/tst/first/exe_first.c b/test cases/common/81 extract from nested subdir/tst/first/exe_first.c index 4f714df..f6c1f74 100644 --- a/test cases/common/84 extract from nested subdir/tst/first/exe_first.c +++ b/test cases/common/81 extract from nested subdir/tst/first/exe_first.c @@ -1,5 +1,5 @@ int first(void); int main() { - return first() - 1001; + return first() - 1001; } diff --git a/test cases/common/84 extract from nested subdir/tst/first/meson.build b/test cases/common/81 extract from nested subdir/tst/first/meson.build index a6fa7da..a6fa7da 100644 --- a/test cases/common/84 extract from nested subdir/tst/first/meson.build +++ b/test cases/common/81 extract from nested subdir/tst/first/meson.build diff --git a/test cases/common/84 extract from nested subdir/tst/meson.build b/test cases/common/81 extract from nested subdir/tst/meson.build index 3f5ec32..3f5ec32 100644 --- a/test cases/common/84 extract from nested subdir/tst/meson.build +++ b/test cases/common/81 extract from nested subdir/tst/meson.build diff --git a/test cases/common/85 internal dependency/meson.build b/test cases/common/82 internal dependency/meson.build index 6faedb0..6faedb0 100644 --- a/test cases/common/85 internal dependency/meson.build +++ b/test cases/common/82 internal dependency/meson.build diff --git a/test cases/common/85 internal dependency/proj1/include/proj1.h b/test cases/common/82 internal dependency/proj1/include/proj1.h index ded6f75..ded6f75 100644 --- a/test cases/common/85 internal dependency/proj1/include/proj1.h +++ b/test cases/common/82 internal dependency/proj1/include/proj1.h diff --git a/test cases/common/85 internal dependency/proj1/meson.build b/test cases/common/82 internal dependency/proj1/meson.build index 422021e..422021e 100644 --- a/test cases/common/85 internal dependency/proj1/meson.build +++ b/test cases/common/82 internal dependency/proj1/meson.build diff --git a/test cases/common/85 internal dependency/proj1/proj1f1.c b/test cases/common/82 internal dependency/proj1/proj1f1.c index 9077f4f..9077f4f 100644 --- a/test cases/common/85 internal dependency/proj1/proj1f1.c +++ b/test cases/common/82 internal dependency/proj1/proj1f1.c diff --git a/test cases/common/85 internal dependency/proj1/proj1f2.c b/test cases/common/82 internal dependency/proj1/proj1f2.c index 374ee4e..374ee4e 100644 --- a/test cases/common/85 internal dependency/proj1/proj1f2.c +++ b/test cases/common/82 internal dependency/proj1/proj1f2.c diff --git a/test cases/common/85 internal dependency/proj1/proj1f3.c b/test cases/common/82 internal dependency/proj1/proj1f3.c index 8c8fca4..8c8fca4 100644 --- a/test cases/common/85 internal dependency/proj1/proj1f3.c +++ b/test cases/common/82 internal dependency/proj1/proj1f3.c diff --git a/test cases/common/85 internal dependency/src/main.c b/test cases/common/82 internal dependency/src/main.c index 7d50b05..7d50b05 100644 --- a/test cases/common/85 internal dependency/src/main.c +++ b/test cases/common/82 internal dependency/src/main.c diff --git a/test cases/common/85 internal dependency/src/meson.build b/test cases/common/82 internal dependency/src/meson.build index 89f99ab..89f99ab 100644 --- a/test cases/common/85 internal dependency/src/meson.build +++ b/test cases/common/82 internal dependency/src/meson.build diff --git a/test cases/common/86 same basename/exe1.c b/test cases/common/83 same basename/exe1.c index 175a90d..175a90d 100644 --- a/test cases/common/86 same basename/exe1.c +++ b/test cases/common/83 same basename/exe1.c diff --git a/test cases/common/86 same basename/exe2.c b/test cases/common/83 same basename/exe2.c index 56b04cc..56b04cc 100644 --- a/test cases/common/86 same basename/exe2.c +++ b/test cases/common/83 same basename/exe2.c diff --git a/test cases/common/86 same basename/lib.c b/test cases/common/83 same basename/lib.c index 6fd432e..6fd432e 100644 --- a/test cases/common/86 same basename/lib.c +++ b/test cases/common/83 same basename/lib.c diff --git a/test cases/common/86 same basename/meson.build b/test cases/common/83 same basename/meson.build index 856c536..856c536 100644 --- a/test cases/common/86 same basename/meson.build +++ b/test cases/common/83 same basename/meson.build diff --git a/test cases/common/86 same basename/sharedsub/meson.build b/test cases/common/83 same basename/sharedsub/meson.build index 29654a9..29654a9 100644 --- a/test cases/common/86 same basename/sharedsub/meson.build +++ b/test cases/common/83 same basename/sharedsub/meson.build diff --git a/test cases/common/86 same basename/staticsub/meson.build b/test cases/common/83 same basename/staticsub/meson.build index 5e5242e..5e5242e 100644 --- a/test cases/common/86 same basename/staticsub/meson.build +++ b/test cases/common/83 same basename/staticsub/meson.build diff --git a/test cases/common/87 declare dep/entity/entity.h b/test cases/common/84 declare dep/entity/entity.h index c695b14..c695b14 100644 --- a/test cases/common/87 declare dep/entity/entity.h +++ b/test cases/common/84 declare dep/entity/entity.h diff --git a/test cases/common/87 declare dep/entity/entity1.c b/test cases/common/84 declare dep/entity/entity1.c index 204eb8b..204eb8b 100644 --- a/test cases/common/87 declare dep/entity/entity1.c +++ b/test cases/common/84 declare dep/entity/entity1.c diff --git a/test cases/common/87 declare dep/entity/entity2.c b/test cases/common/84 declare dep/entity/entity2.c index f34f546..f34f546 100644 --- a/test cases/common/87 declare dep/entity/entity2.c +++ b/test cases/common/84 declare dep/entity/entity2.c diff --git a/test cases/common/87 declare dep/entity/meson.build b/test cases/common/84 declare dep/entity/meson.build index 3bfe13c..3bfe13c 100644 --- a/test cases/common/87 declare dep/entity/meson.build +++ b/test cases/common/84 declare dep/entity/meson.build diff --git a/test cases/common/87 declare dep/main.c b/test cases/common/84 declare dep/main.c index 4ad9d2a..4ad9d2a 100644 --- a/test cases/common/87 declare dep/main.c +++ b/test cases/common/84 declare dep/main.c diff --git a/test cases/common/87 declare dep/meson.build b/test cases/common/84 declare dep/meson.build index e427def..e427def 100644 --- a/test cases/common/87 declare dep/meson.build +++ b/test cases/common/84 declare dep/meson.build diff --git a/test cases/common/84 extract from nested subdir/src/first/lib_first.c b/test cases/common/84 extract from nested subdir/src/first/lib_first.c deleted file mode 100644 index 01e06b6..0000000 --- a/test cases/common/84 extract from nested subdir/src/first/lib_first.c +++ /dev/null @@ -1,3 +0,0 @@ -int first() { - return 1001; -} diff --git a/test cases/common/88 extract all/extractor.h b/test cases/common/85 extract all/extractor.h index d0917a1..d0917a1 100644 --- a/test cases/common/88 extract all/extractor.h +++ b/test cases/common/85 extract all/extractor.h diff --git a/test cases/common/88 extract all/four.c b/test cases/common/85 extract all/four.c index 5ca6696..5ca6696 100644 --- a/test cases/common/88 extract all/four.c +++ b/test cases/common/85 extract all/four.c diff --git a/test cases/common/88 extract all/meson.build b/test cases/common/85 extract all/meson.build index 4f08a4f..4f08a4f 100644 --- a/test cases/common/88 extract all/meson.build +++ b/test cases/common/85 extract all/meson.build diff --git a/test cases/common/88 extract all/one.c b/test cases/common/85 extract all/one.c index cfb0157..cfb0157 100644 --- a/test cases/common/88 extract all/one.c +++ b/test cases/common/85 extract all/one.c diff --git a/test cases/common/88 extract all/prog.c b/test cases/common/85 extract all/prog.c index 57a4c64..57a4c64 100644 --- a/test cases/common/88 extract all/prog.c +++ b/test cases/common/85 extract all/prog.c diff --git a/test cases/common/88 extract all/three.c b/test cases/common/85 extract all/three.c index c410046..c410046 100644 --- a/test cases/common/88 extract all/three.c +++ b/test cases/common/85 extract all/three.c diff --git a/test cases/common/88 extract all/two.c b/test cases/common/85 extract all/two.c index 3ece512..3ece512 100644 --- a/test cases/common/88 extract all/two.c +++ b/test cases/common/85 extract all/two.c diff --git a/test cases/common/89 add language/meson.build b/test cases/common/86 add language/meson.build index d9bc0fa..d9bc0fa 100644 --- a/test cases/common/89 add language/meson.build +++ b/test cases/common/86 add language/meson.build diff --git a/test cases/common/89 add language/prog.c b/test cases/common/86 add language/prog.c index 9b5685f..9b5685f 100644 --- a/test cases/common/89 add language/prog.c +++ b/test cases/common/86 add language/prog.c diff --git a/test cases/common/89 add language/prog.cc b/test cases/common/86 add language/prog.cc index 03647dd..03647dd 100644 --- a/test cases/common/89 add language/prog.cc +++ b/test cases/common/86 add language/prog.cc diff --git a/test cases/common/90 identical target name in subproject/bar.c b/test cases/common/87 identical target name in subproject/bar.c index 864869b..864869b 100644 --- a/test cases/common/90 identical target name in subproject/bar.c +++ b/test cases/common/87 identical target name in subproject/bar.c diff --git a/test cases/common/90 identical target name in subproject/meson.build b/test cases/common/87 identical target name in subproject/meson.build index e804d3c..e804d3c 100644 --- a/test cases/common/90 identical target name in subproject/meson.build +++ b/test cases/common/87 identical target name in subproject/meson.build diff --git a/test cases/common/90 identical target name in subproject/subprojects/foo/bar.c b/test cases/common/87 identical target name in subproject/subprojects/foo/bar.c index 106005e..106005e 100644 --- a/test cases/common/90 identical target name in subproject/subprojects/foo/bar.c +++ b/test cases/common/87 identical target name in subproject/subprojects/foo/bar.c diff --git a/test cases/common/90 identical target name in subproject/subprojects/foo/meson.build b/test cases/common/87 identical target name in subproject/subprojects/foo/meson.build index 3f22337..3f22337 100644 --- a/test cases/common/90 identical target name in subproject/subprojects/foo/meson.build +++ b/test cases/common/87 identical target name in subproject/subprojects/foo/meson.build diff --git a/test cases/common/91 plusassign/meson.build b/test cases/common/88 plusassign/meson.build index ac477e7..ac477e7 100644 --- a/test cases/common/91 plusassign/meson.build +++ b/test cases/common/88 plusassign/meson.build diff --git a/test cases/common/92 skip subdir/meson.build b/test cases/common/89 skip subdir/meson.build index 30ede0e..30ede0e 100644 --- a/test cases/common/92 skip subdir/meson.build +++ b/test cases/common/89 skip subdir/meson.build diff --git a/test cases/common/92 skip subdir/subdir1/meson.build b/test cases/common/89 skip subdir/subdir1/meson.build index 51cb003..51cb003 100644 --- a/test cases/common/92 skip subdir/subdir1/meson.build +++ b/test cases/common/89 skip subdir/subdir1/meson.build diff --git a/test cases/common/92 skip subdir/subdir1/subdir2/meson.build b/test cases/common/89 skip subdir/subdir1/subdir2/meson.build index e37cad6..e37cad6 100644 --- a/test cases/common/92 skip subdir/subdir1/subdir2/meson.build +++ b/test cases/common/89 skip subdir/subdir1/subdir2/meson.build diff --git a/test cases/common/93 private include/meson.build b/test cases/common/90 private include/meson.build index 2485fbf..2485fbf 100644 --- a/test cases/common/93 private include/meson.build +++ b/test cases/common/90 private include/meson.build diff --git a/test cases/common/93 private include/stlib/compiler.py b/test cases/common/90 private include/stlib/compiler.py index 98dbe46..98dbe46 100755 --- a/test cases/common/93 private include/stlib/compiler.py +++ b/test cases/common/90 private include/stlib/compiler.py diff --git a/test cases/common/93 private include/stlib/foo2.def b/test cases/common/90 private include/stlib/foo1.def index e69de29..e69de29 100644 --- a/test cases/common/93 private include/stlib/foo2.def +++ b/test cases/common/90 private include/stlib/foo1.def diff --git a/test cases/unit/40 rpath order/subprojects/sub1/lib.c b/test cases/common/90 private include/stlib/foo2.def index e69de29..e69de29 100644 --- a/test cases/unit/40 rpath order/subprojects/sub1/lib.c +++ b/test cases/common/90 private include/stlib/foo2.def diff --git a/test cases/common/93 private include/stlib/meson.build b/test cases/common/90 private include/stlib/meson.build index 8d70650..8d70650 100644 --- a/test cases/common/93 private include/stlib/meson.build +++ b/test cases/common/90 private include/stlib/meson.build diff --git a/test cases/common/93 private include/user/libuser.c b/test cases/common/90 private include/user/libuser.c index a74a973..a74a973 100644 --- a/test cases/common/93 private include/user/libuser.c +++ b/test cases/common/90 private include/user/libuser.c diff --git a/test cases/common/93 private include/user/meson.build b/test cases/common/90 private include/user/meson.build index ab88b1d..ab88b1d 100644 --- a/test cases/common/93 private include/user/meson.build +++ b/test cases/common/90 private include/user/meson.build diff --git a/test cases/common/94 default options/meson.build b/test cases/common/91 default options/meson.build index 9f45df0..9f45df0 100644 --- a/test cases/common/94 default options/meson.build +++ b/test cases/common/91 default options/meson.build diff --git a/test cases/common/95 dep fallback/gensrc.py b/test cases/common/92 dep fallback/gensrc.py index ff42ac3..ff42ac3 100644 --- a/test cases/common/95 dep fallback/gensrc.py +++ b/test cases/common/92 dep fallback/gensrc.py diff --git a/test cases/common/95 dep fallback/meson.build b/test cases/common/92 dep fallback/meson.build index a96520e..a96520e 100644 --- a/test cases/common/95 dep fallback/meson.build +++ b/test cases/common/92 dep fallback/meson.build diff --git a/test cases/common/95 dep fallback/subprojects/boblib/bob.c b/test cases/common/92 dep fallback/subprojects/boblib/bob.c index ae0f394..ae0f394 100644 --- a/test cases/common/95 dep fallback/subprojects/boblib/bob.c +++ b/test cases/common/92 dep fallback/subprojects/boblib/bob.c diff --git a/test cases/common/95 dep fallback/subprojects/boblib/bob.h b/test cases/common/92 dep fallback/subprojects/boblib/bob.h index f874ae7..f874ae7 100644 --- a/test cases/common/95 dep fallback/subprojects/boblib/bob.h +++ b/test cases/common/92 dep fallback/subprojects/boblib/bob.h diff --git a/test cases/common/95 dep fallback/subprojects/boblib/genbob.py b/test cases/common/92 dep fallback/subprojects/boblib/genbob.py index 34af779..34af779 100644 --- a/test cases/common/95 dep fallback/subprojects/boblib/genbob.py +++ b/test cases/common/92 dep fallback/subprojects/boblib/genbob.py diff --git a/test cases/common/95 dep fallback/subprojects/boblib/meson.build b/test cases/common/92 dep fallback/subprojects/boblib/meson.build index bb250e4..bb250e4 100644 --- a/test cases/common/95 dep fallback/subprojects/boblib/meson.build +++ b/test cases/common/92 dep fallback/subprojects/boblib/meson.build diff --git a/test cases/common/95 dep fallback/subprojects/dummylib/meson.build b/test cases/common/92 dep fallback/subprojects/dummylib/meson.build index 3ad33e7..3ad33e7 100644 --- a/test cases/common/95 dep fallback/subprojects/dummylib/meson.build +++ b/test cases/common/92 dep fallback/subprojects/dummylib/meson.build diff --git a/test cases/common/95 dep fallback/tester.c b/test cases/common/92 dep fallback/tester.c index e6651d9..e6651d9 100644 --- a/test cases/common/95 dep fallback/tester.c +++ b/test cases/common/92 dep fallback/tester.c diff --git a/test cases/common/96 default library/ef.cpp b/test cases/common/93 default library/ef.cpp index 34784f8..34784f8 100644 --- a/test cases/common/96 default library/ef.cpp +++ b/test cases/common/93 default library/ef.cpp diff --git a/test cases/common/96 default library/ef.h b/test cases/common/93 default library/ef.h index 21704b5..21704b5 100644 --- a/test cases/common/96 default library/ef.h +++ b/test cases/common/93 default library/ef.h diff --git a/test cases/common/96 default library/eftest.cpp b/test cases/common/93 default library/eftest.cpp index 4d4412d..4d4412d 100644 --- a/test cases/common/96 default library/eftest.cpp +++ b/test cases/common/93 default library/eftest.cpp diff --git a/test cases/common/96 default library/meson.build b/test cases/common/93 default library/meson.build index 903cfe4..903cfe4 100644 --- a/test cases/common/96 default library/meson.build +++ b/test cases/common/93 default library/meson.build diff --git a/test cases/common/97 selfbuilt custom/data.dat b/test cases/common/94 selfbuilt custom/data.dat index 83fd1d9..83fd1d9 100644 --- a/test cases/common/97 selfbuilt custom/data.dat +++ b/test cases/common/94 selfbuilt custom/data.dat diff --git a/test cases/common/97 selfbuilt custom/mainprog.cpp b/test cases/common/94 selfbuilt custom/mainprog.cpp index dcf9d20..dcf9d20 100644 --- a/test cases/common/97 selfbuilt custom/mainprog.cpp +++ b/test cases/common/94 selfbuilt custom/mainprog.cpp diff --git a/test cases/common/97 selfbuilt custom/meson.build b/test cases/common/94 selfbuilt custom/meson.build index e5da27e..e5da27e 100644 --- a/test cases/common/97 selfbuilt custom/meson.build +++ b/test cases/common/94 selfbuilt custom/meson.build diff --git a/test cases/common/97 selfbuilt custom/tool.cpp b/test cases/common/94 selfbuilt custom/tool.cpp index 6a28dd8..6a28dd8 100644 --- a/test cases/common/97 selfbuilt custom/tool.cpp +++ b/test cases/common/94 selfbuilt custom/tool.cpp diff --git a/test cases/common/98 gen extra/meson.build b/test cases/common/95 gen extra/meson.build index cbbdceb..cbbdceb 100644 --- a/test cases/common/98 gen extra/meson.build +++ b/test cases/common/95 gen extra/meson.build diff --git a/test cases/common/98 gen extra/name.dat b/test cases/common/95 gen extra/name.dat index caf5b1c..caf5b1c 100644 --- a/test cases/common/98 gen extra/name.dat +++ b/test cases/common/95 gen extra/name.dat diff --git a/test cases/common/98 gen extra/name.l b/test cases/common/95 gen extra/name.l index 3adda4f..3adda4f 100644 --- a/test cases/common/98 gen extra/name.l +++ b/test cases/common/95 gen extra/name.l diff --git a/test cases/common/98 gen extra/plain.c b/test cases/common/95 gen extra/plain.c index 3845aee..3845aee 100644 --- a/test cases/common/98 gen extra/plain.c +++ b/test cases/common/95 gen extra/plain.c diff --git a/test cases/common/98 gen extra/srcgen.py b/test cases/common/95 gen extra/srcgen.py index 8988cd9..8988cd9 100755 --- a/test cases/common/98 gen extra/srcgen.py +++ b/test cases/common/95 gen extra/srcgen.py diff --git a/test cases/common/98 gen extra/srcgen2.py b/test cases/common/95 gen extra/srcgen2.py index 9cdf12d..9cdf12d 100644 --- a/test cases/common/98 gen extra/srcgen2.py +++ b/test cases/common/95 gen extra/srcgen2.py diff --git a/test cases/common/98 gen extra/srcgen3.py b/test cases/common/95 gen extra/srcgen3.py index b737114..b737114 100644 --- a/test cases/common/98 gen extra/srcgen3.py +++ b/test cases/common/95 gen extra/srcgen3.py diff --git a/test cases/common/98 gen extra/upper.c b/test cases/common/95 gen extra/upper.c index 44f8ad7..44f8ad7 100644 --- a/test cases/common/98 gen extra/upper.c +++ b/test cases/common/95 gen extra/upper.c diff --git a/test cases/common/99 benchmark/delayer.c b/test cases/common/96 benchmark/delayer.c index cfcedad..cfcedad 100644 --- a/test cases/common/99 benchmark/delayer.c +++ b/test cases/common/96 benchmark/delayer.c diff --git a/test cases/common/99 benchmark/meson.build b/test cases/common/96 benchmark/meson.build index 9d583d2..9d583d2 100644 --- a/test cases/common/99 benchmark/meson.build +++ b/test cases/common/96 benchmark/meson.build diff --git a/test cases/common/100 test workdir/meson.build b/test cases/common/97 test workdir/meson.build index 1323a17..1323a17 100644 --- a/test cases/common/100 test workdir/meson.build +++ b/test cases/common/97 test workdir/meson.build diff --git a/test cases/common/100 test workdir/opener.c b/test cases/common/97 test workdir/opener.c index 43c53ce..43c53ce 100644 --- a/test cases/common/100 test workdir/opener.c +++ b/test cases/common/97 test workdir/opener.c diff --git a/test cases/common/101 suites/exe1.c b/test cases/common/98 suites/exe1.c index 23894c0..23894c0 100644 --- a/test cases/common/101 suites/exe1.c +++ b/test cases/common/98 suites/exe1.c diff --git a/test cases/common/101 suites/exe2.c b/test cases/common/98 suites/exe2.c index ec88e20..ec88e20 100644 --- a/test cases/common/101 suites/exe2.c +++ b/test cases/common/98 suites/exe2.c diff --git a/test cases/common/101 suites/meson.build b/test cases/common/98 suites/meson.build index 057e059..057e059 100644 --- a/test cases/common/101 suites/meson.build +++ b/test cases/common/98 suites/meson.build diff --git a/test cases/common/101 suites/subprojects/sub/meson.build b/test cases/common/98 suites/subprojects/sub/meson.build index 697d95f..697d95f 100644 --- a/test cases/common/101 suites/subprojects/sub/meson.build +++ b/test cases/common/98 suites/subprojects/sub/meson.build diff --git a/test cases/common/101 suites/subprojects/sub/sub1.c b/test cases/common/98 suites/subprojects/sub/sub1.c index 3409e48..3409e48 100644 --- a/test cases/common/101 suites/subprojects/sub/sub1.c +++ b/test cases/common/98 suites/subprojects/sub/sub1.c diff --git a/test cases/common/101 suites/subprojects/sub/sub2.c b/test cases/common/98 suites/subprojects/sub/sub2.c index 1a64a2a..1a64a2a 100644 --- a/test cases/common/101 suites/subprojects/sub/sub2.c +++ b/test cases/common/98 suites/subprojects/sub/sub2.c diff --git a/test cases/common/102 threads/meson.build b/test cases/common/99 threads/meson.build index 1fbb15a..1fbb15a 100644 --- a/test cases/common/102 threads/meson.build +++ b/test cases/common/99 threads/meson.build diff --git a/test cases/common/102 threads/threadprog.c b/test cases/common/99 threads/threadprog.c index 47a5d18..47a5d18 100644 --- a/test cases/common/102 threads/threadprog.c +++ b/test cases/common/99 threads/threadprog.c diff --git a/test cases/common/102 threads/threadprog.cpp b/test cases/common/99 threads/threadprog.cpp index 6fd747f..6fd747f 100644 --- a/test cases/common/102 threads/threadprog.cpp +++ b/test cases/common/99 threads/threadprog.cpp diff --git a/test cases/d/10 d cpp/cppmain.cpp b/test cases/d/10 d cpp/cppmain.cpp index aeddf56..ff90e3f 100644 --- a/test cases/d/10 d cpp/cppmain.cpp +++ b/test cases/d/10 d cpp/cppmain.cpp @@ -1,6 +1,18 @@ +extern "C" int rt_init(); +extern "C" int rt_term(); extern void print_hello(int i); int main(int, char**) { + // initialize D runtime + if (!rt_init()) + return 1; + print_hello(1); + + // terminate D runtime, each initialize call + // must be paired with a terminate call. + if (!rt_term()) + return 1; + return 0; } diff --git a/test cases/frameworks/4 qt/manualinclude.cpp b/test cases/frameworks/4 qt/manualinclude.cpp index 6c1ac2f..2682dd9 100644 --- a/test cases/frameworks/4 qt/manualinclude.cpp +++ b/test cases/frameworks/4 qt/manualinclude.cpp @@ -7,7 +7,7 @@ ManualInclude::ManualInclude() { } void ManualInclude::myslot(void) { - ; + ; } class MocClass : public QObject { diff --git a/test cases/nasm/1 configure file/hello.asm b/test cases/nasm/1 configure file/hello.asm index 4188b8d..bf4bf96 100644 --- a/test cases/nasm/1 configure file/hello.asm +++ b/test cases/nasm/1 configure file/hello.asm @@ -1,27 +1,27 @@ ; hello.asm a first program for nasm for Linux, Intel, gcc ; -; assemble: nasm -f elf -l hello.lst hello.asm -; link: gcc -o hello hello.o -; run: hello -; output is: Hello World +; assemble: nasm -f elf -l hello.lst hello.asm +; link: gcc -o hello hello.o +; run: hello +; output is: Hello World %include "config.asm" - SECTION .data ; data section -msg: db "Hello World",10 ; the string to print, 10=cr -len: equ $-msg ; "$" means "here" - ; len is a value, not an address + SECTION .data ; data section +msg: db "Hello World",10 ; the string to print, 10=cr +len: equ $-msg ; "$" means "here" + ; len is a value, not an address - SECTION .text ; code section - global main ; make label available to linker -main: ; standard gcc entry point + SECTION .text ; code section + global main ; make label available to linker +main: ; standard gcc entry point - mov edx,len ; arg3, length of string to print - mov ecx,msg ; arg2, pointer to string - mov ebx,1 ; arg1, where to write, screen - mov eax,4 ; write sysout command to int 80 hex - int 0x80 ; interrupt 80 hex, call kernel + mov edx,len ; arg3, length of string to print + mov ecx,msg ; arg2, pointer to string + mov ebx,1 ; arg1, where to write, screen + mov eax,4 ; write sysout command to int 80 hex + int 0x80 ; interrupt 80 hex, call kernel - mov ebx,HELLO ; exit code, 0=normal - mov eax,1 ; exit command to kernel - int 0x80 ; interrupt 80 hex, call kernel + mov ebx,HELLO ; exit code, 0=normal + mov eax,1 ; exit command to kernel + int 0x80 ; interrupt 80 hex, call kernel diff --git a/test cases/unit/14 testsetup selection/main.c b/test cases/unit/14 testsetup selection/main.c index cb3f748..33c14ce 100644 --- a/test cases/unit/14 testsetup selection/main.c +++ b/test cases/unit/14 testsetup selection/main.c @@ -1,3 +1,3 @@ int main() { - return 0; + return 0; } diff --git a/test cases/unit/14 testsetup selection/subprojects/bar/bar.c b/test cases/unit/14 testsetup selection/subprojects/bar/bar.c index cb3f748..33c14ce 100644 --- a/test cases/unit/14 testsetup selection/subprojects/bar/bar.c +++ b/test cases/unit/14 testsetup selection/subprojects/bar/bar.c @@ -1,3 +1,3 @@ int main() { - return 0; + return 0; } diff --git a/test cases/unit/14 testsetup selection/subprojects/foo/foo.c b/test cases/unit/14 testsetup selection/subprojects/foo/foo.c index cb3f748..33c14ce 100644 --- a/test cases/unit/14 testsetup selection/subprojects/foo/foo.c +++ b/test cases/unit/14 testsetup selection/subprojects/foo/foo.c @@ -1,3 +1,3 @@ int main() { - return 0; + return 0; } diff --git a/test cases/unit/35 mixed command line args/meson.build b/test cases/unit/36 mixed command line args/meson.build index af5cdc7..af5cdc7 100644 --- a/test cases/unit/35 mixed command line args/meson.build +++ b/test cases/unit/36 mixed command line args/meson.build diff --git a/test cases/unit/35 mixed command line args/meson_options.txt b/test cases/unit/36 mixed command line args/meson_options.txt index 5a4bc22..5a4bc22 100644 --- a/test cases/unit/35 mixed command line args/meson_options.txt +++ b/test cases/unit/36 mixed command line args/meson_options.txt diff --git a/test cases/unit/36 pkgconfig format/meson.build b/test cases/unit/37 pkgconfig format/meson.build index ea00f5d..ea00f5d 100644 --- a/test cases/unit/36 pkgconfig format/meson.build +++ b/test cases/unit/37 pkgconfig format/meson.build diff --git a/test cases/unit/36 pkgconfig format/somelib.c b/test cases/unit/37 pkgconfig format/somelib.c index 0558024..0558024 100644 --- a/test cases/unit/36 pkgconfig format/somelib.c +++ b/test cases/unit/37 pkgconfig format/somelib.c diff --git a/test cases/unit/36 pkgconfig format/someret.c b/test cases/unit/37 pkgconfig format/someret.c index 69f4299..69f4299 100644 --- a/test cases/unit/36 pkgconfig format/someret.c +++ b/test cases/unit/37 pkgconfig format/someret.c diff --git a/test cases/unit/37 python extmodule/blaster.py b/test cases/unit/38 python extmodule/blaster.py index 163b6d4..163b6d4 100755 --- a/test cases/unit/37 python extmodule/blaster.py +++ b/test cases/unit/38 python extmodule/blaster.py diff --git a/test cases/unit/37 python extmodule/ext/meson.build b/test cases/unit/38 python extmodule/ext/meson.build index b13bb32..b13bb32 100644 --- a/test cases/unit/37 python extmodule/ext/meson.build +++ b/test cases/unit/38 python extmodule/ext/meson.build diff --git a/test cases/unit/37 python extmodule/ext/tachyon_module.c b/test cases/unit/38 python extmodule/ext/tachyon_module.c index 68eda53..68eda53 100644 --- a/test cases/unit/37 python extmodule/ext/tachyon_module.c +++ b/test cases/unit/38 python extmodule/ext/tachyon_module.c diff --git a/test cases/unit/37 python extmodule/meson.build b/test cases/unit/38 python extmodule/meson.build index 4798654..4798654 100644 --- a/test cases/unit/37 python extmodule/meson.build +++ b/test cases/unit/38 python extmodule/meson.build diff --git a/test cases/unit/37 python extmodule/meson_options.txt b/test cases/unit/38 python extmodule/meson_options.txt index b8f645d..b8f645d 100644 --- a/test cases/unit/37 python extmodule/meson_options.txt +++ b/test cases/unit/38 python extmodule/meson_options.txt diff --git a/test cases/unit/38 external, internal library rpath/built library/bar.c b/test cases/unit/39 external, internal library rpath/built library/bar.c index 4f5662e..4f5662e 100644 --- a/test cases/unit/38 external, internal library rpath/built library/bar.c +++ b/test cases/unit/39 external, internal library rpath/built library/bar.c diff --git a/test cases/unit/38 external, internal library rpath/built library/meson.build b/test cases/unit/39 external, internal library rpath/built library/meson.build index 2b422f4..2b422f4 100644 --- a/test cases/unit/38 external, internal library rpath/built library/meson.build +++ b/test cases/unit/39 external, internal library rpath/built library/meson.build diff --git a/test cases/unit/38 external, internal library rpath/built library/meson_options.txt b/test cases/unit/39 external, internal library rpath/built library/meson_options.txt index aa1d2ec..aa1d2ec 100644 --- a/test cases/unit/38 external, internal library rpath/built library/meson_options.txt +++ b/test cases/unit/39 external, internal library rpath/built library/meson_options.txt diff --git a/test cases/unit/38 external, internal library rpath/built library/prog.c b/test cases/unit/39 external, internal library rpath/built library/prog.c index e3d4cf6..e3d4cf6 100644 --- a/test cases/unit/38 external, internal library rpath/built library/prog.c +++ b/test cases/unit/39 external, internal library rpath/built library/prog.c diff --git a/test cases/unit/38 external, internal library rpath/external library/faa.c b/test cases/unit/39 external, internal library rpath/external library/faa.c index 4733575..4733575 100644 --- a/test cases/unit/38 external, internal library rpath/external library/faa.c +++ b/test cases/unit/39 external, internal library rpath/external library/faa.c diff --git a/test cases/unit/38 external, internal library rpath/external library/foo.c b/test cases/unit/39 external, internal library rpath/external library/foo.c index a34e4a8..a34e4a8 100644 --- a/test cases/unit/38 external, internal library rpath/external library/foo.c +++ b/test cases/unit/39 external, internal library rpath/external library/foo.c diff --git a/test cases/unit/38 external, internal library rpath/external library/meson.build b/test cases/unit/39 external, internal library rpath/external library/meson.build index 6dcc97e..6dcc97e 100644 --- a/test cases/unit/38 external, internal library rpath/external library/meson.build +++ b/test cases/unit/39 external, internal library rpath/external library/meson.build diff --git a/test cases/unit/39 featurenew subprojects/meson.build b/test cases/unit/40 featurenew subprojects/meson.build index 27898cd..27898cd 100644 --- a/test cases/unit/39 featurenew subprojects/meson.build +++ b/test cases/unit/40 featurenew subprojects/meson.build diff --git a/test cases/unit/39 featurenew subprojects/subprojects/bar/meson.build b/test cases/unit/40 featurenew subprojects/subprojects/bar/meson.build index 712a125..712a125 100644 --- a/test cases/unit/39 featurenew subprojects/subprojects/bar/meson.build +++ b/test cases/unit/40 featurenew subprojects/subprojects/bar/meson.build diff --git a/test cases/unit/39 featurenew subprojects/subprojects/foo/meson.build b/test cases/unit/40 featurenew subprojects/subprojects/foo/meson.build index 0ef4472..0ef4472 100644 --- a/test cases/unit/39 featurenew subprojects/subprojects/foo/meson.build +++ b/test cases/unit/40 featurenew subprojects/subprojects/foo/meson.build diff --git a/test cases/unit/40 rpath order/meson.build b/test cases/unit/41 rpath order/meson.build index a722894..a722894 100644 --- a/test cases/unit/40 rpath order/meson.build +++ b/test cases/unit/41 rpath order/meson.build diff --git a/test cases/unit/40 rpath order/myexe.c b/test cases/unit/41 rpath order/myexe.c index 03b2213..03b2213 100644 --- a/test cases/unit/40 rpath order/myexe.c +++ b/test cases/unit/41 rpath order/myexe.c diff --git a/test cases/unit/40 rpath order/subprojects/sub2/lib.c b/test cases/unit/41 rpath order/subprojects/sub1/lib.c index e69de29..e69de29 100644 --- a/test cases/unit/40 rpath order/subprojects/sub2/lib.c +++ b/test cases/unit/41 rpath order/subprojects/sub1/lib.c diff --git a/test cases/unit/40 rpath order/subprojects/sub1/meson.build b/test cases/unit/41 rpath order/subprojects/sub1/meson.build index 4dd5d08..4dd5d08 100644 --- a/test cases/unit/40 rpath order/subprojects/sub1/meson.build +++ b/test cases/unit/41 rpath order/subprojects/sub1/meson.build diff --git a/test cases/unit/41 dep order/lib1.c b/test cases/unit/41 rpath order/subprojects/sub2/lib.c index e69de29..e69de29 100644 --- a/test cases/unit/41 dep order/lib1.c +++ b/test cases/unit/41 rpath order/subprojects/sub2/lib.c diff --git a/test cases/unit/40 rpath order/subprojects/sub2/meson.build b/test cases/unit/41 rpath order/subprojects/sub2/meson.build index bc3510d..bc3510d 100644 --- a/test cases/unit/40 rpath order/subprojects/sub2/meson.build +++ b/test cases/unit/41 rpath order/subprojects/sub2/meson.build diff --git a/test cases/unit/41 dep order/lib2.c b/test cases/unit/42 dep order/lib1.c index e69de29..e69de29 100644 --- a/test cases/unit/41 dep order/lib2.c +++ b/test cases/unit/42 dep order/lib1.c diff --git a/test cases/unit/42 dep order/lib2.c b/test cases/unit/42 dep order/lib2.c new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/unit/42 dep order/lib2.c diff --git a/test cases/unit/41 dep order/meson.build b/test cases/unit/42 dep order/meson.build index 17cf9df..17cf9df 100644 --- a/test cases/unit/41 dep order/meson.build +++ b/test cases/unit/42 dep order/meson.build diff --git a/test cases/unit/41 dep order/myexe.c b/test cases/unit/42 dep order/myexe.c index 8f4c045..8f4c045 100644 --- a/test cases/unit/41 dep order/myexe.c +++ b/test cases/unit/42 dep order/myexe.c diff --git a/test cases/unit/43 promote wrap/meson.build b/test cases/unit/43 promote wrap/meson.build new file mode 100644 index 0000000..066cf36 --- /dev/null +++ b/test cases/unit/43 promote wrap/meson.build @@ -0,0 +1,5 @@ +project('promotion test', 'c') + +subproject('s1') +subproject('s2') + diff --git a/test cases/unit/43 promote wrap/subprojects/s1/meson.build b/test cases/unit/43 promote wrap/subprojects/s1/meson.build new file mode 100644 index 0000000..3d1f5bc --- /dev/null +++ b/test cases/unit/43 promote wrap/subprojects/s1/meson.build @@ -0,0 +1,2 @@ +project('s1', 'c') + diff --git a/test cases/unit/43 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build b/test cases/unit/43 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build new file mode 100644 index 0000000..296adff --- /dev/null +++ b/test cases/unit/43 promote wrap/subprojects/s1/subprojects/ambiguous/meson.build @@ -0,0 +1,2 @@ +project('ambiguous', 'c') + diff --git a/test cases/unit/43 promote wrap/subprojects/s2/meson.build b/test cases/unit/43 promote wrap/subprojects/s2/meson.build new file mode 100644 index 0000000..b5db634 --- /dev/null +++ b/test cases/unit/43 promote wrap/subprojects/s2/meson.build @@ -0,0 +1,2 @@ +project('s2', 'c') + diff --git a/test cases/unit/43 promote wrap/subprojects/s2/subprojects/ambiguous.wrap b/test cases/unit/43 promote wrap/subprojects/s2/subprojects/ambiguous.wrap new file mode 100644 index 0000000..09ba4e8 --- /dev/null +++ b/test cases/unit/43 promote wrap/subprojects/s2/subprojects/ambiguous.wrap @@ -0,0 +1,2 @@ +The contents of this wrap file are never evaluated so they +can be anything. diff --git a/test cases/vala/10 mixed sources/vala/bar.vala b/test cases/vala/10 mixed sources/vala/bar.vala index 10dce1e..0772f3e 100644 --- a/test cases/vala/10 mixed sources/vala/bar.vala +++ b/test cases/vala/10 mixed sources/vala/bar.vala @@ -1,5 +1,5 @@ extern int test (); public int main (string[] args) { - return test (); + return test (); } diff --git a/test cases/vala/5 target glib/GLib.Thread.vala b/test cases/vala/5 target glib/GLib.Thread.vala index a1a0414..7018821 100644 --- a/test cases/vala/5 target glib/GLib.Thread.vala +++ b/test cases/vala/5 target glib/GLib.Thread.vala @@ -1,43 +1,43 @@ extern int get_ret_code (); public class MyThread : Object { - public int x_times { get; private set; } - - public MyThread (int times) { - this.x_times = times; - } - - public int run () { - for (int i = 0; i < this.x_times; i++) { - stdout.printf ("ping! %d/%d\n", i + 1, this.x_times); - Thread.usleep (10000); - } - - // return & exit have the same effect - Thread.exit (get_ret_code ()); - return 43; - } + public int x_times { get; private set; } + + public MyThread (int times) { + this.x_times = times; + } + + public int run () { + for (int i = 0; i < this.x_times; i++) { + stdout.printf ("ping! %d/%d\n", i + 1, this.x_times); + Thread.usleep (10000); + } + + // return & exit have the same effect + Thread.exit (get_ret_code ()); + return 43; + } } public static int main (string[] args) { - // Check whether threads are supported: - if (Thread.supported () == false) { - stderr.printf ("Threads are not supported!\n"); - return -1; - } - - try { - // Start a thread: - MyThread my_thread = new MyThread (10); - Thread<int> thread = new Thread<int>.try ("My fst. thread", my_thread.run); - - // Wait until thread finishes: - int result = thread.join (); - // Output: `Thread stopped! Return value: 42` - stdout.printf ("Thread stopped! Return value: %d\n", result); - } catch (Error e) { - stdout.printf ("Error: %s\n", e.message); - } - - return 0; + // Check whether threads are supported: + if (Thread.supported () == false) { + stderr.printf ("Threads are not supported!\n"); + return -1; + } + + try { + // Start a thread: + MyThread my_thread = new MyThread (10); + Thread<int> thread = new Thread<int>.try ("My fst. thread", my_thread.run); + + // Wait until thread finishes: + int result = thread.join (); + // Output: `Thread stopped! Return value: 42` + stdout.printf ("Thread stopped! Return value: %d\n", result); + } catch (Error e) { + stdout.printf ("Error: %s\n", e.message); + } + + return 0; } diff --git a/test cases/vala/9 gir/foo.vala b/test cases/vala/9 gir/foo.vala index 00c4812..bb6da10 100644 --- a/test cases/vala/9 gir/foo.vala +++ b/test cases/vala/9 gir/foo.vala @@ -1,7 +1,7 @@ namespace Foo { - public int bar () - { - return 0; - } + public int bar () + { + return 0; + } } diff --git a/test cases/windows/16 gui app/console_prog.c b/test cases/windows/16 gui app/console_prog.c new file mode 100644 index 0000000..11b7fad --- /dev/null +++ b/test cases/windows/16 gui app/console_prog.c @@ -0,0 +1,3 @@ +int main(int argc, char **argv) { + return 0; +} diff --git a/test cases/windows/16 gui app/dummy.c b/test cases/windows/16 gui app/dummy.c new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test cases/windows/16 gui app/dummy.c diff --git a/test cases/windows/16 gui app/gui_app_tester.py b/test cases/windows/16 gui app/gui_app_tester.py new file mode 100644 index 0000000..9cba806 --- /dev/null +++ b/test cases/windows/16 gui app/gui_app_tester.py @@ -0,0 +1,26 @@ +#!/usr/bin/env python3 + +import re +import subprocess +import sys + +tool = sys.argv[1] +executable = sys.argv[2] +expected = int(sys.argv[3]) +actual = -1 + +if 'objdump' in tool: + result = subprocess.check_output([tool, '-p', executable]).decode() + match = re.search(r'^Subsystem\s+(\d+)', result, re.MULTILINE) +elif 'dumpbin' in tool: + result = subprocess.check_output([tool, '/headers', executable]).decode() + match = re.search(r'^\s*(\d+) subsystem(?! version)', result, re.MULTILINE) +else: + print('unknown tool') + sys.exit(1) + +if match: + actual = int(match.group(1)) + +print('subsystem expected: %d, actual: %d' % (expected, actual)) +sys.exit(0 if (expected == actual) else 1) diff --git a/test cases/windows/16 gui app/gui_prog.c b/test cases/windows/16 gui app/gui_prog.c new file mode 100644 index 0000000..4bc688a --- /dev/null +++ b/test cases/windows/16 gui app/gui_prog.c @@ -0,0 +1,6 @@ +#include <windows.h> + +int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, + LPSTR lpCmdLine, int nCmdShow) { + return 0; +} diff --git a/test cases/windows/16 gui app/meson.build b/test cases/windows/16 gui app/meson.build new file mode 100644 index 0000000..2435218 --- /dev/null +++ b/test cases/windows/16 gui app/meson.build @@ -0,0 +1,22 @@ +project('gui_app_test', 'c') + +# +# test that linking a Windows console applications with the main function in a +# library is correctly instructed which entrypoint function to look for +# + +console_lib = static_library('main', 'console_prog.c') +executable('console', 'dummy.c', link_with: console_lib, gui_app: false) + +# +# also verify that the correct subsystem is set by executable(gui_app:) +# + +gui_prog = executable('gui_prog', 'gui_prog.c', gui_app: true) +console_prog = executable('console_prog', 'console_prog.c', gui_app: false) + +tester = find_program('gui_app_tester.py') + +tool = find_program('objdump', 'dumpbin') +test('is_gui', tester, args: [tool.path(), gui_prog, '2']) +test('not_gui', tester, args: [tool.path(), console_prog, '3']) |