Auto merge of #45737 - oli-obk:json, r=petrochenkov

Pretty print json in ui tests

I found the json output in one line to not be useful for reviewing

r? @petrochenkov

diff --cc src/librustc/session/config.rs
Simple merge

diff --cc src/tools/compiletest/src/runtest.rs
Simple merge