Permalink
Browse files

changes for OS X Lion for build and test

The configure script had a place verifying Darwin version 10.*, which
doesn't work for Lion since it's version 11.*. Allow any version
greater than or equal to 10. Also the wgettest script under test/t1
uses grep in a way that no longer seems to work under Lion (very odd),
so change it to work around the issue.
  • Loading branch information...
1 parent 769fa3a commit c61e0c07bcabc26435bc5d1ec977f31d75bb8d77 @vinoski vinoski committed Sep 23, 2011
Showing with 5 additions and 3 deletions.
  1. +1 −1 configure.in
  2. +4 −2 test/t1/wgettest
View
@@ -274,7 +274,7 @@ case "$host_os" in
AC_LANG(C)
AC_CHECK_LIB([c],[sendfile],[HAVE_SENDFILE=true])
case "$host_os" in
- darwin10*)
+ darwin1?*)
AC_LANG(Erlang)
AC_RUN_IFELSE(
[AC_LANG_PROGRAM([],[dnl
View
@@ -9,8 +9,10 @@ while [ $count -gt 0 ]; do
sleep 3
else
# log file written, now check it
- cat logs/report.log | grep -v www/arg.yaws | grep -v www/arg2.yaws | grep ERROR >/dev/null 2>&1
- [ $? -eq 0 ] || exit 1
+ # count lines to work around grep exit status portability issues
+ total=`cat logs/report.log | grep -v www/arg.yaws | \
+ grep -v www/arg2.yaws | grep -v ^=ERROR | grep ERROR 2>&1 | wc -l`
+ [ "$total" -eq 0 ] || exit 1
fi
count=`expr $count - 1`
done

0 comments on commit c61e0c0

Please sign in to comment.