@@ -12,6 +12,7 @@ import (
12
12
"sync"
13
13
"time"
14
14
15
+ "github.com/microsoft/CBL-Mariner/toolkit/tools/internal/file"
15
16
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/logger"
16
17
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/pkggraph"
17
18
"github.com/microsoft/CBL-Mariner/toolkit/tools/internal/retry"
@@ -191,14 +192,14 @@ func getBuildDependencies(node *pkggraph.PkgNode, pkgGraph *pkggraph.PkgGraph, g
191
192
192
193
// parseCheckSection reads the package build log file to determine if the %check section passed or not
193
194
func parseCheckSection (logFile string ) (err error ) {
194
- file , err := os .Open (logFile )
195
+ logFileObject , err := os .Open (logFile )
195
196
// If we can't open the log file, that's a build error.
196
197
if err != nil {
197
198
logger .Log .Errorf ("Failed to open log file '%s' while checking package test results. Error: %v" , logFile , err )
198
199
return
199
200
}
200
- defer file .Close ()
201
- for scanner := bufio .NewScanner (file ); scanner .Scan (); {
201
+ defer logFileObject .Close ()
202
+ for scanner := bufio .NewScanner (logFileObject ); scanner .Scan (); {
202
203
currLine := scanner .Text ()
203
204
// Anything besides 0 is a failed test
204
205
if strings .Contains (currLine , "CHECK DONE" ) {
@@ -207,7 +208,7 @@ func parseCheckSection(logFile string) (err error) {
207
208
}
208
209
failedLogFile := strings .TrimSuffix (logFile , ".log" )
209
210
failedLogFile = fmt .Sprintf ("%s-FAILED_TEST-%d.log" , failedLogFile , time .Now ().UnixMilli ())
210
- err = os . Rename (logFile , failedLogFile )
211
+ err = file . Copy (logFile , failedLogFile )
211
212
if err != nil {
212
213
logger .Log .Errorf ("Log file rename failed. Error: %v" , err )
213
214
return
0 commit comments