mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-01-07 11:33:44 +00:00
NNT: Use [e]grep -a when scanning logs, its possibly they will have non-text
characters in them, in which case the grep will just return 'Binary file matches' and the whole thing falls over. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@91302 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
1b54d423aa
commit
252a0dfa6a
@ -507,8 +507,8 @@ sub BuildLLVM {
|
||||
}
|
||||
RunAppendingLoggedCommand("(time -p $NICE $MAKECMD $MAKEOPTS)", $BuildLog, "BUILD");
|
||||
|
||||
if (`grep '^$MAKECMD\[^:]*: .*Error' $BuildLog | wc -l` + 0 ||
|
||||
`grep '^$MAKECMD: \*\*\*.*Stop.' $BuildLog | wc -l` + 0) {
|
||||
if (`grep -a '^$MAKECMD\[^:]*: .*Error' $BuildLog | wc -l` + 0 ||
|
||||
`grep -a '^$MAKECMD: \*\*\*.*Stop.' $BuildLog | wc -l` + 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -535,15 +535,15 @@ sub TestDirectory {
|
||||
$LLCBetaOpts = `$MAKECMD print-llcbeta-option`;
|
||||
|
||||
my $ProgramsTable;
|
||||
if (`grep '^$MAKECMD\[^:]: .*Error' $ProgramTestLog | wc -l` + 0) {
|
||||
if (`grep -a '^$MAKECMD\[^:]: .*Error' $ProgramTestLog | wc -l` + 0) {
|
||||
$ProgramsTable="Error running test $SubDir\n";
|
||||
print "ERROR TESTING\n";
|
||||
} elsif (`grep '^$MAKECMD\[^:]: .*No rule to make target' $ProgramTestLog | wc -l` + 0) {
|
||||
} elsif (`grep -a '^$MAKECMD\[^:]: .*No rule to make target' $ProgramTestLog | wc -l` + 0) {
|
||||
$ProgramsTable="Makefile error running tests $SubDir!\n";
|
||||
print "ERROR TESTING\n";
|
||||
} else {
|
||||
# Create a list of the tests which were run...
|
||||
system "egrep 'TEST-(PASS|FAIL)' < $ProgramTestLog ".
|
||||
system "egrep -a 'TEST-(PASS|FAIL)' < $ProgramTestLog ".
|
||||
"| sort > $Prefix-$SubDir-Tests.txt";
|
||||
}
|
||||
$ProgramsTable = ReadFile "report.nightly.csv";
|
||||
|
Loading…
Reference in New Issue
Block a user