NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commitc0b044c

authored

Use WaitForExit(timeout) rather than loop on HasExited property for some tests (#3906)

* bump* Remove reliance on HasExited, instead use WaitForExit(timeout)* Huge timeout in fcs tests* Remove bump space* Replace scary computed constants with hipster TimeSpans* fix comment* Of course TotalMilliseconds is float and Milliseconds is int --- use Milliseconds* Use the Timespan APIs correctly

1 parente600412 commitc0b044cCopy full SHA for c0b044c

File tree

2 files changed

-4

lines changed

tests
- fsharpqa/Source/CodeGen/Structure
  - DoNotInlineX.fs
- service
  - FscTests.fs

2 files changed

-4

lines changed

`‎tests/fsharpqa/Source/CodeGen/Structure/DoNotInlineX.fs‎`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ open System`
`4`	`4`	`openSystem.Diagnostics`
`5`	`5`	`openSystem.IO`
`6`	`6`
	`7`	`+letlongtime= int(System.TimeSpan.FromSeconds(30.0).TotalMilliseconds)// longtime is 30 seconds`
	`8`	`+`
`7`	`9`	`letprogramFiles=`
`8`	`10`	`letpf86= Environment.GetEnvironmentVariable("ProgramFiles(x86)")`
`9`	`11`	`if String.IsNullOrEmpty(pf86)then Environment.GetEnvironmentVariable("ProgramFiles")else pf86`
`@@ -26,7 +28,7 @@ let start (p1 : string) = Process.Start(p1)`
`26`	`28`
`27`	`29`	`letCompileFile file args=`
`28`	`30`	`letp= Process.Start(fsc, file+""+ args)`
`29`		`-whilenot(p.HasExited)do()`
	`31`	`+p.WaitForExit()`
`30`	`32`
`31`	`33`	`[<EntryPoint>]`
`32`	`34`	`letmain(args:string[])=`
`@@ -40,13 +42,13 @@ let main (args : string[]) =`
`40`	`42`	`printfn"Compiled DerivedType with%A" derivedFlag`
`41`	`43`
`42`	`44`	`letr1= start"DerivedType.exe"`
`43`		`-whilenotr1.HasExiteddo()`
	`45`	`+ r1.WaitForExit(longtime)`
`44`	`46`	`printfn"Ran DerivedType.exe with result:%A" r1.ExitCode`
`45`	`47`
`46`	`48`	`CompileFile"BaseType.fs""-a"`
`47`	`49`	`printfn"Compiled BaseType without%A" baseFlag`
`48`	`50`	`letr2= start"DerivedType.exe"`
`49`		`-whilenotr2.HasExiteddo()`
	`51`	`+ r2.WaitForExit(longtime)`
`50`	`52`	`printfn"Ran DerivedType.exe with result:%A" r2.ExitCode`
`51`	`53`
`52`	`54`	`if r1.ExitCode= expectedResult1&& r2.ExitCode= expectedResult2then0else1`

`‎tests/service/FscTests.fs‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,8 @@ type PEVerifier () =`
`76`	`76`	`#endif`
`77`	`77`
`78`	`78`	`static letexecute(fileName:string,arguments:string)=`
	`79`	`+// Peverify may run quite a while some assemblies are pretty big. Make the timeout 3 minutes just in case.`
	`80`	`+letlongtime= int(TimeSpan.FromMinutes(3.0).TotalMilliseconds)`
`79`	`81`	`printfn"executing '%s' with arguments%s" fileName arguments`
`80`	`82`	`letpsi=new ProcessStartInfo(fileName, arguments)`
`81`	`83`	`psi.UseShellExecute<-false`
`@@ -87,7 +89,7 @@ type PEVerifier () =`
`87`	`89`	`use proc= Process.Start(psi)`
`88`	`90`	`letstdOut= proc.StandardOutput.ReadToEnd()`
`89`	`91`	`letstdErr= proc.StandardError.ReadToEnd()`
`90`		`-whilenotproc.HasExiteddo()`
	`92`	`+ proc.WaitForExit(longtime)`
`91`	`93`	`proc.ExitCode, stdOut, stdErr`
`92`	`94`
`93`	`95`	`member__.Verify(assemblyPath:string)=`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitc0b044c

File tree

2 files changed

2 files changed

`‎tests/fsharpqa/Source/CodeGen/Structure/DoNotInlineX.fs‎`

`‎tests/service/FscTests.fs‎`

0 commit comments