CVSROOT: /sources/gnash
Module name: gnash
Branch: release_0_8_1
Changes by: Sandro Santilli <strk> 07/08/20 10:48:27
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 <[EMAIL PROTECTED]>:
* libbase/log.cpp: fix 'set debuglog' directive.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.3971.2.43&r2=1.3971.2.44
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/log.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.54&r2=1.54.2.1
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/TCXXRc.cpp?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.14.2.1&r2=1.14.2.2
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/gnashrc.in?cvsroot=gnash&only_with_tag=release_0_8_1&r1=1.5.6.1&r2=1.5.6.2
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3971.2.43
retrieving revision 1.3971.2.44
diff -u -b -r1.3971.2.43 -r1.3971.2.44
--- ChangeLog 19 Aug 2007 22:55:36 -0000 1.3971.2.43
+++ ChangeLog 20 Aug 2007 10:48:26 -0000 1.3971.2.44
@@ -1,5 +1,14 @@
2007-08-19 Sandro Santilli <[EMAIL PROTECTED]>
+ * testsuite/libbase/: TCXXRc.cpp, gnashrc.in:
+ Test 'set debuglog' directive.
+
+2007-08-19 Benjamin Wolsey <[EMAIL PROTECTED]>
+
+ * libbase/log.cpp: fix 'set debuglog' directive.
+
+2007-08-19 Sandro Santilli <[EMAIL PROTECTED]>
+
* server/vm/ASHandlers.cpp (ActionGetVariables): simplify debugging
output.
Index: libbase/log.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/log.cpp,v
retrieving revision 1.54
retrieving revision 1.54.2.1
diff -u -b -r1.54 -r1.54.2.1
--- libbase/log.cpp 1 Jul 2007 10:54:09 -0000 1.54
+++ libbase/log.cpp 20 Aug 2007 10:48:27 -0000 1.54.2.1
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: log.cpp,v 1.54 2007/07/01 10:54:09 bjacques Exp $ */
+/* $Id: log.cpp,v 1.54.2.1 2007/08/20 10:48:27 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.14.2.1
retrieving revision 1.14.2.2
diff -u -b -r1.14.2.1 -r1.14.2.2
--- testsuite/libbase/TCXXRc.cpp 19 Aug 2007 20:22:04 -0000 1.14.2.1
+++ testsuite/libbase/TCXXRc.cpp 20 Aug 2007 10:48:27 -0000 1.14.2.2
@@ -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.5.6.1
retrieving revision 1.5.6.2
diff -u -b -r1.5.6.1 -r1.5.6.2
--- testsuite/libbase/gnashrc.in 19 Aug 2007 20:22:04 -0000 1.5.6.1
+++ testsuite/libbase/gnashrc.in 20 Aug 2007 10:48:27 -0000 1.5.6.2
@@ -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
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
