Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3577b5a

Browse files
committed
Detect obviously incompatible test cases in RunAll, instead of requiring annotation
1 parent883e1bc commit3577b5a

File tree

6 files changed

+25
-20
lines changed

6 files changed

+25
-20
lines changed

‎tests/fsharpqa/Source/CodeGen/EmittedIL/SerializableAttribute/env.lst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
SOURCE=ToplevelNamespace.fs SCFLAGS="-a -g --test:EmitFeeFeeAs100001 --optimize-" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd ToplevelNamespace.dll"# ToplevelNamespace.fs - Desktop
33

44

5-
x,ReqUltimate,NoCrossVerSOURCE=ToplevelModule.fs SCFLAGS="-o:ToplevelModuleP.dll -a -g --test:EmitFeeFeeAs100001 --optimize- --noframework -r:\"%FSCOREDLLPORTABLEPATH%\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETPortable\\v4.0\\Profile\\Profile47\\mscorlib.dll\"" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd ToplevelModuleP.dll"# ToplevelModule.fs - Portable
6-
y,ReqUltimate,NoCrossVerSOURCE=ToplevelNamespace.fs SCFLAGS="-o:ToplevelNamespaceP.dll -a -g --test:EmitFeeFeeAs100001 --optimize- --noframework -r:\"%FSCOREDLLPORTABLEPATH%\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETPortable\\v4.0\\Profile\\Profile47\\mscorlib.dll\"" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd ToplevelNamespaceP.dll"# ToplevelNamespace.fs - Portable
5+
x,ReqUltimateSOURCE=ToplevelModule.fs SCFLAGS="-o:ToplevelModuleP.dll -a -g --test:EmitFeeFeeAs100001 --optimize- --noframework -r:\"%FSCOREDLLPORTABLEPATH%\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETPortable\\v4.0\\Profile\\Profile47\\mscorlib.dll\"" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd ToplevelModuleP.dll"# ToplevelModule.fs - Portable
6+
y,ReqUltimateSOURCE=ToplevelNamespace.fs SCFLAGS="-o:ToplevelNamespaceP.dll -a -g --test:EmitFeeFeeAs100001 --optimize- --noframework -r:\"%FSCOREDLLPORTABLEPATH%\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETPortable\\v4.0\\Profile\\Profile47\\mscorlib.dll\"" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd ToplevelNamespaceP.dll"# ToplevelNamespace.fs - Portable
77

‎tests/fsharpqa/Source/CompilerOptions/fsc/platform/env.lst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
NoCrossVerSOURCE=error_17.fs COMPILE_ONLY=1 SCFLAGS="--noframework --platform:anycpu32bitpreferred -r:\"%FSCOREDLL20PATH%\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v3.5\\Profile\\Client\\mscorlib.dll\""# anycpu32bitpreferred - downtarget
1+
SOURCE=error_17.fs COMPILE_ONLY=1 SCFLAGS="--noframework --platform:anycpu32bitpreferred -r:\"%FSCOREDLL20PATH%\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v3.5\\Profile\\Client\\mscorlib.dll\""# anycpu32bitpreferred - downtarget
22

33
# Functional: the option does what it is meant to do
44
SOURCE=platf_01.fs COMPILE_ONLY=1 POSTCMD="\$FSI_PIPE --nologo --quiet --debug- --exec bitnesscheck.fsx" # default=anycpu

‎tests/fsharpqa/Source/InteractiveSession/Misc/env.lst‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,15 @@ NoMTSOURCE=E_NoNoFrameworkWithFSCore.fs COMPILE_ONLY=1 FSIMODE=PIPE SCFLAGS="-
149149
SOURCE=..\\Misc\\aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo"# RelativeHashRResolution05_fscrelative
150150

151151
# via FSC, invoking like `fsc.exe --simpleresolution path\script.fsx`
152-
NoCrossVerSOURCE=ccc\\RelativeHashRResolution01_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution01_fscsimple
153-
NoCrossVerSOURCE=ccc\\RelativeHashRResolution02_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution02_fscsimple
154-
NoCrossVerSOURCE=ccc\\RelativeHashRResolution03_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution03_fscsimple
155-
NoCrossVerSOURCE=aaa\\bbb\\RelativeHashRResolution04_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution04_fscsimple
156-
NoCrossVerSOURCE=aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution05_fscsimple
152+
SOURCE=ccc\\RelativeHashRResolution01_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution01_fscsimple
153+
SOURCE=ccc\\RelativeHashRResolution02_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution02_fscsimple
154+
SOURCE=ccc\\RelativeHashRResolution03_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution03_fscsimple
155+
SOURCE=aaa\\bbb\\RelativeHashRResolution04_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution04_fscsimple
156+
SOURCE=aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution05_fscsimple
157157

