Commit c8e9f801 authored by Måns Rullgård's avatar Måns Rullgård
Browse files

improved logging tests

Originally committed as revision 5491 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 407ddb4e
...@@ -101,7 +101,14 @@ log(){ ...@@ -101,7 +101,14 @@ log(){
echo "$@" >>$logfile echo "$@" >>$logfile
} }
logfile(){
log BEGIN $1
cat -n $1 >>$logfile
log END $1
}
die(){ die(){
log "$@"
echo "$@" echo "$@"
rm -f $TMPC $TMPO $TMPE $TMPS $TMPH rm -f $TMPC $TMPO $TMPE $TMPS $TMPH
exit 1 exit 1
...@@ -168,6 +175,7 @@ add_extralibs(){ ...@@ -168,6 +175,7 @@ add_extralibs(){
check_cc(){ check_cc(){
log check_cc "$@" log check_cc "$@"
cat >$TMPC cat >$TMPC
logfile $TMPC
log $cc $CFLAGS "$@" -c -o $TMPO $TMPC log $cc $CFLAGS "$@" -c -o $TMPO $TMPC
$cc $CFLAGS "$@" -c -o $TMPO $TMPC >>$logfile 2>&1 $cc $CFLAGS "$@" -c -o $TMPO $TMPC >>$logfile 2>&1
} }
...@@ -175,6 +183,7 @@ check_cc(){ ...@@ -175,6 +183,7 @@ check_cc(){
check_cpp(){ check_cpp(){
log check_cpp "$@" log check_cpp "$@"
cat >$TMPC cat >$TMPC
logfile $TMPC
log $cc $CFLAGS "$@" -E -o $TMPO $TMPC log $cc $CFLAGS "$@" -E -o $TMPO $TMPC
$cc $CFLAGS "$@" -E -o $TMPO $TMPC >>$logfile 2>&1 $cc $CFLAGS "$@" -E -o $TMPO $TMPC >>$logfile 2>&1
} }
...@@ -182,8 +191,9 @@ check_cpp(){ ...@@ -182,8 +191,9 @@ check_cpp(){
check_ld(){ check_ld(){
log check_ld "$@" log check_ld "$@"
cat >$TMPC cat >$TMPC
logfile $TMPC
log $cc $CFLAGS $LDFLAGS "$@" -o $TMPE $TMPC $extralibs log $cc $CFLAGS $LDFLAGS "$@" -o $TMPE $TMPC $extralibs
$cc $CFLAGS $LDFLAGS "$@" -o $TMPE $TMPC $extralibs >>/dev/null 2>&1 $cc $CFLAGS $LDFLAGS "$@" -o $TMPE $TMPC $extralibs >>$logfile 2>&1
} }
check_cflags(){ check_cflags(){
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment