From d808e900b8b8a0bc99d77fd38e94426df73c3afa Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Fri, 15 Jan 2021 16:03:32 +0000 Subject: Reducer: Improve warning on scripts that ignore the input (#3490) The risk the warning checks for is giving the reducer a script that ignores the input. To do so it runs the command in the input, and runs it on a garbage file, and checks if the result is different. However, if the script does immediately fail on the input - because the input is a crash testcase or such - then this does not work, as the result on a garbage input may be the same error. To avoid that, also check what happens on a trivial valid wasm as input. Only show the warning if the result on the original input, on a garbage wasm, and on a trivial wasm, are all the same - in that case, likely the script really is ignoring the input. --- src/tools/wasm-reduce.cpp | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/tools/wasm-reduce.cpp b/src/tools/wasm-reduce.cpp index 13288c79d..a6bf238fc 100644 --- a/src/tools/wasm-reduce.cpp +++ b/src/tools/wasm-reduce.cpp @@ -1199,19 +1199,30 @@ int main(int argc, const char* argv[]) { expected); } - std::cerr - << "|checking that command has different behavior on invalid binary (this " - "verifies that the test file is used by the command)\n"; - { + if (!force) { + std::cerr << "|checking that command has different behavior on different " + "inputs (this " + "verifies that the test file is used by the command)\n"; + // Try it on an invalid input. { std::ofstream dst(test, std::ios::binary); dst << "waka waka\n"; } - ProgramResult result(command); - if (result == expected) { - stopIfNotForced( - "running command on an invalid module should give different results", - result); + ProgramResult resultOnInvalid(command); + if (resultOnInvalid == expected) { + // Try it on a valid input. + Module emptyModule; + ModuleWriter writer; + writer.setBinary(true); + writer.write(emptyModule, test); + ProgramResult resultOnValid(command); + if (resultOnValid == expected) { + Fatal() + << "running the command on the given input gives the same result as " + "when running it on either a trivial valid wasm or a file with " + "nonsense in it. does the script not look at the test file (" + + test + ")? (use -f to ignore this check)"; + } } } -- cgit v1.2.3