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

Commit252728d

Browse files
committed
Fixing up a bunch of tests that don't properly handle fsc/fsi paths with spaces (changeset 1234984)
1 parentcf5f80d commit252728d

File tree

13 files changed

+129
-185
lines changed

13 files changed

+129
-185
lines changed

‎tests/fsharp/core/load-script/script.bat‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,44 @@
22
del 3.exe2>nul1>nul
33
type 1.fsx 2.fsx 3.fsx
44
echo Test 1=================================================
5-
%FSC% 3.fsx --nologo
5+
"%FSC%" 3.fsx --nologo
66
3.exe
77
del 3.exe
88
echo Test 2=================================================
9-
%FSI% 3.fsx
9+
"%FSI%" 3.fsx
1010
echo Test 3=================================================
11-
%FSI% --nologo< pipescr
11+
"%FSI%" --nologo< pipescr
1212
echo.
1313
echo Test 4=================================================
14-
%FSI% usesfsi.fsx
14+
"%FSI%" usesfsi.fsx
1515
echo Test 5=================================================
16-
%FSC% usesfsi.fsx --nologo
16+
"%FSC%" usesfsi.fsx --nologo
1717
echo Test 6=================================================
18-
%FSC% usesfsi.fsx --nologo -r FSharp.Compiler.Interactive.Settings
18+
"%FSC%" usesfsi.fsx --nologo -r FSharp.Compiler.Interactive.Settings
1919
echo Test 7=================================================
20-
%FSI% 1.fsx 2.fsx 3.fsx
20+
"%FSI%" 1.fsx 2.fsx 3.fsx
2121
echo Test 8=================================================
22-
%FSI% 3.fsx 2.fsx 1.fsx
22+
"%FSI%" 3.fsx 2.fsx 1.fsx
2323
echo Test 9=================================================
24-
%FSI% multiple-load-1.fsx
24+
"%FSI%" multiple-load-1.fsx
2525
echo Test 10=================================================
26-
%FSI% multiple-load-2.fsx
26+
"%FSI%" multiple-load-2.fsx
2727
echo Test 11=================================================
28-
%FSC% FlagCheck.fs --nologo
28+
"%FSC%" FlagCheck.fs --nologo
2929
FlagCheck.exe
3030
del FlagCheck.exe
3131
echo Test 12=================================================
32-
%FSC% FlagCheck.fsx --nologo
32+
"%FSC%" FlagCheck.fsx --nologo
3333
FlagCheck.exe
3434
del FlagCheck.exe
3535
echo Test 13=================================================
36-
%FSI% load-FlagCheckFs.fsx
36+
"%FSI%" load-FlagCheckFs.fsx
3737
echo Test 14=================================================
38-
%FSI% FlagCheck.fsx
38+
"%FSI%" FlagCheck.fsx
3939
echo Test 15=================================================
40-
%FSI% ProjectDriver.fsx
40+
"%FSI%" ProjectDriver.fsx
4141
echo Test 16=================================================
42-
%FSC% ProjectDriver.fsx --nologo
42+
"%FSC%" ProjectDriver.fsx --nologo
4343
ProjectDriver.exe
4444
del ProjectDriver.exe
4545
echo Done ==================================================

‎tests/fsharp/core/queriesCustomQueryOps/build.bat‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,22 @@ if EXIST build.ok DEL /f /q build.ok
77

88
call%~d0%~p0..\..\..\config.bat
99

10-
ifNOT"%FSC:NOTAVAIL=X%"=="%FSC%" (
11-
ECHO Skipping test for FSI.EXE
12-
goto Skip
13-
)
14-
15-
1610
rem fsc.exe building
1711

12+
"%FSC%"%fsc_flags% -o:test.exe -g test.fsx
13+
@if ERRORLEVEL1goto Error
1814

19-
"%FSC%"%fsc_flags% -o:test.exe -g test.fsx
20-
@if ERRORLEVEL1goto Error
21-
22-
"%PEVERIFY%" test.exe
23-
@if ERRORLEVEL1goto Error
15+
"%PEVERIFY%" test.exe
16+
@if ERRORLEVEL1goto Error
2417

25-
"%FSC%"%fsc_flags% --optimize -o:test--optimize.exe -g test.fsx
26-
@if ERRORLEVEL1goto Error
18+
"%FSC%"%fsc_flags% --optimize -o:test--optimize.exe -g test.fsx
19+
@if ERRORLEVEL1goto Error
2720

28-
"%PEVERIFY%" test--optimize.exe
29-
@if ERRORLEVEL1goto Error
21+
"%PEVERIFY%" test--optimize.exe
22+
@if ERRORLEVEL1goto Error
3023

