fixup! Merge pull request #156 from kasal/test-fix-rev

This reverts commit e42bb072318889716caa9004b5953e8150ed7aa4, reversing
changes made to 648a3440de553db0b323c8bdd9c758cbbee8445b.

These changes will be obsoleted by the 'win-tests-rebase' branch.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
fixup! Merge pull request #158 from kasal/test-simplify

This reverts commit 56e5a97d116fe75869e78c766363d9e2fe6304c3, reversing
changes made to 5769bd5de2128874082df65232d6930132cf423e.

We will merge the `win-tests-rebase` branch in a moment which makes this
pull request obsolete.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
fixup! Merge 'win-tests-fixes' into HEAD

This reverts commit 616c7ba9be71cf837f123671270e4b7b60fe49d3, reversing
changes made to 85efa6f0127dbefc98f4d50b0a80c871a46bb4ad.

Stepan Kasal provided a rebased version of this topic branch. Let's revert
the old version first.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Merge 'win-tests-rebase'

This branch is meant to replace 'win-tests-fixes', with several commits
dropped or modified, as they are (no longer) necessary.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>