Fix qtqa autotest for mingw build.

Skip autotest in 41-print_calling_makefile.t if MinGW is used.
This script is a workaround for nmake's lack of any equivalent
to GNU make's $(MAKEFILE_LIST), thus there is no need to test
it with MinGW builds.

Pass correct make command for testplanner.pl and testscheduler.t,
in respective test cases. Without '--make' argument, the scripts
default to `nmake' on Windows and `make' everywhere else.

Change preprocessor macro used in pass.cpp, so that file compiles
for both Visual Studio and MinGW. According to MS docs
http://msdn.microsoft.com/en-us/library/b0084kay(v=vs.80).aspx


is always defined for Windows applications (both 32 and 64-bit).

Change-Id: I3a63a8c44b4bb0d0c066d8dc21a6559d54cfdb98
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Samuli Piippo <samuli.piippo@digia.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>

scripts/generic/t/40-testplanner.t

@@ -51,6 +51,20 @@ sub test_testplanner_on_testdata
         "$testplan",
     );
 
+    if ($OSNAME =~ m{win32}i) {
+        if (!system( 'where', "/Q", "nmake" )) {
+            push @cmd, (
+                '--make',
+                'nmake',
+            );
+        } elsif (!system( 'where', "/Q", "mingw32-make" )) {
+            push @cmd, (
+                '--make',
+                'mingw32-make',
+            );
+        } # else - use default
+    } # else - use default
+
     my $status = system( @cmd );
     is( $status, 0, 'testplanner exit code OK' );
 

scripts/generic/t/41-print_calling_makefile.t

@@ -40,21 +40,25 @@ sub test_cmd
 
 sub run
 {
-    SKIP: {
-        skip( 'Win32-specific test', 1 ) if ($OSNAME !~ m{win32}i);
-
-        local $CWD = $TESTDATA_DIR;
-
-        for my $makefile ('basic-makefile', 'makefile with spaces') {
-            ok( test_cmd( [qw(nmake -C -S -F), $makefile], $makefile ) );
-            ok( test_cmd( [qw(nmake -C -S /F), $makefile], $makefile ) );
-            ok( test_cmd( [qw(nmake -C -S -f), $makefile], $makefile ) );
-            ok( test_cmd( [qw(nmake -C -S /f), $makefile], $makefile ) );
-            ok( test_cmd( [qw(nmake -C -S), "-F$makefile"], $makefile ) );
-            ok( test_cmd( [qw(nmake -C -S), "/F$makefile"], $makefile ) );
-            ok( test_cmd( [qw(nmake -C -S), "-f$makefile"], $makefile ) );
-            ok( test_cmd( [qw(nmake -C -S), "/f$makefile"], $makefile ) );
-        }
+    my $should_skip = 1;
+    if ($OSNAME =~ m{win32}i) {
+        # Skip this test case also on Windows if nmake is not in path
+        $should_skip = system( 'where', "/Q", "nmake" );
+    }
+    plan 'skip_all', "This test is relevant only on Win32 and nmake" if ($should_skip != 0);
+
+
+    local $CWD = $TESTDATA_DIR;
+
+    for my $makefile ('basic-makefile', 'makefile with spaces') {
+        ok( test_cmd( [qw(nmake -C -S -F), $makefile], $makefile ) );
+        ok( test_cmd( [qw(nmake -C -S /F), $makefile], $makefile ) );
+        ok( test_cmd( [qw(nmake -C -S -f), $makefile], $makefile ) );
+        ok( test_cmd( [qw(nmake -C -S /f), $makefile], $makefile ) );
+        ok( test_cmd( [qw(nmake -C -S), "-F$makefile"], $makefile ) );
+        ok( test_cmd( [qw(nmake -C -S), "/F$makefile"], $makefile ) );
+        ok( test_cmd( [qw(nmake -C -S), "-f$makefile"], $makefile ) );
+        ok( test_cmd( [qw(nmake -C -S), "/f$makefile"], $makefile ) );
     }
 
     done_testing;

scripts/generic/t/50-testscheduler.t

@@ -99,9 +99,24 @@ sub make_testplan_from_directory
         $directory,
         '--output',
         "$testplan",
-        @args,
     );
 
+    if ($OSNAME =~ m{win32}i) {
+        if (!system( 'where', "/Q", "nmake" )) {
+            push @cmd, (
+                '--make',
+                'nmake',
+            );
+        } elsif (!system( 'where', "/Q", "mingw32-make" )) {
+            push @cmd, (
+                '--make',
+                'mingw32-make',
+            );
+        } # else - use default
+    } # else - use default
+
+    push (@cmd, @args);
+
     my $status = system( @cmd );
     is( $status, 0, 'testplanner exit code OK' );
 

scripts/generic/t/data/test-projects/src/pass.cpp

@@ -41,7 +41,7 @@
 
 #include <stdio.h>
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 # include <windows.h>
 # define sleep(x) Sleep(x*1000)
 #else