31-
call ..\..\single-neg-test.bat negativetest
32-
@if ERRORLEVEL1goto Error
24+
call ..\..\single-neg-test.bat negativetest
25+
@if ERRORLEVEL1goto Error
3326

3427
:Ok
3528
echo Built fsharp%~f0 ok.

‎tests/fsharp/core/verify/build.bat‎

Lines changed: 14 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,31 @@
11
@if"%_echo%"==""echooff
2-
32
setlocal
4-
REM Configure the sample, i.e. where to find the F# compiler and C# compiler.
3+
54
ifEXIST build.okDEL /f /q build.ok
65

76
call%~d0%~p0..\..\..\config.bat
87

98
"%PEVERIFY%""%FSCOREDLLPATH%"
109
@if ERRORLEVEL1goto Error
1110

12-
"%PEVERIFY%"%FSCBinPath%\FSharp.Build.dll
11+
"%PEVERIFY%""%FSCOREDLL20PATH%"
1312
@if ERRORLEVEL1goto Error
1413

14+
"%PEVERIFY%""%FSCOREDLLPORTABLEPATH%"
15+
@if ERRORLEVEL1goto Error
1516

17+
"%PEVERIFY%""%FSCBinPath%\FSharp.Build.dll"
18+
@if ERRORLEVEL1goto Error
1619

17-
ifNOT"%FSC:NOTAVAIL=X%"=="%FSC%" (
18-
19-
REM Use /MD because this contains some P/Invoke code
20-
"%PEVERIFY%" /MD%FSCBinPath%\FSharp.Compiler.dll
21-
@if ERRORLEVEL1goto Error
22-
23-
REM Use /MD because this contains some P/Invoke code
24-
"%PEVERIFY%" /MD%FSCBinPath%\FSharp.LanguageService.dll
25-
@if ERRORLEVEL1goto Error
26-
27-
"%PEVERIFY%"%FSCBinPath%\FSharp.ProjectSystem.Base.dll
28-
@if ERRORLEVEL1goto Error
29-
30-
"%PEVERIFY%"%FSCBinPath%\FSharp.ProjectSystem.dll
31-
@if ERRORLEVEL1goto Error
32-
33-
34-
"%PEVERIFY%"%FSCBinPath%\fsi.exe
35-
@if ERRORLEVEL1goto Error
36-
37-
"%PEVERIFY%"%FSCBinPath%\FSharp.Compiler.Server.Shared.dll
38-
@if ERRORLEVEL1goto Error
39-
40-
"%PEVERIFY%"%FSCBinPath%\FSharp.Compiler.Interactive.Settings.dll
41-
@if ERRORLEVEL1goto Error
42-
43-
"%PEVERIFY%" /MD%FSCBinPath%\FSharp.VisualStudio.Session.dll
44-
@if ERRORLEVEL1goto Error
20+
REM Use /MD because this contains some P/Invoke code
21+
"%PEVERIFY%" /MD"%FSCBinPath%\FSharp.Compiler.dll"
22+
@if ERRORLEVEL1goto Error
4523

46-
REM Skipping remainder of test for FSI.EXE
47-
gotoOk
24+
"%PEVERIFY%""%FSCBinPath%\fsi.exe"
25+
@if ERRORLEVEL1gotoError
4826

49-
)
27+
"%PEVERIFY%""%FSCBinPath%\FSharp.Compiler.Interactive.Settings.dll"
28+
@if ERRORLEVEL1goto Error
5029

5130
"%FSC%"%fsc_flags% -o:xmlverify.exe -g xmlverify.fs
5231
@if ERRORLEVEL1goto Error
@@ -60,18 +39,16 @@ call :SetFSCoreXMLPath "%FSCOREDLLPATH%"
6039
%CLIX% xmlverify.exe"%FSHARPCOREXML%"
6140
@if ERRORLEVEL1goto Error
6241

63-
6442
:Ok
6543
echo Passed fsharp%~f0 ok.
6644
echo> build.ok
6745
endlocal
6846
exit /b0
6947

70-
7148
:Error
7249
endlocal
7350
exit /b%ERRORLEVEL%
7451

7552
:SetFSCoreXMLPath
7653
setFSHARPCOREXML=%~dpn1.xml
77-
goto :EOF
54+
goto :EOF

