Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
etersoft-build-utils
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
korinf
etersoft-build-utils
Commits
c72c3e6e
You need to sign in or sign up before continuing.
Commit
c72c3e6e
authored
Oct 10, 2013
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix check_log: enable log verification again
parent
92493c00
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
15 deletions
+28
-15
check
share/eterbuild/functions/check
+20
-15
test_check_log.sh
tests/test_check_log.sh
+8
-0
No files found.
share/eterbuild/functions/check
View file @
c72c3e6e
#!/bin/bash
#!/bin/bash
# 2008, 2011 Etersoft www.etersoft.ru
# 2008, 2011
, 2013
Etersoft www.etersoft.ru
# Author: Vitaly Lipatov <lav@etersoft.ru>
# Author: Vitaly Lipatov <lav@etersoft.ru>
# Public domain
# Public domain
__check_string
()
{
local
LOGFILE
=
"
$1
"
shift
local
NC
=
"
$@
"
grep
--
"
$NC
"
$LOGFILE
&&
warning
"'
$NC
' problem exists in the build output"
}
check_log
()
check_log
()
{
{
local
LOGFILE i RES
local
LOGFILE i RES
echo
echo
echo
"-------------------------------------------------------"
echo
"-------------------------------------------------------"
echog
"Check log for..."
LOGFILE
=
$1
LOGFILE
=
$1
echog
"Check log
$LOGFILE
for..."
# obsoleted
if
grep
-q
'ld: warning: libstdc++\.so\.5, needed by [^ ]\+, may conflict with libstdc++\.so\.6'
$LOGFILE
;
then
if
grep
-q
'ld: warning: libstdc++\.so\.5, needed by [^ ]\+, may conflict with libstdc++\.so\.6'
$LOGFILE
;
then
echog
"Error found: libstdc++.so.5/6 conflicts. Check the log."
echog
"Error found: libstdc++.so.5/6 conflicts. Check the log."
return
1
return
1
...
@@ -21,18 +30,14 @@ check_log()
...
@@ -21,18 +30,14 @@ check_log()
echog
"Error found: will always overflow destination buffer. Check the log."
echog
"Error found: will always overflow destination buffer. Check the log."
return
1
return
1
fi
fi
#grep "WARNING:" $LOGFILE
grep
'python-strict'
$LOGFILE
&&
warning
"python-strict used!!!"
local
i
NC1
=
"command not found"
for
i
in
"python-strict"
\
NC2
=
"-march=athlon -mtune=athlon-xp"
"command not found"
\
NC3
=
"WARNING:"
"-march=athlon -mtune=athlon-xp"
\
#for i in ${NC1} ; do
"WARNING:"
;
do
grep
--
'$NC1'
$LOGFILE
&&
warning
"'
$NC1
' in build output (some errors in a scripts)"
__check_string
$LOGFILE
"
$i
"
grep
--
'$NC2'
$LOGFILE
&&
warning
"'
$NC2
' in build output (forbidden) "
done
grep
--
'$NC3'
$LOGFILE
&&
warning
"'
$NC3
' in build output (forbidden) "
#done
return
0
return
0
}
}
tests/test_check_log.sh
0 → 100755
View file @
c72c3e6e
#!/bin/sh
# Run with rpm build log for test
.
`
dirname
$0
`
/../share/eterbuild/functions/common
load_mod check
check_log
$1
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment