Revert "Tests: Add diagnostic to ExportImport test."

This reverts commit 2a66d7e98e31abb532bdf64ea342d4d443784494.
It will be replaced by a change that makes the test work without
manually setting CMAKE_TEST_MAKEPROGRAM.
Merge topic 'minor-cleanups' into next

0a4ef17 Revert "Tests: Add diagnostic to ExportImport test."