From: <en...@ke...> - 2007-06-13 11:45:28
|
CVS Root: /cvs/gstreamer Module: gst-media-test Changes by: ensonic Date: Wed Jun 13 2007 11:45:20 UTC Log message: * runtests.py: Add option to set debugleve for 2nd run too. Avoid creating logfiles when debuglevels are 0. Modified files: . : ChangeLog runtests.py Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-media-test/ChangeLog.diff?r1=1.40&r2=1.41 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-media-test/runtests.py.diff?r1=1.21&r2=1.22 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-media-test/ChangeLog,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- ChangeLog 1 Mar 2007 19:16:39 -0000 1.40 +++ ChangeLog 13 Jun 2007 11:45:06 -0000 1.41 @@ -1,3 +1,9 @@ +2007-06-13 Stefan Kost <en...@us...> + + * runtests.py: + Add option to set debugleve for 2nd run too. Avoid creating logfiles + when debuglevels are 0. 2007-03-01 Jan Schmidt <th...@ma...> * gsttester.py: Index: runtests.py RCS file: /cvs/gstreamer/gst-media-test/runtests.py,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- runtests.py 25 Jan 2007 12:01:48 -0000 1.21 +++ runtests.py 13 Jun 2007 11:45:06 -0000 1.22 @@ -53,7 +53,6 @@ # _ Per tests # _ Per file # -# _ Allow to have no logfiles (-d0 -> common.INFO_LOGFILE='/dev/null') global mainloop @@ -154,9 +153,10 @@ """ def __init__(self, files, testscripts, recursive=True, topdir=None, - extreme=False, valgrinding=False, debuglevel=2, - acceptlist=[], rejectlist=[], compressed=True, - subdirectory=None, weboutput=True): + extreme=False, valgrinding=False, + debuglevel=2, debuglevel2=5, + acceptlist=[], rejectlist=[], + compressed=True, subdirectory=None, weboutput=True): print "Gstreamer media testsuite" print "Initializing..." self._files = files @@ -165,6 +165,7 @@ self._extreme = extreme self._valgrinding = valgrinding self._debuglevel = debuglevel + self._debuglevel2 = debuglevel2 if len(acceptlist) and len(rejectlist): print "You can only choose extensions to accept OR to reject !" sys.exit() @@ -274,12 +275,13 @@ result = self._run_on_file_full(fil, testscript) if not result[common.INFO_RESULT] in [common.TEST_SUCCESS, common.TEST_EXPECTED]: pres = result - result = self._run_on_file_full(fil, testscript, debuglevel=5, nrun=2, + result = self._run_on_file_full(fil, testscript, debuglevel=self._debuglevel2, nrun=2, valgrind=self._extreme) if not result[common.INFO_RESULT] == pres[common.INFO_RESULT]: # remove 2nd run logfile/backtrace try: - os.remove(os.path.join(self.topdir, result[common.INFO_LOGFILE])) + if pres.has_key(common.INFO_LOGFILE): + os.remove(os.path.join(self.topdir, result[common.INFO_LOGFILE])) if result.has_key(common.INFO_BACKTRACE): os.remove(os.path.join(self.topdir, result[common.INFO_BACKTRACE])) if result.has_key(common.INFO_VALGRIND): @@ -289,9 +291,10 @@ pres[common.INFO_REASON] = "The second run (GST_DEBUG=5) returned a different result from the first run. Keeping results from the first run.\nFirst run : %s\nSecond run : %s" % (pres[common.INFO_REASON], result[common.INFO_REASON]) result = pres else: - # remove 1st furn logfile/backtrace + # remove 1st run logfile/backtrace - os.remove(os.path.join(self.topdir, pres[common.INFO_LOGFILE])) + os.remove(os.path.join(self.topdir, pres[common.INFO_LOGFILE])) if pres.has_key(common.INFO_BACKTRACE): os.remove(os.path.join(self.topdir, pres[common.INFO_BACKTRACE])) if pres.has_key(common.INFO_VALGRIND): @@ -312,16 +315,19 @@ remove_core_files() # prepare log files - if self._compressed: - result[common.INFO_LOGFILE] = "%s-%s-%d.debug.log.gz" % (common.safe_url(fil), - common.safe_url(testscript), - nrun) - logfilestr = os.path.join(self.topdir, result[common.INFO_LOGFILE] + "tmp") + if debuglevel > 0: + if self._compressed: + result[common.INFO_LOGFILE] = "%s-%s-%d.debug.log.gz" % (common.safe_url(fil), + common.safe_url(testscript), + nrun) + logfilestr = os.path.join(self.topdir, result[common.INFO_LOGFILE] + "tmp") + else: + result[common.INFO_LOGFILE] = "%s-%s-%d.debug.log" % (common.safe_url(fil), + common.safe_url(testscript), + nrun) + logfilestr = os.path.join(self.topdir, result[common.INFO_LOGFILE]) else: - result[common.INFO_LOGFILE] = "%s-%s-%d.debug.log" % (common.safe_url(fil), - common.safe_url(testscript), - nrun) - logfilestr = os.path.join(self.topdir, result[common.INFO_LOGFILE]) + logfilestr = "/dev/null" logfile = file(logfilestr, "w+") hanged = False @@ -419,7 +425,7 @@ result[common.INFO_PERCENTAGE] = percentage # compress debug file and close files + if self._compressed and result.has_key(common.INFO_LOGFILE): compress_file(logfile, os.path.join(self.topdir, result[common.INFO_LOGFILE])) os.remove(logfilestr) @@ -487,6 +493,8 @@ default=False) parser.add_option("-d", "--debuglevel", dest="debuglevel", type="int", default=2, help="GStreamer debug level (default: 2)") + parser.add_option("-D", "--debuglevel2", dest="debuglevel2", type="int", + default=5, help="GStreamer debug level for 2nd run (default: 5)") parser.add_option("-a", "--accept", dest="accept", help="Coma-separated list of file extensions to limit the tests to.", default=None, metavar="EXTENSIONS") @@ -531,6 +539,7 @@ extreme=options.extreme, valgrinding=options.valgrind, debuglevel=options.debuglevel, + debuglevel2=options.debuglevel2, acceptlist=acceptlist, rejectlist=rejectlist, compressed=options.compressed, |