Summary for sxemacs--main--22.1.10--patch-3

[Steve Youngs <steve@xxxxxxxxxxx>]

Location: steve@xxxxxxxxxxxxxxxxx http://arch.sxemacs.org/2008/

Revision: sxemacs--main--22.1.10--patch-3
Archive: steve@xxxxxxxxxxxxxxxxx
Creator: Steve Youngs <steve@xxxxxxxxxxx>
Date: Sun Jun  8 14:13:48 EST 2008
Standard-date: 2008-06-08 04:13:48 GMT
Modified-files: contrib/do_builds.sh
    contrib/report-build-failure.sh contrib/tty-colors.c
New-patches: njsf@xxxxxxxxxxxxxxxxx/sxemacs--njsf--22.1.10--patch-2
    njsf@xxxxxxxxxxxxxxxxx/sxemacs--njsf--22.1.10--patch-3
    steve@xxxxxxxxxxxxxxxxx/sxemacs--main--22.1.10--patch-3
Summary: Merged from njsf (patch 2-3) -- contrib updates
Keywords: merge, enhancement

Patches applied:

 * njsf@xxxxxxxxxxxxxxxxx/sxemacs--njsf--22.1.10--patch-2
   Contrib update

 * njsf@xxxxxxxxxxxxxxxxx/sxemacs--njsf--22.1.10--patch-3
   Improve contrib tty-colors number of terminal colors detection

* added directories

    {arch}/sxemacs/sxemacs--njsf/sxemacs--njsf--22.1.10
    {arch}/sxemacs/sxemacs--njsf/sxemacs--njsf--22.1.10/njsf@xxxxxxxxxxxxxxxxx
    
{arch}/sxemacs/sxemacs--njsf/sxemacs--njsf--22.1.10/njsf@xxxxxxxxxxxxxxxxx/patch-log

* added files

    
{arch}/sxemacs/sxemacs--main/sxemacs--main--22.1.10/steve@xxxxxxxxxxxxxxxxx/patch-log/patch-3
    
{arch}/sxemacs/sxemacs--njsf/sxemacs--njsf--22.1.10/njsf@xxxxxxxxxxxxxxxxx/patch-log/patch-2
    
{arch}/sxemacs/sxemacs--njsf/sxemacs--njsf--22.1.10/njsf@xxxxxxxxxxxxxxxxx/patch-log/patch-3

* modified files

--- orig/contrib/do_builds.sh
+++ mod/contrib/do_builds.sh
@@ -112,11 +112,16 @@
        if egrep '^make.*:.*Error' ,,beta.out; then
            STATUS="${STATUS}_ERROR_IN_BUILD"
        else
-           if [ -f ,,make-check.out -a ! "${STATUS}" = "Success" ]; then
-               STATUS="Tests fail"
-           fi    
+           if [ -f ,,make-check.out ]; then
+               if [ ! "${STATUS}" = "Success" ]; then
+                   STATUS="Tests fail"
+               elif [ -n "$(grep 'tests successful' ,,make-check.out | grep -v 
100%)" ]; then
+                   STATUS="Sucess(Some tests fail)"
+               fi
+           if 
        fi
     fi
+    DO_REPORT_FAILURE=""
     if [ "${REPORT_STATUS}" = "Yes" -o "${REPORT_STATUS}" = "Y" ]; then
        if [ "${STATUS}" = "Success" -o "${STATUS}" = "Tests fail" ]; then
            CLI=""


--- orig/contrib/report-build-failure.sh
+++ mod/contrib/report-build-failure.sh
@@ -154,7 +154,7 @@
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
-Failure while building $VERSION on $CONFGUESS ($MACHTYPE)
+$STATUS while building $VERSION on $CONFGUESS ($MACHTYPE)
 
 EOF
 MSRCDIR="${SRCDIR}"


--- orig/contrib/tty-colors.c
+++ mod/contrib/tty-colors.c
@@ -221,7 +221,7 @@
                ts.c_lflag = mode;
 
                /* Ask for the colors */
-               for ( i = 0 ; i < maxcolors; i ++ ) {
+               for ( i = 0 ; 1 ; i ++ ) {
                        char buffer[1000], 
                                *buf=buffer, 
                                *end=buffer+sizeof(buffer)-1;
@@ -235,6 +235,27 @@
                        fflush(stdout);
                        memset(buffer,0,sizeof(buffer));
                        while( buf!=end ) {
+                               fd_set fdsr, fdse,fdsw;
+                               int fds;
+                               struct timeval t;
+                               
+                               t.tv_sec = 0;
+                               t.tv_usec = 100000; /* 100ms */
+
+                               FD_ZERO(&fdsr);
+                               FD_ZERO(&fdse);
+                               FD_ZERO(&fdsw);
+                               FD_SET(fd, &fdsr);
+                               FD_SET(fd, &fdse);
+                               fds = select(fd+1,&fdsr,&fdsw,&fdse,&t);
+                               if ( fds < 1) {
+                                       tcsetattr(fd, TCSANOW,&ts);
+                                       return;
+                               }
+                               if ( ! FD_ISSET(fd, &fdsr) ) {
+                                       tcsetattr(fd, TCSANOW,&ts);
+                                       return;
+                               }
                                read(fd,buf,1);
                                if ( *buf == '\\') {
                                        /* The response sequence ends with the 
only "\"