diff --git a/run_unittests.py b/run_unittests.py index 96ead5a7e..ecd277df6 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -3237,8 +3237,8 @@ int main(int argc, char **argv) { ('10 out of bounds', 'meson.build'), ('18 wrong plusassign', 'meson.build'), ('61 bad option argument', 'meson_options.txt'), - ('100 subdir parse error', os.path.join('subdir', 'meson.build')), - ('101 invalid option file', 'meson_options.txt'), + ('102 subdir parse error', os.path.join('subdir', 'meson.build')), + ('103 invalid option file', 'meson_options.txt'), ]: tdir = os.path.join(self.src_root, 'test cases', 'failing', t) diff --git a/test cases/common/229 persubproject options/foo.c b/test cases/common/230 persubproject options/foo.c similarity index 100% rename from test cases/common/229 persubproject options/foo.c rename to test cases/common/230 persubproject options/foo.c diff --git a/test cases/common/229 persubproject options/meson.build b/test cases/common/230 persubproject options/meson.build similarity index 100% rename from test cases/common/229 persubproject options/meson.build rename to test cases/common/230 persubproject options/meson.build diff --git a/test cases/common/229 persubproject options/subprojects/sub1/foo.c b/test cases/common/230 persubproject options/subprojects/sub1/foo.c similarity index 100% rename from test cases/common/229 persubproject options/subprojects/sub1/foo.c rename to test cases/common/230 persubproject options/subprojects/sub1/foo.c diff --git a/test cases/common/229 persubproject options/subprojects/sub1/meson.build b/test cases/common/230 persubproject options/subprojects/sub1/meson.build similarity index 100% rename from test cases/common/229 persubproject options/subprojects/sub1/meson.build rename to test cases/common/230 persubproject options/subprojects/sub1/meson.build diff --git a/test cases/common/229 persubproject options/subprojects/sub2/foo.c b/test cases/common/230 persubproject options/subprojects/sub2/foo.c similarity index 100% rename from test cases/common/229 persubproject options/subprojects/sub2/foo.c rename to test cases/common/230 persubproject options/subprojects/sub2/foo.c diff --git a/test cases/common/229 persubproject options/subprojects/sub2/meson.build b/test cases/common/230 persubproject options/subprojects/sub2/meson.build similarity index 100% rename from test cases/common/229 persubproject options/subprojects/sub2/meson.build rename to test cases/common/230 persubproject options/subprojects/sub2/meson.build diff --git a/test cases/common/230 arithmetic operators/meson.build b/test cases/common/231 arithmetic operators/meson.build similarity index 100% rename from test cases/common/230 arithmetic operators/meson.build rename to test cases/common/231 arithmetic operators/meson.build diff --git a/test cases/failing/100 no native compiler/main.c b/test cases/failing/101 no native compiler/main.c similarity index 100% rename from test cases/failing/100 no native compiler/main.c rename to test cases/failing/101 no native compiler/main.c diff --git a/test cases/failing/100 no native compiler/meson.build b/test cases/failing/101 no native compiler/meson.build similarity index 100% rename from test cases/failing/100 no native compiler/meson.build rename to test cases/failing/101 no native compiler/meson.build diff --git a/test cases/failing/100 subdir parse error/meson.build b/test cases/failing/102 subdir parse error/meson.build similarity index 100% rename from test cases/failing/100 subdir parse error/meson.build rename to test cases/failing/102 subdir parse error/meson.build diff --git a/test cases/failing/100 subdir parse error/subdir/meson.build b/test cases/failing/102 subdir parse error/subdir/meson.build similarity index 100% rename from test cases/failing/100 subdir parse error/subdir/meson.build rename to test cases/failing/102 subdir parse error/subdir/meson.build diff --git a/test cases/failing/101 invalid option file/meson.build b/test cases/failing/103 invalid option file/meson.build similarity index 100% rename from test cases/failing/101 invalid option file/meson.build rename to test cases/failing/103 invalid option file/meson.build diff --git a/test cases/failing/101 invalid option file/meson_options.txt b/test cases/failing/103 invalid option file/meson_options.txt similarity index 100% rename from test cases/failing/101 invalid option file/meson_options.txt rename to test cases/failing/103 invalid option file/meson_options.txt diff --git a/test cases/failing/101 no lang/main.c b/test cases/failing/104 no lang/main.c similarity index 100% rename from test cases/failing/101 no lang/main.c rename to test cases/failing/104 no lang/main.c diff --git a/test cases/failing/101 no lang/meson.build b/test cases/failing/104 no lang/meson.build similarity index 100% rename from test cases/failing/101 no lang/meson.build rename to test cases/failing/104 no lang/meson.build diff --git a/test cases/failing/102 no glib-compile-resources/meson.build b/test cases/failing/105 no glib-compile-resources/meson.build similarity index 100% rename from test cases/failing/102 no glib-compile-resources/meson.build rename to test cases/failing/105 no glib-compile-resources/meson.build diff --git a/test cases/failing/102 no glib-compile-resources/trivial.gresource.xml b/test cases/failing/105 no glib-compile-resources/trivial.gresource.xml similarity index 100% rename from test cases/failing/102 no glib-compile-resources/trivial.gresource.xml rename to test cases/failing/105 no glib-compile-resources/trivial.gresource.xml diff --git a/test cases/failing/72 dual override/meson.build b/test cases/failing/71 dual override/meson.build similarity index 100% rename from test cases/failing/72 dual override/meson.build rename to test cases/failing/71 dual override/meson.build diff --git a/test cases/failing/72 dual override/overrides.py b/test cases/failing/71 dual override/overrides.py similarity index 100% rename from test cases/failing/72 dual override/overrides.py rename to test cases/failing/71 dual override/overrides.py diff --git a/test cases/failing/73 override used/meson.build b/test cases/failing/72 override used/meson.build similarity index 100% rename from test cases/failing/73 override used/meson.build rename to test cases/failing/72 override used/meson.build diff --git a/test cases/failing/73 override used/other.py b/test cases/failing/72 override used/other.py similarity index 100% rename from test cases/failing/73 override used/other.py rename to test cases/failing/72 override used/other.py diff --git a/test cases/failing/73 override used/something.py b/test cases/failing/72 override used/something.py similarity index 100% rename from test cases/failing/73 override used/something.py rename to test cases/failing/72 override used/something.py diff --git a/test cases/failing/74 run_command unclean exit/meson.build b/test cases/failing/73 run_command unclean exit/meson.build similarity index 100% rename from test cases/failing/74 run_command unclean exit/meson.build rename to test cases/failing/73 run_command unclean exit/meson.build diff --git a/test cases/failing/74 run_command unclean exit/returncode.py b/test cases/failing/73 run_command unclean exit/returncode.py similarity index 100% rename from test cases/failing/74 run_command unclean exit/returncode.py rename to test cases/failing/73 run_command unclean exit/returncode.py diff --git a/test cases/failing/75 int literal leading zero/meson.build b/test cases/failing/74 int literal leading zero/meson.build similarity index 100% rename from test cases/failing/75 int literal leading zero/meson.build rename to test cases/failing/74 int literal leading zero/meson.build diff --git a/test cases/failing/76 configuration immutable/input b/test cases/failing/75 configuration immutable/input similarity index 100% rename from test cases/failing/76 configuration immutable/input rename to test cases/failing/75 configuration immutable/input diff --git a/test cases/failing/76 configuration immutable/meson.build b/test cases/failing/75 configuration immutable/meson.build similarity index 100% rename from test cases/failing/76 configuration immutable/meson.build rename to test cases/failing/75 configuration immutable/meson.build diff --git a/test cases/failing/77 link with shared module on osx/meson.build b/test cases/failing/76 link with shared module on osx/meson.build similarity index 100% rename from test cases/failing/77 link with shared module on osx/meson.build rename to test cases/failing/76 link with shared module on osx/meson.build diff --git a/test cases/failing/77 link with shared module on osx/module.c b/test cases/failing/76 link with shared module on osx/module.c similarity index 100% rename from test cases/failing/77 link with shared module on osx/module.c rename to test cases/failing/76 link with shared module on osx/module.c diff --git a/test cases/failing/77 link with shared module on osx/prog.c b/test cases/failing/76 link with shared module on osx/prog.c similarity index 100% rename from test cases/failing/77 link with shared module on osx/prog.c rename to test cases/failing/76 link with shared module on osx/prog.c diff --git a/test cases/failing/78 non ascii in ascii encoded configure file/config9.h.in b/test cases/failing/77 non ascii in ascii encoded configure file/config9.h.in similarity index 100% rename from test cases/failing/78 non ascii in ascii encoded configure file/config9.h.in rename to test cases/failing/77 non ascii in ascii encoded configure file/config9.h.in diff --git a/test cases/failing/78 non ascii in ascii encoded configure file/meson.build b/test cases/failing/77 non ascii in ascii encoded configure file/meson.build similarity index 100% rename from test cases/failing/78 non ascii in ascii encoded configure file/meson.build rename to test cases/failing/77 non ascii in ascii encoded configure file/meson.build diff --git a/test cases/failing/79 subproj dependency not-found and required/meson.build b/test cases/failing/78 subproj dependency not-found and required/meson.build similarity index 100% rename from test cases/failing/79 subproj dependency not-found and required/meson.build rename to test cases/failing/78 subproj dependency not-found and required/meson.build diff --git a/test cases/failing/80 unfound run/meson.build b/test cases/failing/79 unfound run/meson.build similarity index 100% rename from test cases/failing/80 unfound run/meson.build rename to test cases/failing/79 unfound run/meson.build diff --git a/test cases/failing/81 framework dependency with version/meson.build b/test cases/failing/80 framework dependency with version/meson.build similarity index 100% rename from test cases/failing/81 framework dependency with version/meson.build rename to test cases/failing/80 framework dependency with version/meson.build diff --git a/test cases/failing/82 override exe config/foo.c b/test cases/failing/81 override exe config/foo.c similarity index 100% rename from test cases/failing/82 override exe config/foo.c rename to test cases/failing/81 override exe config/foo.c diff --git a/test cases/failing/82 override exe config/meson.build b/test cases/failing/81 override exe config/meson.build similarity index 100% rename from test cases/failing/82 override exe config/meson.build rename to test cases/failing/81 override exe config/meson.build diff --git a/test cases/failing/83 gl dependency with version/meson.build b/test cases/failing/82 gl dependency with version/meson.build similarity index 100% rename from test cases/failing/83 gl dependency with version/meson.build rename to test cases/failing/82 gl dependency with version/meson.build diff --git a/test cases/failing/84 threads dependency with version/meson.build b/test cases/failing/83 threads dependency with version/meson.build similarity index 100% rename from test cases/failing/84 threads dependency with version/meson.build rename to test cases/failing/83 threads dependency with version/meson.build diff --git a/test cases/failing/85 gtest dependency with version/meson.build b/test cases/failing/84 gtest dependency with version/meson.build similarity index 100% rename from test cases/failing/85 gtest dependency with version/meson.build rename to test cases/failing/84 gtest dependency with version/meson.build diff --git a/test cases/failing/86 dub libray/meson.build b/test cases/failing/85 dub libray/meson.build similarity index 100% rename from test cases/failing/86 dub libray/meson.build rename to test cases/failing/85 dub libray/meson.build diff --git a/test cases/failing/87 dub executable/meson.build b/test cases/failing/86 dub executable/meson.build similarity index 100% rename from test cases/failing/87 dub executable/meson.build rename to test cases/failing/86 dub executable/meson.build diff --git a/test cases/failing/88 dub compiler/meson.build b/test cases/failing/87 dub compiler/meson.build similarity index 100% rename from test cases/failing/88 dub compiler/meson.build rename to test cases/failing/87 dub compiler/meson.build diff --git a/test cases/failing/88 dub compiler/test.json b/test cases/failing/87 dub compiler/test.json similarity index 100% rename from test cases/failing/88 dub compiler/test.json rename to test cases/failing/87 dub compiler/test.json diff --git a/test cases/failing/89 subproj not-found dep/meson.build b/test cases/failing/88 subproj not-found dep/meson.build similarity index 100% rename from test cases/failing/89 subproj not-found dep/meson.build rename to test cases/failing/88 subproj not-found dep/meson.build diff --git a/test cases/failing/89 subproj not-found dep/subprojects/somesubproj/meson.build b/test cases/failing/88 subproj not-found dep/subprojects/somesubproj/meson.build similarity index 100% rename from test cases/failing/89 subproj not-found dep/subprojects/somesubproj/meson.build rename to test cases/failing/88 subproj not-found dep/subprojects/somesubproj/meson.build diff --git a/test cases/failing/90 invalid configure file/input b/test cases/failing/89 invalid configure file/input similarity index 100% rename from test cases/failing/90 invalid configure file/input rename to test cases/failing/89 invalid configure file/input diff --git a/test cases/failing/90 invalid configure file/meson.build b/test cases/failing/89 invalid configure file/meson.build similarity index 100% rename from test cases/failing/90 invalid configure file/meson.build rename to test cases/failing/89 invalid configure file/meson.build diff --git a/test cases/failing/91 kwarg dupe/meson.build b/test cases/failing/90 kwarg dupe/meson.build similarity index 100% rename from test cases/failing/91 kwarg dupe/meson.build rename to test cases/failing/90 kwarg dupe/meson.build diff --git a/test cases/failing/91 kwarg dupe/prog.c b/test cases/failing/90 kwarg dupe/prog.c similarity index 100% rename from test cases/failing/91 kwarg dupe/prog.c rename to test cases/failing/90 kwarg dupe/prog.c diff --git a/test cases/failing/92 missing pch file/meson.build b/test cases/failing/91 missing pch file/meson.build similarity index 100% rename from test cases/failing/92 missing pch file/meson.build rename to test cases/failing/91 missing pch file/meson.build diff --git a/test cases/failing/92 missing pch file/prog.c b/test cases/failing/91 missing pch file/prog.c similarity index 100% rename from test cases/failing/92 missing pch file/prog.c rename to test cases/failing/91 missing pch file/prog.c diff --git a/test cases/failing/93 pch source different folder/include/pch.h b/test cases/failing/92 pch source different folder/include/pch.h similarity index 100% rename from test cases/failing/93 pch source different folder/include/pch.h rename to test cases/failing/92 pch source different folder/include/pch.h diff --git a/test cases/failing/93 pch source different folder/meson.build b/test cases/failing/92 pch source different folder/meson.build similarity index 100% rename from test cases/failing/93 pch source different folder/meson.build rename to test cases/failing/92 pch source different folder/meson.build diff --git a/test cases/failing/93 pch source different folder/prog.c b/test cases/failing/92 pch source different folder/prog.c similarity index 100% rename from test cases/failing/93 pch source different folder/prog.c rename to test cases/failing/92 pch source different folder/prog.c diff --git a/test cases/failing/93 pch source different folder/src/pch.c b/test cases/failing/92 pch source different folder/src/pch.c similarity index 100% rename from test cases/failing/93 pch source different folder/src/pch.c rename to test cases/failing/92 pch source different folder/src/pch.c diff --git a/test cases/failing/94 vala without c/meson.build b/test cases/failing/93 vala without c/meson.build similarity index 100% rename from test cases/failing/94 vala without c/meson.build rename to test cases/failing/93 vala without c/meson.build diff --git a/test cases/failing/95 unknown config tool/meson.build b/test cases/failing/94 unknown config tool/meson.build similarity index 100% rename from test cases/failing/95 unknown config tool/meson.build rename to test cases/failing/94 unknown config tool/meson.build diff --git a/test cases/failing/96 custom target install data/Info.plist.cpp b/test cases/failing/95 custom target install data/Info.plist.cpp similarity index 100% rename from test cases/failing/96 custom target install data/Info.plist.cpp rename to test cases/failing/95 custom target install data/Info.plist.cpp diff --git a/test cases/failing/96 custom target install data/meson.build b/test cases/failing/95 custom target install data/meson.build similarity index 100% rename from test cases/failing/96 custom target install data/meson.build rename to test cases/failing/95 custom target install data/meson.build diff --git a/test cases/failing/96 custom target install data/preproc.py b/test cases/failing/95 custom target install data/preproc.py similarity index 100% rename from test cases/failing/96 custom target install data/preproc.py rename to test cases/failing/95 custom target install data/preproc.py diff --git a/test cases/failing/97 add dict non string key/meson.build b/test cases/failing/96 add dict non string key/meson.build similarity index 100% rename from test cases/failing/97 add dict non string key/meson.build rename to test cases/failing/96 add dict non string key/meson.build diff --git a/test cases/failing/98 add dict duplicate keys/meson.build b/test cases/failing/97 add dict duplicate keys/meson.build similarity index 100% rename from test cases/failing/98 add dict duplicate keys/meson.build rename to test cases/failing/97 add dict duplicate keys/meson.build diff --git a/test cases/failing/99 fallback consistency/meson.build b/test cases/failing/98 fallback consistency/meson.build similarity index 100% rename from test cases/failing/99 fallback consistency/meson.build rename to test cases/failing/98 fallback consistency/meson.build diff --git a/test cases/failing/99 fallback consistency/subprojects/sub/meson.build b/test cases/failing/98 fallback consistency/subprojects/sub/meson.build similarity index 100% rename from test cases/failing/99 fallback consistency/subprojects/sub/meson.build rename to test cases/failing/98 fallback consistency/subprojects/sub/meson.build