From b0768a0467baccbda5b5217a11afd0c7d4bb102e Mon Sep 17 00:00:00 2001 From: Andrew Hamilton Date: Wed, 10 Jul 2019 11:38:55 +1000 Subject: [PATCH] Exempt WebAssembly tools, since not yet in Ubuntu. --- eris/tools.toml | 6 +++--- tests/tools_test.py | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/eris/tools.toml b/eris/tools.toml index e7ad6ae..731742f 100644 --- a/eris/tools.toml +++ b/eris/tools.toml @@ -19,7 +19,7 @@ tools_for_extensions = [ [["php"], ["php7_syntax"]], [["go"], ["go_vet", "golint", "godoc"]], [["bash", "sh", "dash", "ksh"], ["shellcheck"]], - [["wasm"], ["wasm-validate", "wasm-objdump"]], + [["wasm"], ["wasm_validate", "wasm_objdump"]], [["pdf"], ["pdf2txt"]], [["html", "htm"], ["html_syntax", "html2text", "pandoc"]], [["yaml", "yml"], ["yamllint"]], @@ -234,12 +234,12 @@ tools_for_extensions = [ url = "https://github.com/golang/lint" command = "golint -set_exit_status" -[wasm-validate] +[wasm_validate] dependencies = ["git/github.com/WebAssembly/wabt"] url = "https://github.com/WebAssembly/wabt" command = "wasm-validate" -[wasm-objdump] +[wasm_objdump] dependencies = ["git/github.com/WebAssembly/wabt"] url = "https://github.com/WebAssembly/wabt" command = "wasm-objdump --disassemble" diff --git a/tests/tools_test.py b/tests/tools_test.py index a02a555..5c4f5e9 100755 --- a/tests/tools_test.py +++ b/tests/tools_test.py @@ -23,7 +23,9 @@ ERIS_ROOT = os.path.dirname(__file__) class ExecutablesTestCase(unittest.TestCase): def test_executables_exist_in_path(self): - for tool in tools.tools_all(): + # Tools not in ubuntu: + exceptions = {tools.wasm_validate, tools.wasm_objdump} + for tool in tools.tools_all() - exceptions: if hasattr(tool, "executables"): for executable in tool.executables: with self.subTest(executable=executable, tool=tool):