‎tests/fsharp/single-neg-test.bat‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ if errorlevel 1 (
77
setERRORMSG=%ERRORMSG% config.bat failed;
88
goto :ERROR
99
)
10-
call :check"%FSC%"
11-
ifnot"%ERRORMSG%"==""goto :ERROR
10+
ifnotexist"%FSC%" (
11+
setERRORMSG=Could not find FSC at path"%FSC%"
12+
goto :ERROR
13+
)
1214

1315
%FSDIFF%%~f0%~f0
1416
@if ERRORLEVEL1 (
@@ -99,10 +101,3 @@ set NonexistentErrorLevel 2> nul
99101
goto Error
100102
goto :EOF
101103

102-
:Check
103-
for /f%%iin ("%1")do (
104-
dir%%i>NUL2>&1|| (
105-
setERRORMSG=%ERRORMSG%%1 was not found;
106-
)
107-
)
108-
goto :EOF

‎tests/fsharp/typeProviders/build-typeprovider-test.bat‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,25 @@ call %~d0%~p0\..\..\config.bat
77
ifEXIST provided.dlldel provided.dll
88
ifERRORLEVEL1goto :Error
99

10-
%FSC% --out:provided.dll -a ..\helloWorld\provided.fs
10+
"%FSC%" --out:provided.dll -a ..\helloWorld\provided.fs
1111
iferrorlevel1goto :Error
1212

13-
1413
ifEXIST providedJ.dlldel providedJ.dll
1514
ifERRORLEVEL1goto :Error
1615

17-
%FSC% --out:providedJ.dll -a ..\helloWorld\providedJ.fs
16+
"%FSC%" --out:providedJ.dll -a ..\helloWorld\providedJ.fs
1817
iferrorlevel1goto :Error
1918

2019
ifEXIST providedK.dlldel providedK.dll
2120
ifERRORLEVEL1goto :Error
2221

23-
%FSC% --out:providedK.dll -a ..\helloWorld\providedK.fs
22+
"%FSC%" --out:providedK.dll -a ..\helloWorld\providedK.fs
2423
iferrorlevel1goto :Error
2524

26-
27-
2825
ifEXIST provider.dlldel provider.dll
2926
ifERRORLEVEL1goto :Error
3027

31-
%FSC% --out:provider.dll -a provider.fsx
28+
"%FSC%" --out:provider.dll -a provider.fsx
3229
ifERRORLEVEL1goto :Error
3330

3431
call%~d0%~p0..\single-test-build.bat
@@ -39,9 +36,6 @@ echo. > build.ok
3936
endlocal
4037
exit /b0
4138

42-
4339
:Error
4440
endlocal
45-
exit /b%ERRORLEVEL%
46-
47-
41+
exit /b%ERRORLEVEL%

‎tests/fsharp/typeProviders/builtin/SqlEntityConnection/run.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@if"%_echo%"==""echooff
2-
call%~d0%~p0..\..\..\config.bat
2+
call%~d0%~p0..\..\..\..\config.bat
33

44
IF /I"%INSTALL_SKU%"NEQ"ULTIMATE" (
55
echo Test not supported except on Ultimate

‎tests/fsharp/typeProviders/diamondAssembly/build.bat‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ call %~d0%~p0\..\..\..\config.bat
77
ifEXIST provider.dlldel provider.dll
88
iferrorlevel1goto :Error
99

10-
%FSC% --out:provided.dll -a ..\helloWorld\provided.fs
10+
"%FSC%" --out:provided.dll -a ..\helloWorld\provided.fs
1111
iferrorlevel1goto :Error
1212

13-
%FSC% --out:provider.dll -a ..\helloWorld\provider.fsx
13+
"%FSC%" --out:provider.dll -a ..\helloWorld\provider.fsx
1414
iferrorlevel1goto :Error
1515

1616
"%FSC%"%fsc_flags% --debug+ -r:provider.dll --optimize- -o:test1.dll -a test1.fsx
@@ -32,6 +32,4 @@ exit /b 0
3232

3333
:Error
3434
endlocal
35-
exit /b%ERRORLEVEL%
36-
37-
35+
exit /b%ERRORLEVEL%

‎tests/fsharp/typeProviders/helloWorld/build.bat‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,40 @@ if ERRORLEVEL 1 goto :Error
1010
ifEXIST provided1.dlldel provided1.dll
1111
ifERRORLEVEL1goto :Error
1212

13-
%FSC% --out:provided1.dll -g -a ..\helloWorld\provided.fs
13+
"%FSC%" --out:provided1.dll -g -a ..\helloWorld\provided.fs
1414
iferrorlevel1goto :Error
1515

1616
ifEXIST provided2.dlldel provided2.dll
1717
ifERRORLEVEL1goto :Error
1818

19-
%FSC% --out:provided2.dll -g -a ..\helloWorld\provided.fs
19+
"%FSC%" --out:provided2.dll -g -a ..\helloWorld\provided.fs
2020
iferrorlevel1goto :Error
2121

2222
ifEXIST provided3.dlldel provided3.dll
2323
ifERRORLEVEL1goto :Error
2424

25-
%FSC% --out:provided3.dll -g -a ..\helloWorld\provided.fs
25+
"%FSC%" --out:provided3.dll -g -a ..\helloWorld\provided.fs
2626
iferrorlevel1goto :Error
2727

2828
ifEXIST provided4.dlldel provided4.dll
2929
ifERRORLEVEL1goto :Error
3030

31-
%FSC% --out:provided4.dll -g -a ..\helloWorld\provided.fs
31+
"%FSC%" --out:provided4.dll -g -a ..\helloWorld\provided.fs
3232
iferrorlevel1goto :Error
3333

3434
ifEXIST providedJ.dlldel providedJ.dll
3535
ifERRORLEVEL1goto :Error
3636

37-
%FSC% --out:providedJ.dll -g -a ..\helloWorld\providedJ.fs
37+
"%FSC%" --out:providedJ.dll -g -a ..\helloWorld\providedJ.fs
3838
iferrorlevel1goto :Error
3939

4040
ifEXIST providedK.dlldel providedK.dll
4141
ifERRORLEVEL1goto :Error
4242

43-
%FSC% --out:providedK.dll -g -a ..\helloWorld\providedK.fs
43+
"%FSC%" --out:providedK.dll -g -a ..\helloWorld\providedK.fs
4444
iferrorlevel1goto :Error
4545

46-
%FSC% --out:providedNullAssemblyName.dll -g -a ..\helloWorld\providedNullAssemblyName.fsx
46+
"%FSC%" --out:providedNullAssemblyName.dll -g -a ..\helloWorld\providedNullAssemblyName.fsx
4747
iferrorlevel1goto :Error
4848

4949
call%~d0%~p0\..\build-typeprovider-test.bat
@@ -58,10 +58,10 @@ xcopy /y ..\*.dll .
5858
iferrorlevel1goto :Error
5959

6060

61-
%FSC% -g -a -o:test_lib.dll -r:provider.dll ..\test.fsx
61+
"%FSC%" -g -a -o:test_lib.dll -r:provider.dll ..\test.fsx
6262
ifERRORLEVEL1goto :Error
6363

64-
%FSC% -r:test_lib.dll -r:provider.dll ..\testlib_client.fsx
64+
"%FSC%" -r:test_lib.dll -r:provider.dll ..\testlib_client.fsx
6565
ifERRORLEVEL1goto :Error
6666

6767
popd
@@ -72,26 +72,24 @@ xcopy /y ..\bincompat1\*.dll .
7272

7373

7474
REM overwrite provider.dll
75-
%FSC% --define:ADD_AN_OPTIONAL_STATIC_PARAMETER --out:provider.dll -g -a ..\provider.fsx
75+
"%FSC%" --define:ADD_AN_OPTIONAL_STATIC_PARAMETER --out:provider.dll -g -a ..\provider.fsx
7676
ifERRORLEVEL1goto :Error
7777

7878
REM This is the important part of the binary compatibility part of the test: the new provider is being used, but
7979
REM with a binary that was generated w.r.t. the old provider. The new provider can still resolve the references
8080
REM generated by the old provider which are stored in the F# metadata for test_lib.dll
81-
%FSC% --define:ADD_AN_OPTIONAL_STATIC_PARAMETER -r:test_lib.dll -r:provider.dll ..\testlib_client.fsx
81+
"%FSC%" --define:ADD_AN_OPTIONAL_STATIC_PARAMETER -r:test_lib.dll -r:provider.dll ..\testlib_client.fsx
8282
ifERRORLEVEL1goto :Error
8383

84-
%PEVERIFY% provider.dll
84+
"%PEVERIFY%" provider.dll
8585
ifERRORLEVEL1goto :Error
8686

87-
%PEVERIFY% test_lib.dll
87+
"%PEVERIFY%" test_lib.dll
8888
ifERRORLEVEL1goto :Error
8989

90-
%PEVERIFY% testlib_client.exe
90+
"%PEVERIFY%" testlib_client.exe
9191
ifERRORLEVEL1goto :Error
9292

93-
94-
9593
endlocal
9694

97-
exit /b%ERRORLEVEL%
95+
exit /b%ERRORLEVEL%

0 commit comments

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