158158
# via FSC, invoking like `fsc.exe ..\path\path\script.fsx`
159-
NoCrossVerSOURCE=..\\Misc\\ccc\\RelativeHashRResolution01_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution01_fscrelativesimple
160-
NoCrossVerSOURCE=..\\Misc\\ccc\\RelativeHashRResolution02_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution02_fscrelativesimple
161-
NoCrossVerSOURCE=..\\Misc\\ccc\\RelativeHashRResolution03_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution03_fscrelativesimple
162-
NoCrossVerSOURCE=..\\Misc\\aaa\\bbb\\RelativeHashRResolution04_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution04_fscrelativesimple
163-
NoCrossVerSOURCE=..\\Misc\\aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution05_fscrelativesimple
159+
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution01_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution01_fscrelativesimple
160+
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution02_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution02_fscrelativesimple
161+
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution03_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution03_fscrelativesimple
162+
SOURCE=..\\Misc\\aaa\\bbb\\RelativeHashRResolution04_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution04_fscrelativesimple
163+
SOURCE=..\\Misc\\aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution05_fscrelativesimple
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# C# can consume an F# assembly that exposes a type with a method that returns a System.Numeric.BigInteger (i.e. FSharp.Core portable does not define its own BigInteger - the 2 types are the same)
22
NoMTSOURCE=provider.fs POSTCMD="\$CSC_PIPE /r:provider.dll /r:System.Numerics.dll consumer.cs && consumer.exe" SCFLAGS=-a# consumer.fs (Desktop)
3-
NoCrossVer,NoMT,ReqUltimateSOURCE=provider.fs SCFLAGS="-g -a --noframework -r:\"%FSCOREDLLPORTABLEPATH%\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETPortable\\v4.0\\Profile\\Profile47\\System.Numerics.dll\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETPortable\\v4.0\\Profile\\Profile47\\mscorlib.dll\"" POSTCMD="\$CSC_PIPE /r:provider.dll /r:System.Numerics.dll consumer.cs && consumer.exe"# consumer.fs (Portable)
3+
NoMT,ReqUltimateSOURCE=provider.fs SCFLAGS="-g -a --noframework -r:\"%FSCOREDLLPORTABLEPATH%\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETPortable\\v4.0\\Profile\\Profile47\\System.Numerics.dll\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETPortable\\v4.0\\Profile\\Profile47\\mscorlib.dll\"" POSTCMD="\$CSC_PIPE /r:provider.dll /r:System.Numerics.dll consumer.cs && consumer.exe"# consumer.fs (Portable)
44

