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

Commit827044c

Browse files
author
VFSharpTeam
committed
More test fixes
1 parentfe8661f commit827044c

File tree

8 files changed

+41
-22
lines changed

8 files changed

+41
-22
lines changed

‎tests/fsharpqa/Source/Conformance/LexicalAnalysis/IdentifiersAndKeywords/env.lst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
SOURCE=E_ValidIdentifier04.fs# E_ValidIdentifier04.fs
1212

1313
SOURCE=backtickmoduleandtypenames.fsx# backtickmoduleandtypenames.fsx
14-
SOURCE=backtickmoduleandtypenames.fsx FSIMODE=EXEC COMPILE_ONLY=1 # backtickmoduleandtypenames.fsx FSIMODE=EXEC COMPILE_ONLY=1
14+
NoMTSOURCE=backtickmoduleandtypenames.fsx FSIMODE=EXEC COMPILE_ONLY=1 # backtickmoduleandtypenames.fsx FSIMODE=EXEC COMPILE_ONLY=1
1515

1616
SOURCE=StructNotAllowDoKeyword.fs# StructNotAllowDoKeyword.fs
1717
SOURCE=E_MissingQualification.fs SCFLAGS="--test:ErrorRanges"# E_MissingQualification.fs

‎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-
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
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-
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
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

‎tests/fsharpqa/Source/MultiTargeting/env.lst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ NOMONOSOURCE=E_BadPathToFSharpCore.fsx SCFLAGS="--noframework -r %W
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
66
NOMONOSOURCE=E_UseBinaryIncompatibleLibrary.fs SCFLAGS="--noframework -r ..\\Common\\FSharp.Core.dll"# E_UseBinaryIncompatibleLibrary.fs
77

8-
SOURCE=dummy.fs POSTCMD="\$FSI_PIPE --nologo --quiet --exec .\\MultiTargetMatrix.fsx QuotedCommaTypeName_author.fs QuotedCommaTypeName_consumer.fsx 0,8"# QuotedCommaTypeName
8+
ReqOpenSOURCE=dummy.fs POSTCMD="\$FSI_PIPE --nologo --quiet --exec .\\MultiTargetMatrix.fsx QuotedCommaTypeName_author.fs QuotedCommaTypeName_consumer.fsx 0,8"# QuotedCommaTypeName
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
SOURCE=test01.fs SCFLAGS="--optimize+ -r:lib01.dll" PRECMD="\$FSC_PIPE -a --optimize+ lib01.fs"# test01.fs
2-
SOURCE=test02.fs SCFLAGS="--optimize+ -r:lib02.dll" PRECMD="\$FSC_PIPE -a --optimize+ lib02.fs"# test02.fs
3-
SOURCE=test03.fs SCFLAGS="--optimize+ -r:lib03.dll" PRECMD="\$FSC_PIPE -a --optimize+ lib03.fs"# test03.fs
4-
SOURCE=test04.fs SCFLAGS="--optimize+ -r:lib04.dll" PRECMD="\$FSC_PIPE -a --optimize+ lib04.fs"# test04.fs
1+
NoMTSOURCE=test01.fs SCFLAGS="--optimize+ -r:lib01.dll" PRECMD="\$FSC_PIPE -a --optimize+ lib01.fs"# test01.fs
2+
NoMTSOURCE=test02.fs SCFLAGS="--optimize+ -r:lib02.dll" PRECMD="\$FSC_PIPE -a --optimize+ lib02.fs"# test02.fs
3+
NoMTSOURCE=test03.fs SCFLAGS="--optimize+ -r:lib03.dll" PRECMD="\$FSC_PIPE -a --optimize+ lib03.fs"# test03.fs
4+
NoMTSOURCE=test04.fs SCFLAGS="--optimize+ -r:lib04.dll" PRECMD="\$FSC_PIPE -a --optimize+ lib04.fs"# test04.fs
55

66
SOURCE=InlineWithPrivateValues01.fs SCFLAGS="-r:TypeLib01.dll" PRECMD="\$FSC_PIPE -a --optimize+ TypeLib01.fs"# InlineWithPrivateValuesStruct
77
SOURCE=InlineWithPrivateValues01.fs SCFLAGS="-r:TypeLib02.dll" PRECMD="\$FSC_PIPE -a --optimize+ TypeLib02.fs"# InlineWithPrivateValuesRef
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
SOURCE=Match01.fs SCFLAGS="-a --optimize+" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd Match01.dll"# Match01.fs
2-
SOURCE=Match02.fs SCFLAGS="-a --optimize+" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd Match02.dll"# Match02.fs
1+
NoMTSOURCE=Match01.fs SCFLAGS="-a --optimize+" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd Match01.dll"# Match01.fs
2+
NoMTSOURCE=Match02.fs SCFLAGS="-a --optimize+" COMPILE_ONLY=1 POSTCMD="..\\CompareIL.cmd Match02.dll"# Match02.fs

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2797,14 +2797,14 @@ sub get_env_file
27972797
$envlist[$envnum][4]{uc($1)}and$sublist[$envnum][4]{$var} =$envlist[$envnum][4]{uc($1)};
27982798
}
27992799

2800-
if($var=="FSIMODE")
2800+
if($vareq"FSIMODE")
28012801
{
2802-
$sublist[$envnum][1] =$sublist[$envnum][1] .",FSI";
2802+
$sublist[$envnum][1] =$sublist[$envnum][1] .",FSI,NoMT";
28032803
}
28042804

2805-
if($var=="SCFLAGS" &&$sublist[$envnum][4]{$var} =~/--noframework\b/)
2805+
if($vareq"SCFLAGS" &&$sublist[$envnum][4]{$var} =~/--noframework\b/)
28062806
{
2807-
$sublist[$envnum][1] =$sublist[$envnum][1] .",NoCrossVer";
2807+
$sublist[$envnum][1] =$sublist[$envnum][1] .",NoCrossVer,NoMT";
28082808
}
28092809
}else {
28102810
print_noise("Bad assignment '$_', skipping...\n", 1);
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntimeversion="v4.0"sku=".NETFramework,Version=v4.5" />
5+
</startup>
6+
<runtime>
7+
<assemblyBindingxmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity
10+
name="FSharp.Core"
11+
publicKeyToken="b03f5f7f11d50a3a"
12+
culture="neutral"/>
13+
<bindingRedirect
14+
oldVersion="2.0.0.0-4.3.1.0"
15+
newVersion="4.4.0.0"/>
16+
</dependentAssembly>
17+
</assemblyBinding>
18+
</runtime>
19+
</configuration>

0 commit comments

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