test-layout: Better error reporting

Run diff over the output to give a meaningful error if the
comparison fails.
layout tests: Adapt expected output

We see the 'ellipsized' analysis flag in the output now,
as we should.