[Gnash-commit] gnash ChangeLog libbase/log.cpp testsuite/libba...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/20 10:39:23

Modified files:
        .              : ChangeLog 
        libbase        : log.cpp 
        testsuite/libbase: TCXXRc.cpp gnashrc.in 

Log message:
                * testsuite/libbase/: TCXXRc.cpp, gnashrc.in:
                  Test 'set debuglog' directive.
        
        Patch #6158 (reviewed) by Benjamin Wolsey <address@hidden>:
        
                * libbase/log.cpp: fix 'set debuglog' directive.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4042&r2=1.4043
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&r1=1.55&r2=1.56
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/TCXXRc.cpp?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/gnashrc.in?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4042
retrieving revision 1.4043
diff -u -b -r1.4042 -r1.4043
--- ChangeLog   19 Aug 2007 23:34:54 -0000      1.4042
+++ ChangeLog   20 Aug 2007 10:39:23 -0000      1.4043
@@ -1,5 +1,14 @@
 2007-08-19 Sandro Santilli <address@hidden>
 
+       * testsuite/libbase/: TCXXRc.cpp, gnashrc.in:
+         Test 'set debuglog' directive.
+
+2007-08-19 Benjamin Wolsey <address@hidden>
+
+       * libbase/log.cpp: fix 'set debuglog' directive.
+
+2007-08-19 Sandro Santilli <address@hidden>
+
        * testsuite/actionscript.all/ops.as: test that NaN and undefined are
          not less one other.
        * server/vm/ASHandlers.cpp (ActionGetVariables): simplify debugging

Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -b -r1.55 -r1.56
--- libbase/log.cpp     18 Aug 2007 13:45:20 -0000      1.55
+++ libbase/log.cpp     20 Aug 2007 10:39:23 -0000      1.56
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: log.cpp,v 1.55 2007/08/18 13:45:20 strk Exp $ */
+/* $Id: log.cpp,v 1.56 2007/08/20 10:39:23 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -364,10 +364,16 @@
     loadfile = "/tmp/";
     loadfile += DEFAULT_LOGFILE;
 # else
-    loadfile = DEFAULT_LOGFILE;
+
+    RcInitFile& rcfile = RcInitFile::getDefaultInstance();
+    loadfile = rcfile.getDebugLog();
+    if ( loadfile.empty() ) loadfile = DEFAULT_LOGFILE;
+
 # endif
 #endif
 
+    // TODO: expand ~ to getenv("HOME") !!
+
     _outstream.open (loadfile.c_str(), ios::out);
     _filespec = loadfile;
     _state = OPEN;

Index: testsuite/libbase/TCXXRc.cpp
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/TCXXRc.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- testsuite/libbase/TCXXRc.cpp        19 Aug 2007 20:01:13 -0000      1.15
+++ testsuite/libbase/TCXXRc.cpp        20 Aug 2007 10:39:23 -0000      1.16
@@ -164,6 +164,12 @@
         runtest.fail ("getFlashVersionString");
     }
 
+    if (rc.getDebugLog() == "/tmp/gnash-dbg.log") {
+        runtest.pass ("getDebugLog");
+    } else {
+        runtest.fail ("getDebugLog");
+    }
+
     if (rc.startStopped() == 1) {
         runtest.pass ("startStopped");
     } else {

Index: testsuite/libbase/gnashrc.in
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/gnashrc.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- testsuite/libbase/gnashrc.in        19 Aug 2007 20:01:13 -0000      1.6
+++ testsuite/libbase/gnashrc.in        20 Aug 2007 10:39:23 -0000      1.7
@@ -26,7 +26,7 @@
 set parserDump off
 
 # The full path to the debug log
-set debuglog ~/gnash-dbg.log
+set debuglog /tmp/gnash-dbg.log
 
 # Version string to pass to ActionScript
 set flashVersionString GSH 9,0,99,0