55
# Simple "unit tests" on the Parse method implemented in FSharp.Core Portable (System.Numerics.BigInteger in Profile47 does not have it...)
66
# --standalone is passed so I don't have to copy FSharp.Core.dll next to the .exe (or else C# app will throw)
7-
NoCrossVer,NoMT,ReqUltimateSOURCE=parse_tests.fs SCFLAGS="--standalone -g -a --noframework -r:\"%FSCOREDLLPORTABLEPATH%\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETPortable\\v4.0\\Profile\\Profile47\\System.Numerics.dll\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETPortable\\v4.0\\Profile\\Profile47\\mscorlib.dll\"" POSTCMD="\$CSC_PIPE /define:PORTABLE /debug+ /r:parse_tests.dll /r:System.Numerics.dll parse_oracle.cs && parse_oracle.exe"# parse_tests.fs (Portable)
7+
NoMT,ReqUltimateSOURCE=parse_tests.fs SCFLAGS="--standalone -g -a --noframework -r:\"%FSCOREDLLPORTABLEPATH%\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETPortable\\v4.0\\Profile\\Profile47\\System.Numerics.dll\" -r:\"%X86_PROGRAMFILES%\\Reference Assemblies\\Microsoft\\Framework\\.NETPortable\\v4.0\\Profile\\Profile47\\mscorlib.dll\"" POSTCMD="\$CSC_PIPE /define:PORTABLE /debug+ /r:parse_tests.dll /r:System.Numerics.dll parse_oracle.cs && parse_oracle.exe"# parse_tests.fs (Portable)
88
NoMTSOURCE=parse_tests.fs SCFLAGS="--standalone -g -a" POSTCMD="\$CSC_PIPE /debug+ /r:parse_tests.dll /r:System.Numerics.dll parse_oracle.cs && parse_oracle.exe"# parse_tests.fs (Desktop)
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
NoCrossVer,NOMONO,NOOPENSOURCE=E_MissingReferenceToFSharpCore20.fs SCFLAGS="--noframework -r %WINDIR%\\Microsoft.NET\\Framework\\v2.0.50727\\mscorlib.dll"# E_MissingReferenceToFSharpCore20.fs
2-
NoCrossVer,NOMONOSOURCE=E_BadPathToFSharpCore.fs SCFLAGS="--noframework -r %WINDIR%\\Microsoft.NET\\Framework\\v2.0.50727\\mscorlib.dll -r I_DO_NOT_EXIST\\FSharp.Core.dll"# E_BadPathToFSharpCore.fs
3-
NoCrossVer,NOMONOSOURCE=E_BadPathToFSharpCore.fsx SCFLAGS="--noframework -r %WINDIR%\\Microsoft.NET\\Framework\\v2.0.50727\\mscorlib.dll -r I_DO_NOT_EXIST\\FSharp.Core.dll"# E_BadPathToFSharpCore.fsx
1+
NOMONO,NOOPENSOURCE=E_MissingReferenceToFSharpCore20.fs SCFLAGS="--noframework -r %WINDIR%\\Microsoft.NET\\Framework\\v2.0.50727\\mscorlib.dll"# E_MissingReferenceToFSharpCore20.fs
2+
NOMONOSOURCE=E_BadPathToFSharpCore.fs SCFLAGS="--noframework -r %WINDIR%\\Microsoft.NET\\Framework\\v2.0.50727\\mscorlib.dll -r I_DO_NOT_EXIST\\FSharp.Core.dll"# E_BadPathToFSharpCore.fs
3+
NOMONOSOURCE=E_BadPathToFSharpCore.fsx SCFLAGS="--noframework -r %WINDIR%\\Microsoft.NET\\Framework\\v2.0.50727\\mscorlib.dll -r I_DO_NOT_EXIST\\FSharp.Core.dll"# E_BadPathToFSharpCore.fsx
44

55
# FSharp.Core is checked in for this test to verify a particular error message related to it. It shouldn't be accidentally picked up by other tests since it isn't in the working directory for them
6-
NoCrossVer,NOMONOSOURCE=E_UseBinaryIncompatibleLibrary.fs SCFLAGS="--noframework -r ..\\Common\\FSharp.Core.dll"# E_UseBinaryIncompatibleLibrary.fs
6+
NOMONOSOURCE=E_UseBinaryIncompatibleLibrary.fs SCFLAGS="--noframework -r ..\\Common\\FSharp.Core.dll"# E_UseBinaryIncompatibleLibrary.fs
77

88
SOURCE=dummy.fs POSTCMD="\$FSI_PIPE --nologo --quiet --exec .\\MultiTargetMatrix.fsx QuotedCommaTypeName_author.fs QuotedCommaTypeName_consumer.fsx 0,8"# QuotedCommaTypeName

‎tests/fsharpqa/testenv/bin/runall.pl‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2800,7 +2800,12 @@ sub get_env_file
28002800
# Modified by apardoe to correct Perl hash behavior change from build 314 to 616.
28012801
$sublist[$envnum][4]{uc($1)}and$sublist[$envnum][4]{$var} =$sublist[$envnum][4]{uc($1)};
28022802
$envlist[$envnum][4]{uc($1)}and$sublist[$envnum][4]{$var} =$envlist[$envnum][4]{uc($1)};
2803-
}
2803+
}
2804+
2805+
if($var =="SCFLAGS" &&$sublist[$envnum][4]{$var} =~/--noframework\b/)
2806+
{
2807+
$sublist[$envnum][1] =$sublist[$envnum][1] .",NoCrossVer";
2808+
}
28042809
}else {
28052810
print_noise("Bad assignment '$_', skipping...\n", 1);
28062811
next ENV_LINE;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp