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

Commita8201de

Browse files
committed
Expand testing to cover FSC and other scenarios
1 parentf5649e7 commita8201de

File tree

7 files changed

+86
-8
lines changed

7 files changed

+86
-8
lines changed

‎tests/fsharpqa/Source/InteractiveSession/Misc/aaa/bbb/RelativeHashRResolution04_1.fsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
#if PIPED_FROM_TEST_DIR
2+
#load"aaa/bbb/RelativeHashRResolution04_2.fsx"
3+
#else
14
#load"RelativeHashRResolution04_2.fsx"
5+
#endif
26

37
printfn"%O"(Lib.X())
48
printfn"%O" RelativeHashRResolution04_2.Foo.Y

‎tests/fsharpqa/Source/InteractiveSession/Misc/aaa/bbb/RelativeHashRResolution05_1.fsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
#load"..\RelativeHashRResolution05_2.fsx"
1+
#if PIPED_FROM_TEST_DIR
2+
#load"./aaa/RelativeHashRResolution05_2.fsx"
3+
#else
4+
#load"../RelativeHashRResolution05_2.fsx"
5+
#endif
26

37
printfn"%O"(Lib.X())
48
printfn"%O" RelativeHashRResolution05_2.Foo.Y

‎tests/fsharpqa/Source/InteractiveSession/Misc/ccc/RelativeHashRResolution01_1.fsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
#if PIPED_FROM_TEST_DIR
2+
#load"aaa/bbb/RelativeHashRResolution01_2.fsx"
3+
#else
14
#load"../aaa/bbb/RelativeHashRResolution01_2.fsx"
5+
#endif
26

37
printfn"%O"(Lib.X())
48
printfn"%O" RelativeHashRResolution01_2.Foo.Y

‎tests/fsharpqa/Source/InteractiveSession/Misc/ccc/RelativeHashRResolution02_1.fsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
#if PIPED_FROM_TEST_DIR
2+
#load"./aaa/RelativeHashRResolution02_2.fsx"
3+
#else
14
#load"../aaa/RelativeHashRResolution02_2.fsx"
5+
#endif
26

37
printfn"%O"(Lib.X())
48
printfn"%O" RelativeHashRResolution02_2.Foo.Y

‎tests/fsharpqa/Source/InteractiveSession/Misc/ccc/RelativeHashRResolution03_1.fsx‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1+
#if PIPED_FROM_TEST_DIR
2+
#load"aaa/RelativeHashRResolution03_2.fsx"
3+
#else
14
#load"../aaa/RelativeHashRResolution03_2.fsx"
5+
#endif
26

37
printfn"%O"(Lib.X())
48
printfn"%O" RelativeHashRResolution03_2.Foo.Y

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

Lines changed: 60 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,63 @@ NoMTSOURCE=E_NoNoFrameworkWithFSCore.fs COMPILE_ONLY=1 FSIMODE=PIPE SCFLAGS="-
100100
SOURCE="ScriptTest\\LoadScriptResolution01.fsx" SCFLAGS="--nologo"# LoadScriptResolution01.fsx - fsc
101101
SOURCE="ScriptTest\\LoadScriptResolution01.fsx" COMPILE_ONLY=1 FSIMODE=FEED SCFLAGS="--nologo"# LoadScriptResolution01.fsx - fsi
102102

