Merge lp:~linuxjedi/libdrizzle/5.1-fix-wine into lp:libdrizzle

[Andrew Hutchings]

Switch to wine instead of wineconsole for tests

This is due to the following bug which remains unfixed:

http://bugs.winehq.org/show_bug.cgi?id=25390

For us the limited console support in the wine exec is more than adequate

Unmerged revisions

85. By Andrew Hutchings on 2013-01-08

Switch to wine instead of wineconsole for tests

This is due to the following bug which remains unfixed:

http://bugs.winehq.org/show_bug.cgi?id=25390

For us the limited console support in the wine exec is more than adequate

=== modified file 'bootstrap.sh'
--- bootstrap.sh	2013-01-07 05:33:02 +0000
+++ bootstrap.sh	2013-01-08 10:51:21 +0000
@@ -535,8 +535,8 @@
   assert_file 'Makefile'
 
   mingw32-make || die 'mingw32-make failed'
-  if command_exists wineconsole; then
-    TESTS_ENVIRONMENT='wineconsole --backend=curses'
+  if command_exists wine; then
+    TESTS_ENVIRONMENT='wine'
     mingw32-make 'check' || die 'mingw32-make check failed'
   fi
 }

=== modified file 'docs/compiling.rst'
--- docs/compiling.rst	2013-01-06 23:47:56 +0000
+++ docs/compiling.rst	2013-01-08 10:51:21 +0000
@@ -72,9 +72,9 @@
    
          "PATH"=str(2):"C:\\windows\\system32;C:\\windows;C:\\windows\\system32\\wbem;Z:\\usr\\i686-w64-mingw32\\sys-root\\mingw\\bin"
 
-#. Run the test suite as follows (see :ref:`test-suite` for more details and needed environment variables when running the test suite)::
+#. Run the test suite, it automatically sets ``TESTS_ENVIRONMENTS`` for you if you have wine installed (see :ref:`test-suite` for more details on running thetest suite)::
 
-      WINEARCH=win32 TESTS_ENVIRONMENT=wine make check
+      TESTS_ENVIRONMENT=wine
 
 Linking Your Application
 ------------------------