From c677925dc15a1f977e24d30a45d1b9b44289b880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 13 Sep 2018 02:53:09 +0200 Subject: run_projects_tests: Fail if we install extra files even if not in cl As per commit 2340fd3, unexpected installed files are not reported anymore when using compilers other than 'cl', this regression was introduced in the attempt of not reporting extra .pdb files, but actually caused any non extra .pdb file in other compilers to be ignored. Fix boolean test, by reporting any extra file a part '.pdb' ones under non 'cl' compiler, while anyone under 'cl'. --- run_project_tests.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/run_project_tests.py b/run_project_tests.py index a373aa0..841f072 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -193,8 +193,9 @@ def validate_install(srcdir, installdir, compiler, env): # Windows-specific tests check for the existence of installed PDB # files, but common tests do not, for obvious reasons. Ignore any # extra PDB files found. - if fname not in expected and not fname.endswith('.pdb') and compiler == 'cl': - ret_msg += 'Extra file {0} found.\n'.format(fname) + if fname not in expected: + if not (fname.endswith('.pdb') and compiler != 'cl'): + ret_msg += 'Extra file {0} found.\n'.format(fname) return ret_msg def log_text_file(logfile, testdir, stdo, stde): -- cgit v1.1 From b484f2ae2214d87a3f0af3cc3977fe72dcd4f59b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 13 Sep 2018 04:07:39 +0200 Subject: test cases: add missing files to installed_files.txt All these are marked as files to be installed, so we need list them. --- .../common/122 shared module/installed_files.txt | 1 + .../126 object only target/installed_files.txt | 1 + .../common/196 install_mode/installed_files.txt | 1 + .../common/25 library versions/installed_files.txt | 1 + .../common/43 library chain/installed_files.txt | 1 + .../common/46 subproject/installed_files.txt | 1 + .../common/48 pkgconfig-gen/installed_files.txt | 1 + .../49 custom install dirs/installed_files.txt | 2 + .../common/57 install script/installed_files.txt | 1 + test cases/common/6 linkshared/installed_files.txt | 1 + test cases/common/64 foreach/installed_files.txt | 3 + test cases/common/8 install/installed_files.txt | 1 + .../csharp/4 external dep/installed_files.txt | 1 + test cases/d/3 shared library/installed_files.txt | 1 + .../frameworks/12 multiple gir/installed_files.txt | 2 + .../frameworks/23 hotdoc/installed_files.txt | 304 +++++++++++++++++++++ test cases/frameworks/7 gnome/installed_files.txt | 2 + test cases/osx/4 framework/installed_files.txt | 2 + .../vala/11 generated vapi/installed_files.txt | 4 +- .../vala/7 shared library/installed_files.txt | 2 + .../vala/8 generated sources/installed_files.txt | 5 +- test cases/vala/9 gir/installed_files.txt | 3 +- .../windows/7 dll versioning/installed_files.txt | 4 + 23 files changed, 341 insertions(+), 4 deletions(-) create mode 100644 test cases/csharp/4 external dep/installed_files.txt create mode 100644 test cases/frameworks/23 hotdoc/installed_files.txt create mode 100644 test cases/osx/4 framework/installed_files.txt diff --git a/test cases/common/122 shared module/installed_files.txt b/test cases/common/122 shared module/installed_files.txt index a351490..4542a55 100644 --- a/test cases/common/122 shared module/installed_files.txt +++ b/test cases/common/122 shared module/installed_files.txt @@ -1 +1,2 @@ usr/lib/libnosyms.so +?msvc:usr/lib/libnosyms.pdb diff --git a/test cases/common/126 object only target/installed_files.txt b/test cases/common/126 object only target/installed_files.txt index c7dab9f..5e796b0 100644 --- a/test cases/common/126 object only target/installed_files.txt +++ b/test cases/common/126 object only target/installed_files.txt @@ -1 +1,2 @@ usr/bin/prog?exe +?msvc:usr/bin/prog.pdb diff --git a/test cases/common/196 install_mode/installed_files.txt b/test cases/common/196 install_mode/installed_files.txt index 724d954..c1de3e1 100644 --- a/test cases/common/196 install_mode/installed_files.txt +++ b/test cases/common/196 install_mode/installed_files.txt @@ -1,5 +1,6 @@ usr/bin/runscript.sh usr/bin/trivialprog?exe +?msvc:usr/bin/trivialprog.pdb usr/include/config.h usr/include/rootdir.h usr/libtest/libstat.a diff --git a/test cases/common/25 library versions/installed_files.txt b/test cases/common/25 library versions/installed_files.txt index e10d1dd..c842ed8 100644 --- a/test cases/common/25 library versions/installed_files.txt +++ b/test cases/common/25 library versions/installed_files.txt @@ -1 +1,2 @@ usr/lib/prefixsomelib.suffix +?msvc:usr/lib/prefixsomelib.pdb diff --git a/test cases/common/43 library chain/installed_files.txt b/test cases/common/43 library chain/installed_files.txt index c7dab9f..5e796b0 100644 --- a/test cases/common/43 library chain/installed_files.txt +++ b/test cases/common/43 library chain/installed_files.txt @@ -1 +1,2 @@ usr/bin/prog?exe +?msvc:usr/bin/prog.pdb diff --git a/test cases/common/46 subproject/installed_files.txt b/test cases/common/46 subproject/installed_files.txt index dc09fb7..dba3202 100644 --- a/test cases/common/46 subproject/installed_files.txt +++ b/test cases/common/46 subproject/installed_files.txt @@ -1,2 +1,3 @@ usr/bin/user?exe +?msvc:usr/bin/user.pdb usr/share/sublib/sublib.depmf diff --git a/test cases/common/48 pkgconfig-gen/installed_files.txt b/test cases/common/48 pkgconfig-gen/installed_files.txt index 3c44d28..94de704 100644 --- a/test cases/common/48 pkgconfig-gen/installed_files.txt +++ b/test cases/common/48 pkgconfig-gen/installed_files.txt @@ -1,3 +1,4 @@ usr/include/simple.h usr/lib/pkgconfig/simple.pc usr/lib/pkgconfig/libfoo.pc +usr/lib/pkgconfig/libhello.pc diff --git a/test cases/common/49 custom install dirs/installed_files.txt b/test cases/common/49 custom install dirs/installed_files.txt index 0cc533a..7d24ce8 100644 --- a/test cases/common/49 custom install dirs/installed_files.txt +++ b/test cases/common/49 custom install dirs/installed_files.txt @@ -1,5 +1,7 @@ usr/dib/dab/dub/prog?exe +?msvc:usr/dib/dab/dub/prog.pdb usr/dib/dab/dub2/prog2?exe +?msvc:usr/dib/dab/dub2/prog2.pdb usr/some/dir/sample.h usr/some/dir2/sample.h usr/woman/prog.1.gz diff --git a/test cases/common/57 install script/installed_files.txt b/test cases/common/57 install script/installed_files.txt index 94c1fed..28f9ed0 100644 --- a/test cases/common/57 install script/installed_files.txt +++ b/test cases/common/57 install script/installed_files.txt @@ -1,4 +1,5 @@ usr/bin/prog?exe +?msvc:usr/bin/prog.pdb usr/diiba/daaba/file.dat usr/this/should/also-work.dat usr/this/does/something-different.dat.in diff --git a/test cases/common/6 linkshared/installed_files.txt b/test cases/common/6 linkshared/installed_files.txt index c7dab9f..5e796b0 100644 --- a/test cases/common/6 linkshared/installed_files.txt +++ b/test cases/common/6 linkshared/installed_files.txt @@ -1 +1,2 @@ usr/bin/prog?exe +?msvc:usr/bin/prog.pdb diff --git a/test cases/common/64 foreach/installed_files.txt b/test cases/common/64 foreach/installed_files.txt index 2930ff0..3376925 100644 --- a/test cases/common/64 foreach/installed_files.txt +++ b/test cases/common/64 foreach/installed_files.txt @@ -1,3 +1,6 @@ usr/bin/prog1?exe +?msvc:usr/bin/prog1.pdb usr/bin/prog2?exe +?msvc:usr/bin/prog2.pdb usr/bin/prog3?exe +?msvc:usr/bin/prog3.pdb diff --git a/test cases/common/8 install/installed_files.txt b/test cases/common/8 install/installed_files.txt index cbbdc03..d3122a7 100644 --- a/test cases/common/8 install/installed_files.txt +++ b/test cases/common/8 install/installed_files.txt @@ -1,2 +1,3 @@ usr/bin/prog?exe +?msvc:usr/bin/prog.pdb usr/libtest/libstat.a diff --git a/test cases/csharp/4 external dep/installed_files.txt b/test cases/csharp/4 external dep/installed_files.txt new file mode 100644 index 0000000..f64c68c --- /dev/null +++ b/test cases/csharp/4 external dep/installed_files.txt @@ -0,0 +1 @@ +usr/bin/prog.exe diff --git a/test cases/d/3 shared library/installed_files.txt b/test cases/d/3 shared library/installed_files.txt index 6658947..4e2c591 100644 --- a/test cases/d/3 shared library/installed_files.txt +++ b/test cases/d/3 shared library/installed_files.txt @@ -2,3 +2,4 @@ usr/bin/app_d?exe ?msvc:usr/bin/stuff.dll ?msvc:usr/lib/stuff.lib ?gcc:usr/lib/libstuff.so +usr/lib/pkgconfig/test.pc diff --git a/test cases/frameworks/12 multiple gir/installed_files.txt b/test cases/frameworks/12 multiple gir/installed_files.txt index a5d16bc..9ebdf70 100644 --- a/test cases/frameworks/12 multiple gir/installed_files.txt +++ b/test cases/frameworks/12 multiple gir/installed_files.txt @@ -1,6 +1,8 @@ usr/lib/girepository-1.0/Meson-1.0.typelib usr/lib/girepository-1.0/MesonSub-1.0.typelib usr/lib/?libgirlib.so +?gcc:usr/lib/libgirlib.dll.a usr/lib/?libgirsubproject.so +?gcc:usr/lib/libgirsubproject.dll.a usr/share/gir-1.0/Meson-1.0.gir usr/share/gir-1.0/MesonSub-1.0.gir diff --git a/test cases/frameworks/23 hotdoc/installed_files.txt b/test cases/frameworks/23 hotdoc/installed_files.txt new file mode 100644 index 0000000..6804dbf --- /dev/null +++ b/test cases/frameworks/23 hotdoc/installed_files.txt @@ -0,0 +1,304 @@ +usr/share/doc/foobar/html/foo.html +usr/share/doc/foobar/html/c-index.html +usr/share/doc/foobar/html/index.html +usr/share/doc/foobar/html/dumped.trie +usr/share/doc/foobar/html/assets/css/prism.css +usr/share/doc/foobar/html/assets/css/bootstrap-toc.min.css +usr/share/doc/foobar/html/assets/css/frontend.css +usr/share/doc/foobar/html/assets/css/dumped.trie +usr/share/doc/foobar/html/assets/css/jquery.mCustomScrollbar.min.css +usr/share/doc/foobar/html/assets/css/custom_bootstrap.css +usr/share/doc/foobar/html/assets/templates/navbar_links.html +usr/share/doc/foobar/html/assets/templates/scripts.html +usr/share/doc/foobar/html/assets/templates/stylesheets.html +usr/share/doc/foobar/html/assets/templates/multi_return_value.html +usr/share/doc/foobar/html/assets/templates/parameters.html +usr/share/doc/foobar/html/assets/templates/base_page.html +usr/share/doc/foobar/html/assets/templates/footer.html +usr/share/doc/foobar/html/assets/templates/extra_head.html +usr/share/doc/foobar/html/assets/templates/parameter_detail.html +usr/share/doc/foobar/html/assets/templates/navbar_center.html +usr/share/doc/foobar/html/assets/templates/enum_member.html +usr/share/doc/foobar/html/assets/templates/member_list.html +usr/share/doc/foobar/html/assets/templates/return_item.html +usr/share/doc/foobar/html/assets/templates/subpages.html +usr/share/doc/foobar/html/assets/templates/dumped.trie +usr/share/doc/foobar/html/assets/templates/page_content.html +usr/share/doc/foobar/html/assets/templates/navbar.html +usr/share/doc/foobar/html/assets/templates/site_navigation.html +usr/share/doc/foobar/html/assets/templates/field_detail.html +usr/share/doc/foobar/html/assets/templates/brand-logo.html +usr/share/doc/foobar/html/assets/js/prism_autoloader_path_override.js +usr/share/doc/foobar/html/assets/js/jquery.js +usr/share/doc/foobar/html/assets/js/scrollspy.js +usr/share/doc/foobar/html/assets/js/isotope.pkgd.min.js +usr/share/doc/foobar/html/assets/js/utils.js +usr/share/doc/foobar/html/assets/js/typeahead.jquery.min.js +usr/share/doc/foobar/html/assets/js/language_switching.js +usr/share/doc/foobar/html/assets/js/tag_filtering.js +usr/share/doc/foobar/html/assets/js/prism-autoloader.js +usr/share/doc/foobar/html/assets/js/navbar_offset_scroller.js +usr/share/doc/foobar/html/assets/js/lines_around_headings.js +usr/share/doc/foobar/html/assets/js/trie_index.js +usr/share/doc/foobar/html/assets/js/search.js +usr/share/doc/foobar/html/assets/js/trie.js +usr/share/doc/foobar/html/assets/js/bootstrap.js +usr/share/doc/foobar/html/assets/js/navigation.js +usr/share/doc/foobar/html/assets/js/bootstrap-toc.min.js +usr/share/doc/foobar/html/assets/js/anchor.min.js +usr/share/doc/foobar/html/assets/js/prism-core.js +usr/share/doc/foobar/html/assets/js/sitemap.js +usr/share/doc/foobar/html/assets/js/dumped.trie +usr/share/doc/foobar/html/assets/js/mustache.min.js +usr/share/doc/foobar/html/assets/js/compare-versions.js +usr/share/doc/foobar/html/assets/js/jquery.touchSwipe.min.js +usr/share/doc/foobar/html/assets/js/jquery.mCustomScrollbar.concat.min.js +usr/share/doc/foobar/html/assets/js/search/members +usr/share/doc/foobar/html/assets/js/search/Hello +usr/share/doc/foobar/html/assets/js/search/hello +usr/share/doc/foobar/html/assets/js/search/type +usr/share/doc/foobar/html/assets/js/search/FooIndecision +usr/share/doc/foobar/html/assets/js/search/fooindecision +usr/share/doc/foobar/html/assets/js/search/Members +usr/share/doc/foobar/html/assets/js/search/dumped.trie +usr/share/doc/foobar/html/assets/js/search/indecision +usr/share/doc/foobar/html/assets/js/search/hotdoc_fragments/index.html-hello-world.fragment +usr/share/doc/foobar/html/assets/js/search/hotdoc_fragments/dumped.trie +usr/share/doc/foobar/html/assets/js/search/hotdoc_fragments/foo.html-FooIndecision.fragment +usr/share/doc/foobar/html/assets/prism_components/prism-inform7.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-pascal.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-bro.js +usr/share/doc/foobar/html/assets/prism_components/prism-nim.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-gherkin.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-stylus.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-ocaml.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-powershell.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-smalltalk.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-verilog.js +usr/share/doc/foobar/html/assets/prism_components/prism-puppet.js +usr/share/doc/foobar/html/assets/prism_components/prism-aspnet.js +usr/share/doc/foobar/html/assets/prism_components/prism-parigp.js +usr/share/doc/foobar/html/assets/prism_components/prism-objectivec.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-processing.js +usr/share/doc/foobar/html/assets/prism_components/prism-objectivec.js +usr/share/doc/foobar/html/assets/prism_components/prism-jsx.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-nginx.js +usr/share/doc/foobar/html/assets/prism_components/prism-powershell.js +usr/share/doc/foobar/html/assets/prism_components/prism-php.js +usr/share/doc/foobar/html/assets/prism_components/prism-smarty.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-roboconf.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-batch.js +usr/share/doc/foobar/html/assets/prism_components/prism-vhdl.js +usr/share/doc/foobar/html/assets/prism_components/prism-protobuf.js +usr/share/doc/foobar/html/assets/prism_components/prism-textile.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-crystal.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-scss.js +usr/share/doc/foobar/html/assets/prism_components/prism-bro.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-smarty.js +usr/share/doc/foobar/html/assets/prism_components/prism-bison.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-tcl.js +usr/share/doc/foobar/html/assets/prism_components/prism-pure.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-makefile.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-applescript.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-css-extras.js +usr/share/doc/foobar/html/assets/prism_components/prism-stylus.js +usr/share/doc/foobar/html/assets/prism_components/prism-q.js +usr/share/doc/foobar/html/assets/prism_components/prism-dart.js +usr/share/doc/foobar/html/assets/prism_components/prism-oz.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-haskell.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-clike.js +usr/share/doc/foobar/html/assets/prism_components/prism-kotlin.js +usr/share/doc/foobar/html/assets/prism_components/prism-http.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-bash.js +usr/share/doc/foobar/html/assets/prism_components/prism-apl.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-docker.js +usr/share/doc/foobar/html/assets/prism_components/prism-sass.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-basic.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-nasm.js +usr/share/doc/foobar/html/assets/prism_components/prism-kotlin.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-abap.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-perl.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-rust.js +usr/share/doc/foobar/html/assets/prism_components/prism-c.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-scala.js +usr/share/doc/foobar/html/assets/prism_components/prism-glsl.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-lua.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-coffeescript.js +usr/share/doc/foobar/html/assets/prism_components/prism-jade.js +usr/share/doc/foobar/html/assets/prism_components/prism-keyman.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-crystal.js +usr/share/doc/foobar/html/assets/prism_components/prism-rest.js +usr/share/doc/foobar/html/assets/prism_components/prism-json.js +usr/share/doc/foobar/html/assets/prism_components/prism-roboconf.js +usr/share/doc/foobar/html/assets/prism_components/prism-twig.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-dart.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-vim.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-handlebars.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-cpp.js +usr/share/doc/foobar/html/assets/prism_components/prism-fsharp.js +usr/share/doc/foobar/html/assets/prism_components/prism-sas.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-brainfuck.js +usr/share/doc/foobar/html/assets/prism_components/prism-haxe.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-julia.js +usr/share/doc/foobar/html/assets/prism_components/prism-jade.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-python.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-nim.js +usr/share/doc/foobar/html/assets/prism_components/prism-typescript.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-csharp.js +usr/share/doc/foobar/html/assets/prism_components/prism-brainfuck.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-asciidoc.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-groovy.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-applescript.js +usr/share/doc/foobar/html/assets/prism_components/prism-elixir.js +usr/share/doc/foobar/html/assets/prism_components/prism-diff.js +usr/share/doc/foobar/html/assets/prism_components/prism-scheme.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-parser.js +usr/share/doc/foobar/html/assets/prism_components/prism-qore.js +usr/share/doc/foobar/html/assets/prism_components/prism-yaml.js +usr/share/doc/foobar/html/assets/prism_components/prism-j.js +usr/share/doc/foobar/html/assets/prism_components/prism-mel.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-css-extras.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-erlang.js +usr/share/doc/foobar/html/assets/prism_components/prism-icon.js +usr/share/doc/foobar/html/assets/prism_components/prism-actionscript.js +usr/share/doc/foobar/html/assets/prism_components/prism-cpp.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-makefile.js +usr/share/doc/foobar/html/assets/prism_components/prism-q.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-nsis.js +usr/share/doc/foobar/html/assets/prism_components/prism-mizar.js +usr/share/doc/foobar/html/assets/prism_components/prism-wiki.js +usr/share/doc/foobar/html/assets/prism_components/prism-csharp.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-julia.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-coffeescript.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-sql.js +usr/share/doc/foobar/html/assets/prism_components/prism-php-extras.js +usr/share/doc/foobar/html/assets/prism_components/prism-basic.js +usr/share/doc/foobar/html/assets/prism_components/prism-swift.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-haxe.js +usr/share/doc/foobar/html/assets/prism_components/prism-apacheconf.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-javascript.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-markup.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-keyman.js +usr/share/doc/foobar/html/assets/prism_components/prism-sql.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-php-extras.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-scheme.js +usr/share/doc/foobar/html/assets/prism_components/prism-python.js +usr/share/doc/foobar/html/assets/prism_components/prism-autoit.js +usr/share/doc/foobar/html/assets/prism_components/prism-gherkin.js +usr/share/doc/foobar/html/assets/prism_components/prism-java.js +usr/share/doc/foobar/html/assets/prism_components/prism-parigp.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-autohotkey.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-ruby.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-nginx.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-core.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-fortran.js +usr/share/doc/foobar/html/assets/prism_components/prism-nasm.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-ini.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-protobuf.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-jsx.js +usr/share/doc/foobar/html/assets/prism_components/prism-markdown.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-nix.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-nsis.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-oz.js +usr/share/doc/foobar/html/assets/prism_components/prism-less.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-abap.js +usr/share/doc/foobar/html/assets/prism_components/prism-puppet.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-nix.js +usr/share/doc/foobar/html/assets/prism_components/prism-pascal.js +usr/share/doc/foobar/html/assets/prism_components/prism-latex.js +usr/share/doc/foobar/html/assets/prism_components/prism-verilog.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-aspnet.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-go.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-glsl.js +usr/share/doc/foobar/html/assets/prism_components/prism-inform7.js +usr/share/doc/foobar/html/assets/prism_components/prism-yaml.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-matlab.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-lua.js +usr/share/doc/foobar/html/assets/prism_components/prism-mizar.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-c.js +usr/share/doc/foobar/html/assets/prism_components/prism-fsharp.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-haml.js +usr/share/doc/foobar/html/assets/prism_components/prism-rust.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-icon.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-fortran.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-qore.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-batch.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-eiffel.js +usr/share/doc/foobar/html/assets/prism_components/prism-vim.js +usr/share/doc/foobar/html/assets/prism_components/prism-j.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-eiffel.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-elixir.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-erlang.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-matlab.js +usr/share/doc/foobar/html/assets/prism_components/prism-tcl.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-ruby.js +usr/share/doc/foobar/html/assets/prism_components/prism-d.js +usr/share/doc/foobar/html/assets/prism_components/prism-swift.js +usr/share/doc/foobar/html/assets/prism_components/prism-wiki.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-lolcode.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-latex.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-prolog.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-php.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-scss.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-vhdl.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-lolcode.js +usr/share/doc/foobar/html/assets/prism_components/prism-prolog.js +usr/share/doc/foobar/html/assets/prism_components/prism-apacheconf.js +usr/share/doc/foobar/html/assets/prism_components/prism-core.js +usr/share/doc/foobar/html/assets/prism_components/prism-diff.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-json.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-ini.js +usr/share/doc/foobar/html/assets/prism_components/dumped.trie +usr/share/doc/foobar/html/assets/prism_components/prism-r.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-markup.js +usr/share/doc/foobar/html/assets/prism_components/prism-apl.js +usr/share/doc/foobar/html/assets/prism_components/prism-markdown.js +usr/share/doc/foobar/html/assets/prism_components/prism-asciidoc.js +usr/share/doc/foobar/html/assets/prism_components/prism-ocaml.js +usr/share/doc/foobar/html/assets/prism_components/prism-javascript.js +usr/share/doc/foobar/html/assets/prism_components/prism-autohotkey.js +usr/share/doc/foobar/html/assets/prism_components/prism-less.js +usr/share/doc/foobar/html/assets/prism_components/prism-pure.js +usr/share/doc/foobar/html/assets/prism_components/prism-groovy.js +usr/share/doc/foobar/html/assets/prism_components/prism-bison.js +usr/share/doc/foobar/html/assets/prism_components/prism-sass.js +usr/share/doc/foobar/html/assets/prism_components/prism-css.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-haml.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-handlebars.js +usr/share/doc/foobar/html/assets/prism_components/prism-textile.js +usr/share/doc/foobar/html/assets/prism_components/prism-parser.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-docker.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-monkey.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-http.js +usr/share/doc/foobar/html/assets/prism_components/prism-git.js +usr/share/doc/foobar/html/assets/prism_components/prism-sas.js +usr/share/doc/foobar/html/assets/prism_components/prism-go.js +usr/share/doc/foobar/html/assets/prism_components/prism-mel.js +usr/share/doc/foobar/html/assets/prism_components/prism-rest.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-clike.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-d.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-haskell.js +usr/share/doc/foobar/html/assets/prism_components/prism-git.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-java.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-rip.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-perl.js +usr/share/doc/foobar/html/assets/prism_components/prism-typescript.js +usr/share/doc/foobar/html/assets/prism_components/prism-actionscript.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-autoit.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-rip.js +usr/share/doc/foobar/html/assets/prism_components/prism-twig.js +usr/share/doc/foobar/html/assets/prism_components/prism-monkey.js +usr/share/doc/foobar/html/assets/prism_components/prism-processing.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-scala.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-smalltalk.js +usr/share/doc/foobar/html/assets/prism_components/prism-bash.min.js +usr/share/doc/foobar/html/assets/prism_components/prism-r.js +usr/share/doc/foobar/html/assets/prism_components/prism-css.js +usr/share/doc/foobar/html/assets/fonts/glyphicons-halflings-regular.woff +usr/share/doc/foobar/html/assets/fonts/glyphicons-halflings-regular.woff2 +usr/share/doc/foobar/html/assets/fonts/glyphicons-halflings-regular.svg +usr/share/doc/foobar/html/assets/fonts/glyphicons-halflings-regular.ttf +usr/share/doc/foobar/html/assets/fonts/glyphicons-halflings-regular.eot +usr/share/doc/foobar/html/assets/fonts/dumped.trie +usr/share/doc/foobar/html/assets/images/home.svg +usr/share/doc/foobar/html/assets/images/dumped.trie diff --git a/test cases/frameworks/7 gnome/installed_files.txt b/test cases/frameworks/7 gnome/installed_files.txt index 7502888..281b000 100644 --- a/test cases/frameworks/7 gnome/installed_files.txt +++ b/test cases/frameworks/7 gnome/installed_files.txt @@ -4,6 +4,7 @@ usr/include/enums3.h usr/include/enums5.h usr/include/marshaller.h usr/lib/?libgir_lib.so +usr/lib/?libgir_lib2.so usr/lib/?libdep1lib.so usr/lib/?libdep2lib.so usr/lib/girepository-1.0/Meson-1.0.typelib @@ -14,5 +15,6 @@ usr/share/gir-1.0/MesonDep1-1.0.gir usr/share/gir-1.0/MesonDep2-1.0.gir usr/share/glib-2.0/schemas/com.github.meson.gschema.xml usr/share/simple-resources.gresource +usr/include/enums6.h usr/include/simple-resources.h usr/include/generated-gdbus.h diff --git a/test cases/osx/4 framework/installed_files.txt b/test cases/osx/4 framework/installed_files.txt new file mode 100644 index 0000000..2c6bd93 --- /dev/null +++ b/test cases/osx/4 framework/installed_files.txt @@ -0,0 +1,2 @@ +usr/bin/prog +usr/lib/libstat.a diff --git a/test cases/vala/11 generated vapi/installed_files.txt b/test cases/vala/11 generated vapi/installed_files.txt index aeaf2da..b0d701f 100644 --- a/test cases/vala/11 generated vapi/installed_files.txt +++ b/test cases/vala/11 generated vapi/installed_files.txt @@ -1,6 +1,8 @@ -usr/bin/vapigen-test +usr/bin/vapigen-test?exe usr/lib/?libfoo.so +?gcc:usr/lib/libfoo.dll.a usr/lib/?libbar.so +?gcc:usr/lib/libbar.dll.a usr/share/vala/vapi/foo-1.0.vapi usr/share/vala/vapi/foo-1.0.deps usr/share/vala/vapi/bar-1.0.vapi diff --git a/test cases/vala/7 shared library/installed_files.txt b/test cases/vala/7 shared library/installed_files.txt index 012b107..7d36c36 100644 --- a/test cases/vala/7 shared library/installed_files.txt +++ b/test cases/vala/7 shared library/installed_files.txt @@ -1,5 +1,7 @@ usr/lib/?libinstalled_vala_lib.so usr/lib/?libinstalled_vala_all.so +?gcc:usr/lib/libinstalled_vala_all.dll.a +?gcc:usr/lib/libinstalled_vala_lib.dll.a usr/include/installed_vala_all.h usr/include/valah/installed_vala_all_nolib.h usr/include/installed_vala_onlyh.h diff --git a/test cases/vala/8 generated sources/installed_files.txt b/test cases/vala/8 generated sources/installed_files.txt index e1e9432..ae0f65f 100644 --- a/test cases/vala/8 generated sources/installed_files.txt +++ b/test cases/vala/8 generated sources/installed_files.txt @@ -1,2 +1,3 @@ -usr/bin/generatedtest -usr/bin/onlygentest +usr/bin/generatedtestparent?exe +usr/bin/generatedtest?exe +usr/bin/onlygentest?exe diff --git a/test cases/vala/9 gir/installed_files.txt b/test cases/vala/9 gir/installed_files.txt index 64bddee..f7ee091 100644 --- a/test cases/vala/9 gir/installed_files.txt +++ b/test cases/vala/9 gir/installed_files.txt @@ -1,2 +1,3 @@ -usr/lib/?libfoo.so +?gcc:usr/lib/?libfoo.so +?gcc:usr/lib/libfoo.dll.a usr/share/gir-1.0/Foo-1.0.gir diff --git a/test cases/windows/7 dll versioning/installed_files.txt b/test cases/windows/7 dll versioning/installed_files.txt index 20482bf..0d91c7c 100644 --- a/test cases/windows/7 dll versioning/installed_files.txt +++ b/test cases/windows/7 dll versioning/installed_files.txt @@ -4,14 +4,18 @@ ?msvc:usr/bin/noversion.dll ?msvc:usr/bin/noversion.pdb ?msvc:usr/lib/noversion.lib +?msvc:usr/lib/noversion.pdb ?msvc:usr/bin/onlyversion-1.dll ?msvc:usr/lib/onlyversion.lib ?msvc:usr/bin/onlysoversion-5.dll +?msvc:usr/bin/onlysoversion-5.pdb ?msvc:usr/lib/onlysoversion.lib ?msvc:usr/libexec/customdir.dll ?msvc:usr/libexec/customdir.lib +?msvc:usr/libexec/customdir.pdb ?msvc:usr/lib/module.dll ?msvc:usr/lib/module.lib +?msvc:usr/lib/module.pdb ?gcc:usr/bin/?libsome-0.dll ?gcc:usr/lib/libsome.dll.a ?gcc:usr/bin/?libnoversion.dll -- cgit v1.1 From 81e7a0981b7a815c8a85c731d7b2ca7676145130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 14 Sep 2018 08:48:56 +0200 Subject: run_project_tests: remove pdb workaround, just use filters And ignore .dll.a files in non cygwin gcc instances --- run_project_tests.py | 11 ++--------- test cases/windows/1 basic/installed_files.txt | 2 +- test cases/windows/11 exe implib/installed_files.txt | 4 ++-- test cases/windows/7 dll versioning/installed_files.txt | 1 + 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/run_project_tests.py b/run_project_tests.py index 841f072..54b25a5 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -155,7 +155,7 @@ def platform_fix_name(fname, compiler, env): if fname.startswith('?gcc:'): fname = fname[5:] - if compiler == 'cl': + if compiler == 'cl' or fname.endswith('dll.a') and not mesonlib.for_cygwin(env.is_cross_build(), env): return None return fname @@ -183,19 +183,12 @@ def validate_install(srcdir, installdir, compiler, env): expected[fname] = True for (fname, found) in expected.items(): if not found: - # Ignore missing PDB files if we aren't using cl - if fname.endswith('.pdb') and compiler != 'cl': - continue ret_msg += 'Expected file {0} missing.\n'.format(fname) # Check if there are any unexpected files found = get_relative_files_list_from_dir(installdir) for fname in found: - # Windows-specific tests check for the existence of installed PDB - # files, but common tests do not, for obvious reasons. Ignore any - # extra PDB files found. if fname not in expected: - if not (fname.endswith('.pdb') and compiler != 'cl'): - ret_msg += 'Extra file {0} found.\n'.format(fname) + ret_msg += 'Extra file {0} found.\n'.format(fname) return ret_msg def log_text_file(logfile, testdir, stdo, stde): diff --git a/test cases/windows/1 basic/installed_files.txt b/test cases/windows/1 basic/installed_files.txt index 8c8464a..5022d28 100644 --- a/test cases/windows/1 basic/installed_files.txt +++ b/test cases/windows/1 basic/installed_files.txt @@ -1,2 +1,2 @@ usr/bin/prog.exe -usr/bin/prog.pdb +?msvc:usr/bin/prog.pdb diff --git a/test cases/windows/11 exe implib/installed_files.txt b/test cases/windows/11 exe implib/installed_files.txt index bd2abe9..b1e805c 100644 --- a/test cases/windows/11 exe implib/installed_files.txt +++ b/test cases/windows/11 exe implib/installed_files.txt @@ -1,7 +1,7 @@ usr/bin/prog.exe -usr/bin/prog.pdb +?msvc:usr/bin/prog.pdb usr/bin/prog2.exe -usr/bin/prog2.pdb +?msvc:usr/bin/prog2.pdb ?gcc:usr/lib/libprog.exe.a ?gcc:usr/lib/libburble.a ?msvc:usr/lib/prog.exe.lib diff --git a/test cases/windows/7 dll versioning/installed_files.txt b/test cases/windows/7 dll versioning/installed_files.txt index 0d91c7c..517620e 100644 --- a/test cases/windows/7 dll versioning/installed_files.txt +++ b/test cases/windows/7 dll versioning/installed_files.txt @@ -6,6 +6,7 @@ ?msvc:usr/lib/noversion.lib ?msvc:usr/lib/noversion.pdb ?msvc:usr/bin/onlyversion-1.dll +?msvc:usr/bin/onlyversion-1.pdb ?msvc:usr/lib/onlyversion.lib ?msvc:usr/bin/onlysoversion-5.dll ?msvc:usr/bin/onlysoversion-5.pdb -- cgit v1.1 From 0fc9a6018975c641d677f2827bbc58481dcd8d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Fri, 14 Sep 2018 21:43:24 +0200 Subject: run_proect_tests: add cygwin as platform fix name --- run_project_tests.py | 7 ++++++- test cases/frameworks/12 multiple gir/installed_files.txt | 4 ++-- test cases/vala/11 generated vapi/installed_files.txt | 4 ++-- test cases/vala/7 shared library/installed_files.txt | 4 ++-- test cases/vala/9 gir/installed_files.txt | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/run_project_tests.py b/run_project_tests.py index 54b25a5..27e588b 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -155,7 +155,12 @@ def platform_fix_name(fname, compiler, env): if fname.startswith('?gcc:'): fname = fname[5:] - if compiler == 'cl' or fname.endswith('dll.a') and not mesonlib.for_cygwin(env.is_cross_build(), env): + if compiler == 'cl': + return None + + if fname.startswith('?cygwin:'): + fname = fname[8:] + if compiler == 'cl' or not mesonlib.for_cygwin(env.is_cross_build(), env): return None return fname diff --git a/test cases/frameworks/12 multiple gir/installed_files.txt b/test cases/frameworks/12 multiple gir/installed_files.txt index 9ebdf70..3f9a8f2 100644 --- a/test cases/frameworks/12 multiple gir/installed_files.txt +++ b/test cases/frameworks/12 multiple gir/installed_files.txt @@ -1,8 +1,8 @@ usr/lib/girepository-1.0/Meson-1.0.typelib usr/lib/girepository-1.0/MesonSub-1.0.typelib usr/lib/?libgirlib.so -?gcc:usr/lib/libgirlib.dll.a +?cygwin:usr/lib/libgirlib.dll.a usr/lib/?libgirsubproject.so -?gcc:usr/lib/libgirsubproject.dll.a +?cygwin:usr/lib/libgirsubproject.dll.a usr/share/gir-1.0/Meson-1.0.gir usr/share/gir-1.0/MesonSub-1.0.gir diff --git a/test cases/vala/11 generated vapi/installed_files.txt b/test cases/vala/11 generated vapi/installed_files.txt index b0d701f..ca41d65 100644 --- a/test cases/vala/11 generated vapi/installed_files.txt +++ b/test cases/vala/11 generated vapi/installed_files.txt @@ -1,8 +1,8 @@ usr/bin/vapigen-test?exe usr/lib/?libfoo.so -?gcc:usr/lib/libfoo.dll.a +?cygwin:usr/lib/libfoo.dll.a usr/lib/?libbar.so -?gcc:usr/lib/libbar.dll.a +?cygwin:usr/lib/libbar.dll.a usr/share/vala/vapi/foo-1.0.vapi usr/share/vala/vapi/foo-1.0.deps usr/share/vala/vapi/bar-1.0.vapi diff --git a/test cases/vala/7 shared library/installed_files.txt b/test cases/vala/7 shared library/installed_files.txt index 7d36c36..83cbb63 100644 --- a/test cases/vala/7 shared library/installed_files.txt +++ b/test cases/vala/7 shared library/installed_files.txt @@ -1,7 +1,7 @@ usr/lib/?libinstalled_vala_lib.so +?cygwin:usr/lib/libinstalled_vala_lib.dll.a usr/lib/?libinstalled_vala_all.so -?gcc:usr/lib/libinstalled_vala_all.dll.a -?gcc:usr/lib/libinstalled_vala_lib.dll.a +?cygwin:usr/lib/libinstalled_vala_all.dll.a usr/include/installed_vala_all.h usr/include/valah/installed_vala_all_nolib.h usr/include/installed_vala_onlyh.h diff --git a/test cases/vala/9 gir/installed_files.txt b/test cases/vala/9 gir/installed_files.txt index f7ee091..890b47a 100644 --- a/test cases/vala/9 gir/installed_files.txt +++ b/test cases/vala/9 gir/installed_files.txt @@ -1,3 +1,3 @@ ?gcc:usr/lib/?libfoo.so -?gcc:usr/lib/libfoo.dll.a +?cygwin:usr/lib/libfoo.dll.a usr/share/gir-1.0/Foo-1.0.gir -- cgit v1.1