Fix FSharp QA suite (#2845)

* 'and' is not recognized as an internal or external command,

* fix fsharpqa suite

build.cmd

@@ -673,7 +673,6 @@ ECHO NUNITPATH=%NUNITPATH%
 
 REM ---------------- net40-fsharp  -----------------------
 
-
 if "%TEST_NET40_FSHARP_SUITE%" == "1" (
 
     set OUTPUTARG=
@@ -714,16 +713,16 @@ if "%TEST_NET40_FSHARPQA_SUITE%" == "1" (
     set FSC=!FSCBINPATH!\fsc.exe
     set FSCOREDLLPATH=!FSCBinPath!\FSharp.Core.dll
     set PATH=!FSCBINPATH!;!PATH!
-    set perlexe= %~dp0packages\StrawberryPerl64.5.22.2.1\Tools\perl\bin\perl.exe
-    if not exist %perlexe% echo Error: perl was not downloaded from check the packages directory: %perlexe% && goto :failure
+    set perlexe=%~dp0packages\StrawberryPerl64.5.22.2.1\Tools\perl\bin\perl.exe
+    if not exist !perlexe! (echo Error: perl was not downloaded from check the packages directory: !perlexe! && goto :failure )
 
     set OUTPUTFILE=test-net40-fsharpqa-results.log
     set ERRORFILE=test-net40-fsharpqa-errors.log
     set FAILENV=test-net40-fsharpqa-errors
 
     pushd %~dp0tests\fsharpqa\source
-    echo %perlexe% %~dp0tests\fsharpqa\testenv\bin\runall.pl -resultsroot !RESULTSDIR! -results !OUTPUTFILE! -log !ERRORFILE! -fail !FAILENV! -cleanup:no !TTAGS_ARG_RUNALL! !PARALLEL_ARG!
-         %perlexe% %~dp0tests\fsharpqa\testenv\bin\runall.pl -resultsroot !RESULTSDIR! -results !OUTPUTFILE! -log !ERRORFILE! -fail !FAILENV! -cleanup:no !TTAGS_ARG_RUNALL! !PARALLEL_ARG!
+    echo !perlexe! %~dp0tests\fsharpqa\testenv\bin\runall.pl -resultsroot !RESULTSDIR! -results !OUTPUTFILE! -log !ERRORFILE! -fail !FAILENV! -cleanup:no !TTAGS_ARG_RUNALL! !PARALLEL_ARG!
+         !perlexe! %~dp0tests\fsharpqa\testenv\bin\runall.pl -resultsroot !RESULTSDIR! -results !OUTPUTFILE! -log !ERRORFILE! -fail !FAILENV! -cleanup:no !TTAGS_ARG_RUNALL! !PARALLEL_ARG!
 
     popd
     if ERRORLEVEL 1 (

tests/fsharpqa/Source/Optimizations/Inlining/Match01.il.bsl

 

tests/fsharpqa/Source/Optimizations/Inlining/StructUnion01.il.bsl

@@ -25,20 +25,20 @@
 }
 .mresource public FSharpSignatureData.StructUnion01
 {
-  // Offset: 0x00000000 Length: 0x0000088A
+  // Offset: 0x00000000 Length: 0x00000884
 }
 .mresource public FSharpOptimizationData.StructUnion01
 {
-  // Offset: 0x00000890 Length: 0x00000421
+  // Offset: 0x00000888 Length: 0x00000421
 }
 .module StructUnion01.dll
-// MVID: {576332E3-D3E9-6B24-A745-0383E3326357}
+// MVID: {58EED771-D3E9-6B24-A745-038371D7EE58}
 .imagebase 0x00400000
 .file alignment 0x00000200
 .stackreserve 0x00100000
 .subsystem 0x0003       // WINDOWS_CUI
 .corflags 0x00000001    //  ILONLY
-// Image base: 0x007C0000
+// Image base: 0x030C0000
 
 
 // =============== CLASS MEMBERS DECLARATION ===================
@@ -47,7 +47,7 @@
        extends [mscorlib]System.Object
 {
   .custom instance void [FSharp.Core]Microsoft.FSharp.Core.CompilationMappingAttribute::.ctor(valuetype [FSharp.Core]Microsoft.FSharp.Core.SourceConstructFlags) = ( 01 00 07 00 00 00 00 00 ) 
-  .class auto autochar serializable sealed nested public beforefieldinit U
+  .class sequential autochar serializable sealed nested public beforefieldinit U
          extends [mscorlib]System.ValueType
          implements class [mscorlib]System.IEquatable`1<valuetype StructUnion01/U>,
                     [mscorlib]System.Collections.IStructuralEquatable,
@@ -153,10 +153,10 @@
     } // end of method U::__DebugDisplay
 
     .method public strict virtual instance string 
-              ToString() cil managed
+            ToString() cil managed
     {
       .custom instance void [mscorlib]System.Runtime.CompilerServices.CompilerGeneratedAttribute::.ctor() = ( 01 00 00 00 ) 
-      // Code size       22 (0x16)
+      // Code size       27 (0x1b)
       .maxstack  8
       IL_0000:  ldstr      "%+A"
       IL_0005:  newobj     instance void class [FSharp.Core]Microsoft.FSharp.Core.PrintfFormat`5<class [FSharp.Core]Microsoft.FSharp.Core.FSharpFunc`2<valuetype StructUnion01/U,string>,class [FSharp.Core]Microsoft.FSharp.Core.Unit,string,string,valuetype StructUnion01/U>::.ctor(string)

tests/fsharpqa/Source/run.pl

@@ -369,7 +369,7 @@ if ($targetType == TARGET_EXE) {
 }
 
 if ($VerifyStrongName && $targetType <= TARGET_MOD) {
-  RunExit(TEST_FAIL, "Assembly failed verification:\n") if RunCommand("VerifyStroingName","sn -q -vf $targetName",1);
+  RunExit(TEST_FAIL, "Assembly failed verification:\n") if RunCommand("VerifyStrongName","sn -q -vf $targetName",1);
 }
 
 RunExit(TEST_PASS);

tests/fsharpqa/testenv/bin/runall.pl

@@ -11,6 +11,8 @@
 ###    - Document where we expect a test result to get printed
 # GLOBAL VARIABLES
 
+use Config;
+
 my(
     $cleanup,             # type of cleanup requested
     $compilerServerPort,
@@ -145,6 +147,8 @@ my $STATE_ERROR_EXITVAL = 4;
 my $FILE_ERROR_EXITVAL = 5;
 my $OTHER_ERROR_EXITVAL = 9;
 
+my $perl = $Config{perlpath};
+
 BEGIN {
     @required_mods = ("Win32\\Process.pm");
     my $curr_mod;
@@ -3644,7 +3648,7 @@ sub check_test
 
     # perl is noisy during syntax checks; redirect to "nul".
 	# Removed !$resume_mode from this conditional to allow resumes past tests with run.pl errors
-    } elsif (!$debug && (cmd_redirect("perl -c " . quote_path($found_runpl), 'nul') != 0)) {
+    } elsif (!$debug && (cmd_redirect("$perl -c " . quote_path($found_runpl), 'nul') != 0)) {
 	$error = "run.pl contains errors";
 
     }
@@ -4043,7 +4047,7 @@ sub launch_runpl
 			$retval = system("stopit.exe -s$timeout $runpl");
 		}
 		else {
-			$retval = system("stopit.exe -s$timeout perl $runpl") >> 8;
+			$retval = system("stopit.exe -s$timeout $perl $runpl") >> 8;
 		}
 	} 
 	else {
@@ -4051,7 +4055,7 @@ sub launch_runpl
 			$retval = system("$runpl");
 		}
 		else {
-			$retval = system("perl $runpl") >> 8;
+			$retval = system("$perl $runpl") >> 8;
 		}
 	}
 
@@ -5164,7 +5168,7 @@ sub RunMultiProcess() {
 	
 			# execute runall on the test sublist
 			# ($0 means "this program's name")
-			my $subtestcmd = "perl $0 -target:$target -test test$start_subtest_name.lst ";
+			my $subtestcmd = "$perl $0 -target:$target -test test$start_subtest_name.lst ";
 	
 			# deliberately omited switches: -terse
             if(defined $compilerServerPort){
@@ -5208,7 +5212,7 @@ sub RunMultiProcess() {
 			#open SUBTESTTXT, ">>subtest.txt";
 			#print SUBTESTTXT $subtestcmd."\n\n";
 			#close SUBTESTTXT;
-			#my $subtestcmd = "perl e:\\compqa\\testenv\\bin\\newcmd.pl ";
+			#my $subtestcmd = "$perl e:\\compqa\\testenv\\bin\\newcmd.pl ";
 			
 			my $newproc;
 			my $cp = Win32::Process::Create($newproc, $^X, "$subtestcmd", 1, &Win32::Process::NORMAL_PRIORITY_CLASS, '.');