[Gnash-commit] gnash ChangeLog testsuite/libnet.all/test_http....

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/03/31 10:51:30

Modified files:
        .              : ChangeLog 
        testsuite/libnet.all: test_http.cpp 
        testsuite/swfdec: Makefile.am 

Log message:
                * testsuite/libnet.all/test_http.cpp: extractCharset returns an 
int, and
                  we don't want to try turning it into a string like that.
                * testsuite/swfdec/Makefile.am: remove .out and .err files on 
make clean.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6109&r2=1.6110
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libnet.all/test_http.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/swfdec/Makefile.am?cvsroot=gnash&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6109
retrieving revision 1.6110
diff -u -b -r1.6109 -r1.6110
--- ChangeLog   31 Mar 2008 07:26:46 -0000      1.6109
+++ ChangeLog   31 Mar 2008 10:51:29 -0000      1.6110
@@ -3,6 +3,9 @@
        * server/asobj/Date.cpp: check for success of localtime - some
          more-than-32-bit numbers fail - and set to NaN. This (probably)
          isn't expected behaviour, but fixes a segfault.
+       * testsuite/libnet.all/test_http.cpp: extractCharset returns an int, and
+         we don't want to try turning it into a string like that.
+       * testsuite/swfdec/Makefile.am: remove .out and .err files on make 
clean.
 
 2008-03-31 Zou Lunkai <address@hidden>
 

Index: testsuite/libnet.all/test_http.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libnet.all/test_http.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- testsuite/libnet.all/test_http.cpp  29 Mar 2008 22:01:48 -0000      1.3
+++ testsuite/libnet.all/test_http.cpp  31 Mar 2008 10:51:30 -0000      1.4
@@ -371,6 +371,7 @@
     }
     count = http.extractLanguage(buffer2);
     language = http.getLanguage();
+
     if ((count == 2) &&
         (language[0] == "en-US") &&
         (language[1] == "en")) {
@@ -379,8 +380,9 @@
         runtest.pass ("HTTP::extractLanguage(Content-)");
     }
 
-    result = reinterpret_cast<const char *>(http.extractCharset(buffer));
+    count = http.extractCharset(buffer);
     std::vector<std::string> charsets = http.getCharset();
+    
     if ((count == 3) &&
         (charsets[0] == "iso-8859-1") &&
         (charsets[1] == "utf-8") &&

Index: testsuite/swfdec/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/swfdec/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- testsuite/swfdec/Makefile.am        21 Jan 2008 23:26:54 -0000      1.9
+++ testsuite/swfdec/Makefile.am        31 Mar 2008 10:51:30 -0000      1.10
@@ -53,6 +53,7 @@
 clean-local: 
        rm -f $(check_SCRIPTS) \
                *.log *.trace-gnash \
+               *.out *.err \
                site.bak site.exp site.exp.bak testrun.sum \
                gnash.sum