@@ -100,14 +100,14 @@ var sdeCPUs = []string{
100100
101101func targetArchMatchesRuntime (target string ) bool {
102102 if (target == "" ) ||
103- (target == "x86" && runtime .GOARCH == "amd64" ) ||
104- (target == "arm" && (runtime .GOARCH == "arm" || runtime .GOARCH == "arm64" )) {
103+ (target == "x86" && runtime .GOARCH == "amd64" ) ||
104+ (target == "arm" && (runtime .GOARCH == "arm" || runtime .GOARCH == "arm64" )) {
105105 return true
106106 }
107107 return false
108108}
109109
110- func valgrindOf (dbAttach bool , supps []string , path string , args ... string ) * exec.Cmd {
110+ func valgrindOf (ctx context. Context , dbAttach bool , supps []string , path string , args ... string ) (context. Context , * exec.Cmd ) {
111111 valgrindArgs := []string {"--error-exitcode=99" , "--track-origins=yes" , "--leak-check=full" , "--trace-children=yes" , "--quiet" }
112112 for _ , supp := range supps {
113113 valgrindArgs = append (valgrindArgs , "--suppressions=" + * valgrindSuppDir + "/" + supp )
@@ -118,26 +118,26 @@ func valgrindOf(dbAttach bool, supps []string, path string, args ...string) *exe
118118 valgrindArgs = append (valgrindArgs , path )
119119 valgrindArgs = append (valgrindArgs , args ... )
120120
121- return exec .Command ( "valgrind" , valgrindArgs ... )
121+ return ctx , exec .CommandContext ( ctx , "valgrind" , valgrindArgs ... )
122122}
123123
124- func callgrindOf (path string , args ... string ) * exec.Cmd {
124+ func callgrindOf (ctx context. Context , path string , args ... string ) (context. Context , * exec.Cmd ) {
125125 valgrindArgs := []string {"-q" , "--tool=callgrind" , "--dump-instr=yes" , "--collect-jumps=yes" , "--callgrind-out-file=" + * buildDir + "/callgrind/callgrind.out.%p" }
126126 valgrindArgs = append (valgrindArgs , path )
127127 valgrindArgs = append (valgrindArgs , args ... )
128128
129- return exec .Command ( "valgrind" , valgrindArgs ... )
129+ return ctx , exec .CommandContext ( ctx , "valgrind" , valgrindArgs ... )
130130}
131131
132- func gdbOf (path string , args ... string ) * exec.Cmd {
132+ func gdbOf (ctx context. Context , path string , args ... string ) (context. Context , * exec.Cmd ) {
133133 xtermArgs := []string {"-e" , "gdb" , "--args" }
134134 xtermArgs = append (xtermArgs , path )
135135 xtermArgs = append (xtermArgs , args ... )
136136
137- return exec .Command ( "xterm" , xtermArgs ... )
137+ return ctx , exec .CommandContext ( ctx , "xterm" , xtermArgs ... )
138138}
139139
140- func sdeOf (cpu , path string , args ... string ) (* exec. Cmd , context.CancelFunc ) {
140+ func sdeOf (ctx context. Context , cpu , path string , args ... string ) (context. Context , context.CancelFunc , * exec. Cmd ) {
141141 sdeArgs := []string {"-" + cpu }
142142 // The kernel's vdso code for gettimeofday sometimes uses the RDTSCP
143143 // instruction. Although SDE has a -chip_check_vsyscall flag that
@@ -152,9 +152,9 @@ func sdeOf(cpu, path string, args ...string) (*exec.Cmd, context.CancelFunc) {
152152
153153 // TODO(CryptoAlg-2154):SDE+ASAN tests will hang without exiting if tests pass for an unknown reason.
154154 // Current workaround is to manually cancel the run after 20 minutes and check the output.
155- ctx , cancel := context .WithTimeout (context . Background () , 1200 * time .Second )
155+ ctx , cancel := context .WithTimeout (ctx , 1200 * time .Second )
156156
157- return exec .CommandContext (ctx , * sdePath , sdeArgs ... ), cancel
157+ return ctx , cancel , exec .CommandContext (ctx , * sdePath , sdeArgs ... )
158158}
159159
160160var (
@@ -173,23 +173,20 @@ func runTestOnce(test test, mallocNumToFail int64) (passed bool, err error) {
173173 }
174174 var cmd * exec.Cmd
175175 var cancel context.CancelFunc
176- cancelled := false
176+
177+ ctx := context .Background ()
178+
177179 if * useValgrind {
178- cmd = valgrindOf (false , test .ValgrindSupp , prog , args ... )
180+ ctx , cmd = valgrindOf (ctx , false , test .ValgrindSupp , prog , args ... )
179181 } else if * useCallgrind {
180- cmd = callgrindOf (prog , args ... )
182+ ctx , cmd = callgrindOf (ctx , prog , args ... )
181183 } else if * useGDB {
182- cmd = gdbOf (prog , args ... )
184+ ctx , cmd = gdbOf (ctx , prog , args ... )
183185 } else if * useSDE {
184- cmd , cancel = sdeOf (test .cpu , prog , args ... )
186+ ctx , cancel , cmd = sdeOf (ctx , test .cpu , prog , args ... )
185187 defer cancel ()
186-
187- cmd .Cancel = func () error {
188- cancelled = true
189- return cmd .Process .Kill ()
190- }
191188 } else {
192- cmd = exec .Command ( prog , args ... )
189+ cmd = exec .CommandContext ( ctx , prog , args ... )
193190 }
194191 if test .Env != nil || test .numShards != 0 {
195192 cmd .Env = make ([]string , len (os .Environ ()))
@@ -219,23 +216,30 @@ func runTestOnce(test test, mallocNumToFail int64) (passed bool, err error) {
219216 }
220217
221218 if err := cmd .Wait (); err != nil {
222- if exitError , ok := err .(* exec.ExitError ); ok {
219+ var exitError * exec.ExitError
220+ if errors .As (err , & exitError ) {
223221 switch exitError .Sys ().(syscall.WaitStatus ).ExitStatus () {
224222 case 88 :
225223 return false , errMoreMallocs
226224 case 89 :
227225 fmt .Print (string (outBuf .Bytes ()))
228226 return false , errTestSkipped
229227 }
230- if cancelled {
231- return testPass (outBuf ), errTestHanging
228+ select {
229+ case <- ctx .Done ():
230+ if errors .Is (ctx .Err (), context .DeadlineExceeded ) {
231+ return testPass (outBuf ), errTestHanging
232+ } else if ctx .Err () != nil {
233+ return false , ctx .Err ()
234+ }
235+ default :
236+ // Nothing
232237 }
233238 }
234239 fmt .Print (string (outBuf .Bytes ()))
235240 return false , err
236241 }
237242
238-
239243 return testPass (outBuf ), nil
240244}
241245
0 commit comments