Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

report errors correctly in ufuzz #3456

Merged
merged 1 commit into from Oct 7, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions test/ufuzz.js
Expand Up @@ -960,12 +960,12 @@ if (require.main !== module) {
}

function println(msg) {
if (typeof msg != "undefined") process.stdout.write(msg);
if (typeof msg != "undefined") process.stdout.write(typeof msg == "string" ? msg : msg.stack);
process.stdout.write("\n");
}

function errorln(msg) {
if (typeof msg != "undefined") process.stderr.write(msg);
if (typeof msg != "undefined") process.stderr.write(typeof msg == "string" ? msg : msg.stack);
process.stderr.write("\n");
}

Expand All @@ -980,7 +980,7 @@ function try_beautify(code, toplevel, result, printfn) {
});
if (beautified.error) {
printfn("// !!! beautify failed !!!");
printfn(beautified.error.stack);
printfn(beautified.error);
} else if (sandbox.same_stdout(sandbox.run_code(beautified.code, toplevel), result)) {
printfn("// (beautified)");
printfn(beautified.code);
Expand All @@ -1007,7 +1007,7 @@ function log_suspects(minify_options, component) {
var result = UglifyJS.minify(original_code, m);
if (result.error) {
errorln("Error testing options." + component + "." + name);
errorln(result.error.stack);
errorln(result.error);
} else {
var r = sandbox.run_code(result.code, m.toplevel);
return sandbox.same_stdout(original_result, r);
Expand All @@ -1029,7 +1029,7 @@ function log_rename(options) {
var result = UglifyJS.minify(original_code, m);
if (result.error) {
errorln("Error testing options.rename");
errorln(result.error.stack);
errorln(result.error);
} else {
var r = sandbox.run_code(result.code, m.toplevel);
if (sandbox.same_stdout(original_result, r)) {
Expand All @@ -1056,17 +1056,17 @@ function log(options) {
errorln();
errorln();
errorln("original result:");
errorln(errored ? original_result.stack : original_result);
errorln(original_result);
errorln("uglified result:");
errorln(typeof uglify_result == "string" ? uglify_result : uglify_result.stack);
errorln(uglify_result);
} else {
errorln("// !!! uglify failed !!!");
errorln(uglify_code.stack);
errorln(uglify_code);
if (errored) {
errorln();
errorln();
errorln("original stacktrace:");
errorln(original_result.stack);
errorln(original_result);
}
}
errorln("minify(options):");
Expand Down Expand Up @@ -1115,7 +1115,7 @@ for (var round = 1; round <= num_iterations; round++) {
println();
println();
println("original result:");
println(original_result.stack);
println(original_result);
println();
}
if (!ok && isFinite(num_iterations)) {
Expand Down