Fix infinite blocking of test_gdalinfo_16() on Windows, and potential failure of test_ogrinfo_15()

git-svn-id: https://svn.osgeo.org/gdal/trunk@25424 f0d54148-0727-0410-94bb-9a71ac55c965