103-
# relative paths used in #r references
104-
SOURCE=ccc\\RelativeHashRResolution01_1.fsx COMPILE_ONLY=1 FSIMODE=EXEC PRECMD="\$FSC_PIPE -a lib.fs -o aaa\\lib.dll" SCFLAGS="--nologo"# RelativeHashRResolution01_1.fsx
105-
SOURCE=ccc\\RelativeHashRResolution02_1.fsx COMPILE_ONLY=1 FSIMODE=EXEC PRECMD="\$FSC_PIPE -a lib.fs -o aaa\\lib.dll" SCFLAGS="--nologo"# RelativeHashRResolution02_1.fsx
106-
SOURCE=ccc\\RelativeHashRResolution03_1.fsx COMPILE_ONLY=1 FSIMODE=EXEC PRECMD="\$FSC_PIPE -a lib.fs -o aaa\\lib.dll" SCFLAGS="--nologo"# RelativeHashRResolution03_1.fsx
107-
SOURCE=aaa\\bbb\\RelativeHashRResolution04_1.fsx COMPILE_ONLY=1 FSIMODE=EXEC PRECMD="\$FSC_PIPE -a lib.fs -o aaa\\lib.dll" SCFLAGS="--nologo"# RelativeHashRResolution04_1.fsx
108-
SOURCE=aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 FSIMODE=EXEC PRECMD="\$FSC_PIPE -a lib.fs -o aaa\\lib.dll" SCFLAGS="--nologo"# RelativeHashRResolution05_1.fsx
103+
#### relative paths used in #r references
104+
105+
# create required reference library once
106+
SOURCE=lib.fs COMPILE_ONLY=1 SCFLAGS="--nologo -a -o aaa\\lib.dll"# RelativeHashRResolution_makelib
107+
108+
# via FSI, invoking like `fsi.exe --exec path\script.fsx`
109+
SOURCE=ccc\\RelativeHashRResolution01_1.fsx COMPILE_ONLY=1 FSIMODE=EXEC SCFLAGS="--nologo"# RelativeHashRResolution01_exec
110+
SOURCE=ccc\\RelativeHashRResolution02_1.fsx COMPILE_ONLY=1 FSIMODE=EXEC SCFLAGS="--nologo"# RelativeHashRResolution02_exec
111+
SOURCE=ccc\\RelativeHashRResolution03_1.fsx COMPILE_ONLY=1 FSIMODE=EXEC SCFLAGS="--nologo"# RelativeHashRResolution03_exec
112+
SOURCE=aaa\\bbb\\RelativeHashRResolution04_1.fsx COMPILE_ONLY=1 FSIMODE=EXEC SCFLAGS="--nologo"# RelativeHashRResolution04_exec
113+
SOURCE=aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 FSIMODE=EXEC SCFLAGS="--nologo"# RelativeHashRResolution05_exec
114+
115+
# via FSI, invoking like `fsi.exe --exec ..\path\path\script.fsx`
116+
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution01_1.fsx COMPILE_ONLY=1 FSIMODE=EXEC SCFLAGS="--nologo"# RelativeHashRResolution01_execrelative
117+
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution02_1.fsx COMPILE_ONLY=1 FSIMODE=EXEC SCFLAGS="--nologo"# RelativeHashRResolution02_execrelative
118+
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution03_1.fsx COMPILE_ONLY=1 FSIMODE=EXEC SCFLAGS="--nologo"# RelativeHashRResolution03_execrelative
119+
SOURCE=..\\Misc\\aaa\\bbb\\RelativeHashRResolution04_1.fsx COMPILE_ONLY=1 FSIMODE=EXEC SCFLAGS="--nologo"# RelativeHashRResolution04_execrelative
120+
SOURCE=..\\Misc\\aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 FSIMODE=EXEC SCFLAGS="--nologo"# RelativeHashRResolution05_execrelative
121+
122+
# via FSI, invoking like `fsi.exe --exec c:\full\path\script.fsx`
123+
SOURCE="\$CWD\\ccc\\RelativeHashRResolution01_1.fsx" COMPILE_ONLY=1 FSIMODE=EXEC SCFLAGS="--nologo"# RelativeHashRResolution01_execfull
124+
SOURCE="\$CWD\\ccc\\RelativeHashRResolution02_1.fsx" COMPILE_ONLY=1 FSIMODE=EXEC SCFLAGS="--nologo"# RelativeHashRResolution02_execfull
125+
SOURCE="\$CWD\\ccc\\RelativeHashRResolution03_1.fsx" COMPILE_ONLY=1 FSIMODE=EXEC SCFLAGS="--nologo"# RelativeHashRResolution03_execfull
126+
SOURCE="\$CWD\\aaa\\bbb\\RelativeHashRResolution04_1.fsx" COMPILE_ONLY=1 FSIMODE=EXEC SCFLAGS="--nologo"# RelativeHashRResolution04_execfull
127+
SOURCE="\$CWD\\aaa\\bbb\\RelativeHashRResolution05_1.fsx" COMPILE_ONLY=1 FSIMODE=EXEC SCFLAGS="--nologo"# RelativeHashRResolution05_execfull
128+
129+
# via FSI, invoking like `fsi.exe < path\script.fsx`
130+
SOURCE=ccc\\RelativeHashRResolution01_1.fsx COMPILE_ONLY=1 FSIMODE=PIPE SCFLAGS="--nologo --define:PIPED_FROM_TEST_DIR"# RelativeHashRResolution01_pipe
131+
SOURCE=ccc\\RelativeHashRResolution02_1.fsx COMPILE_ONLY=1 FSIMODE=PIPE SCFLAGS="--nologo --define:PIPED_FROM_TEST_DIR"# RelativeHashRResolution02_pipe
132+
SOURCE=ccc\\RelativeHashRResolution03_1.fsx COMPILE_ONLY=1 FSIMODE=PIPE SCFLAGS="--nologo --define:PIPED_FROM_TEST_DIR"# RelativeHashRResolution03_pipe
133+
SOURCE=aaa\\bbb\\RelativeHashRResolution04_1.fsx COMPILE_ONLY=1 FSIMODE=PIPE SCFLAGS="--nologo --define:PIPED_FROM_TEST_DIR"# RelativeHashRResolution04_pipe
134+
SOURCE=aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 FSIMODE=PIPE SCFLAGS="--nologo --define:PIPED_FROM_TEST_DIR"# RelativeHashRResolution05_pipe
135+
136+
# via FSC, invoking like `fsc.exe path\script.fsx`
137+
SOURCE=ccc\\RelativeHashRResolution01_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo"# RelativeHashRResolution01_fsc
138+
SOURCE=ccc\\RelativeHashRResolution02_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo"# RelativeHashRResolution02_fsc
139+
SOURCE=ccc\\RelativeHashRResolution03_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo"# RelativeHashRResolution03_fsc
140+
SOURCE=aaa\\bbb\\RelativeHashRResolution04_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo"# RelativeHashRResolution04_fsc
141+
SOURCE=aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo"# RelativeHashRResolution05_fsc
142+
143+
# via FSC, invoking like `fsc.exe ..\path\path\script.fsx`
144+
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution01_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo"# RelativeHashRResolution01_fscrelative
145+
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution02_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo"# RelativeHashRResolution02_fscrelative
146+
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution03_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo"# RelativeHashRResolution03_fscrelative
147+
SOURCE=..\\Misc\\aaa\\bbb\\RelativeHashRResolution04_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo"# RelativeHashRResolution04_fscrelative
148+
SOURCE=..\\Misc\\aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo"# RelativeHashRResolution05_fscrelative
149+
150+
# via FSC, invoking like `fsc.exe --simpleresolution path\script.fsx`
151+
SOURCE=ccc\\RelativeHashRResolution01_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution01_fscsimple
152+
SOURCE=ccc\\RelativeHashRResolution02_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution02_fscsimple
153+
SOURCE=ccc\\RelativeHashRResolution03_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution03_fscsimple
154+
SOURCE=aaa\\bbb\\RelativeHashRResolution04_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution04_fscsimple
155+
SOURCE=aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution05_fscsimple
156+
157+
# via FSC, invoking like `fsc.exe ..\path\path\script.fsx`
158+
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution01_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution01_fscrelativesimple
159+
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution02_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution02_fscrelativesimple
160+
SOURCE=..\\Misc\\ccc\\RelativeHashRResolution03_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution03_fscrelativesimple
161+
SOURCE=..\\Misc\\aaa\\bbb\\RelativeHashRResolution04_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution04_fscrelativesimple
162+
SOURCE=..\\Misc\\aaa\\bbb\\RelativeHashRResolution05_1.fsx COMPILE_ONLY=1 SCFLAGS="--nologo --simpleresolution --noframework -r:%FSCOREDLLPATH%"# RelativeHashRResolution05_fscrelativesimple

‎tests/fsharpqa/Source/run.pl‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,8 +459,12 @@ sub RunCommand {
459459
# GetSrc -- Find the source file to build
460460
#
461461
subGetSrc() {
462+
my$cwd = cwd();
463+
462464
# The environment SOURCE var usually defines what to compile
463-
my$source =$ENV{SOURCE};
465+
$_ =$ENV{SOURCE};
466+
s/\$CWD/$cwd/;
467+
my$source =$_;
464468
return($source)ifdefined($source);
465469

466470
# Or if there's only one source file in the directory

0 commit comments

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