--- a/sbsv2/raptor/RELEASE-NOTES.txt Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt Sun Dec 06 10:34:20 2009 +0000
@@ -1,6 +1,21 @@
Release Notes for Symbian Build System v2
+version 2.11.1
+
+Other Changes:
+GCCE 4.4.1 variant added
+Restored python 2.4 compatibility
+Minor TOOLS2 --what corrections
+Retain Linux execute permissions on unpacked :zip archives
+Prototype of extended timing API added
+Option --noexport added for parallel parsing
+Made --noexport and --export-only mutually exclusive
+SBS_PYTHONPATH insulates sbs from the global PYTHONPATH
+Removed spurious bracket in e32abiv2textnotifier2
+More robust to multiple import library definitions
+
+
version 2.11.0
New Features:
--- a/sbsv2/raptor/bin/sbs Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/bin/sbs Sun Dec 06 10:34:20 2009 +0000
@@ -68,6 +68,7 @@
__MINGW__=${SBS_MINGW:-$SBS_HOME/$HOSTPLATFORM_DIR/mingw}
__CYGWIN__=${SBS_CYGWIN:-$SBS_HOME/$HOSTPLATFORM_DIR/cygwin}
__PYTHON__=${SBS_PYTHON:-$SBS_HOME/$HOSTPLATFORM_DIR/python252/python.exe}
+ export PYTHONPATH=${SBS_PYTHONPATH:-$SBS_HOME/$HOSTPLATFORM_DIR/python252}
# Command for unifying path strings. For example, "c:\some\path" and
# "/cygdrive/c/some/path" will both be converted into "c:/some/path".
@@ -87,6 +88,7 @@
export CYGWIN='nontsec nosmbntsec'
else
+ export PYTHONPATH=${SBS_PYTHONPATH:-$SBS_HOME/$HOSTPLATFORM_DIR/python262/lib}
PATH=$SBS_HOME/$HOSTPLATFORM_DIR/python262/bin:$SBS_HOME/$HOSTPLATFORM_DIR/bin:$PATH
LD_LIBRARY_PATH=$SBS_HOME/$HOSTPLATFORM_DIR/python262/lib:$SBS_HOME/$HOSTPLATFORM_DIR/bv/lib:$LD_LIBRARY_PATH
--- a/sbsv2/raptor/lib/flm/e32abiv2textnotifier2.flm Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2textnotifier2.flm Sun Dec 06 10:34:20 2009 +0000
@@ -28,7 +28,7 @@
AUTOEXPORTS:=_Z13NotifierArrayv,1;
# Determine what kind of entrypoint option to set
LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION))$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True")
LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP)
--- a/sbsv2/raptor/lib/flm/tools2common.flm Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/lib/flm/tools2common.flm Sun Dec 06 10:34:20 2009 +0000
@@ -102,6 +102,6 @@
## Clean up
$(call raptor_clean,$(CLEANTARGETS) $(OBJECTFILES))
## for the --what option and the log file
-$(call raptor_release,$(RELEASEABLES))
+$(call raptor_release,$(RELEASABLES))
## The End
--- a/sbsv2/raptor/lib/flm/tools2exe.flm Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/lib/flm/tools2exe.flm Sun Dec 06 10:34:20 2009 +0000
@@ -24,12 +24,13 @@
EXETARGET:=$(RELEASEPATH)/$(TARGET)$(DOTEXE)
+INSTALLED:=
ifneq ($(TOOLSPATH),)
INSTALLED:=$(TOOLSPATH)/$(TARGET)$(DOTEXE)
endif
## Target groups
-RELEASEABLES:=$(INSTALLED)
+RELEASABLES:=$(INSTALLED)
TARGETS:=$(EXETARGET) $(INSTALLED)
## Common build steps (compiling and cleaning)
--- a/sbsv2/raptor/lib/flm/tools2lib.flm Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/lib/flm/tools2lib.flm Sun Dec 06 10:34:20 2009 +0000
@@ -19,7 +19,7 @@
LIBTARGET:=$(RELEASEPATH)/$(TARGET).a
## Target groups
-RELEASEABLES:=$(LIBTARGET)
+RELEASABLES:=$(LIBTARGET)
TARGETS:=$(LIBTARGET)
## Common build steps (compiling)
--- a/sbsv2/raptor/python/filter_utils.py Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/python/filter_utils.py Sun Dec 06 10:34:20 2009 +0000
@@ -198,12 +198,16 @@
def isError(self, aLine):
"""Convenience matcher for basic errors.
Override in sub-classes to specialise."""
- return True if Recipe.error.match(aLine) else False
+ if Recipe.error.match(aLine):
+ return True
+ return False
def isWarning(self, aLine):
"""Convenience matcher for basic warnings.
Override in sub-classes to specialise."""
- return True if Recipe.warning.match(aLine) else False
+ if Recipe.warning.match(aLine):
+ return True
+ return False
def getOutput(self):
""""Return a list of all output that isn't an error or a warning.
@@ -234,16 +238,17 @@
def isSuccess(self):
"Convenience method to get overall recipe status."
- return True if self.getDetail(Recipe.exit) == "ok" else False
+ return (self.getDetail(Recipe.exit) == "ok")
class Win32Recipe(Recipe):
"Win32 tailored recipe class."
def isError(self, aLine):
- return True if mwError.match(aLine) else False
+ if mwError.match(aLine):
+ return True
+ return False
def isWarning(self, aLine):
- return True if mwWarning.match(aLine) else False
-
-
-
+ if mwWarning.match(aLine):
+ return True
+ return False
--- a/sbsv2/raptor/python/plugins/filter_carbide.py Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/python/plugins/filter_carbide.py Sun Dec 06 10:34:20 2009 +0000
@@ -129,5 +129,4 @@
FilterCarbide.stdout.write("Overall Errors: %d\n" % self.__errors)
FilterCarbide.stdout.write("Overall Warnings: %d\n\n" % self.__warnings)
- return True if self.__errors == 0 else False
-
+ return (self.__errors == 0)
--- a/sbsv2/raptor/python/plugins/filter_checksource.py Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/python/plugins/filter_checksource.py Sun Dec 06 10:34:20 2009 +0000
@@ -221,8 +221,8 @@
# so we only check each one once
depset = set(deps)
deplistnodups = list(depset)
+
# Do the check for each file
-
for dep in deplistnodups:
dep = os.path.abspath(dep).replace('\\', '/')
self.checksource(dep)
--- a/sbsv2/raptor/python/plugins/filter_logfile.py Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/python/plugins/filter_logfile.py Sun Dec 06 10:34:20 2009 +0000
@@ -16,6 +16,7 @@
# Will ultimately do everything that scanlog does
#
+import errno
import os
import sys
import raptor
@@ -38,7 +39,7 @@
if dirname and not os.path.isdir(dirname):
os.makedirs(dirname)
except os.error, e:
- if e.errno != os.errno.EEXIST:
+ if e.errno != errno.EEXIST:
sys.stderr.write("%s : error: cannot create directory %s\n" % \
(str(raptor.name), dirname))
return False
--- a/sbsv2/raptor/python/plugins/filter_splitlog.py Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/python/plugins/filter_splitlog.py Sun Dec 06 10:34:20 2009 +0000
@@ -16,6 +16,7 @@
# Will ultimately do everything that scanlog does
#
+import errno
import os
import sys
import raptor
@@ -38,7 +39,7 @@
if dirname and not os.path.isdir(dirname):
os.makedirs(dirname)
except os.error, e:
- if e.errno != os.errno.EEXIST:
+ if e.errno != errno.EEXIST:
sys.stderr.write("%s : error: cannot create directory " +
"%s\n" % (raptor.name, dirname))
return False
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/python/plugins/filter_timing.py Sun Dec 06 10:34:20 2009 +0000
@@ -0,0 +1,121 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# Base Class for defining filter classes
+# All filter classes that get defined should derive from this base class
+#
+
+import errno
+import filter_interface
+import os
+import raptor
+import raptor_timing
+import sys
+
+class FilterTiming(filter_interface.Filter):
+ """
+ Writes a logfile containing the timings for each Raptor process
+ """
+
+ def open(self, raptor_instance):
+ """
+ Open a log file with the same name as the Raptor log file, with
+ '.timings' appended. This will contain only 'progress'
+ timing tags from the Raptor output
+ Parameters:
+ raptor_instance - Raptor
+ Instance of Raptor. FilterList usually passes in a cut-down
+ version of Raptor containing only a few attributes
+ """
+ self.raptor = raptor_instance
+ self.logFileName = self.raptor.logFileName
+ # insert the time into the log file name
+ if self.logFileName:
+ self.path = (self.logFileName.path.replace("%TIME",
+ self.raptor.timestring) + ".timings")
+
+ try:
+ dirname = str(self.raptor.logFileName.Dir())
+ if dirname and not os.path.isdir(dirname):
+ os.makedirs(dirname)
+ except os.error, e:
+ if e.errno != errno.EEXIST:
+ sys.stderr.write("%s : error: cannot create directory " +
+ "%s\n" % (raptor.name, dirname))
+ return False
+ try:
+ self.out = open(str(self.path), "w")
+ except:
+ self.out = None
+ sys.stderr.write("%s : error: cannot write log %s\n" %\
+ (raptor.name, self.path))
+ return False
+ self.start_times = {}
+ self.all_durations = []
+ self.namespace_written = False
+ self.open_written = False
+ return True
+
+
+ def write(self, text):
+ """
+ Write out any tags with a 'progress_' tagName
+ """
+ if "<progress:discovery " in text:
+ self.out.write(text)
+ elif "<progress:start " in text:
+ attributes = raptor_timing.Timing.extract_values(source = text)
+ self.start_times[(attributes["object_type"] + attributes["task"] +
+ attributes["key"])] = attributes["time"]
+ elif "<progress:end " in text:
+ attributes = raptor_timing.Timing.extract_values(source = text)
+ duration = (float(attributes["time"]) -
+ float(self.start_times[(attributes["object_type"] +
+ attributes["task"] + attributes["key"])]))
+ self.out.write(raptor_timing.Timing.custom_string(tag = "duration",
+ object_type = attributes["object_type"],
+ task = attributes["task"], key = attributes["key"],
+ time = duration))
+ self.all_durations.append(duration)
+ elif text.startswith("<?xml ") and not self.namespace_written:
+ self.out.write(text)
+ self.namespace_written = True
+ elif text.startswith("<buildlog ") and not self.open_written:
+ self.out.write(text)
+ self.open_written = True
+ return True
+
+
+ def summary(self):
+ """
+ Print out extra timing info
+ """
+ total_time = 0.0
+ for duration in self.all_durations:
+ total_time += duration
+ self.out.write(raptor_timing.Timing.custom_string(tag = "duration",
+ object_type = "all", task = "all", key = "all",
+ time = total_time) + "</buildlog>\n")
+
+
+ def close(self):
+ """
+ Close the logfile
+ """
+ try:
+ self.out.close
+ return True
+ except:
+ self.out = None
+ return False
--- a/sbsv2/raptor/python/raptor.py Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/python/raptor.py Sun Dec 06 10:34:20 2009 +0000
@@ -34,6 +34,7 @@
import raptor_make
import raptor_makefile
import raptor_meta
+import raptor_timing
import raptor_utilities
import raptor_version
import raptor_xml
@@ -181,11 +182,17 @@
# insert the start time into the Makefile name?
makefile.path = makefile.path.replace("%TIME", build.timestring)
+ build.InfoDiscovery(object_type = "layers", count = 1)
+ build.InfoStartTime(object_type = "layer", task = "parse",
+ key = str(makefile.path))
makefileset = build.maker.Write(makefile, specs, build.buildUnitsToBuild)
+ build.InfoEndTime(object_type = "layer", task = "parse",
+ key = str(makefile.path))
return makefileset
+
def realise(self, build):
"""Give the spec trees to the make engine and actually
"build" the product represented by this model node"""
@@ -198,7 +205,15 @@
m = self.realise_makefile(build, sp)
- return build.Make(m)
+ build.InfoStartTime(object_type = "layer", task = "build",
+ key = (str(m.directory) + "/" + str(m.filenamebase)))
+ result = build.Make(m)
+ build.InfoEndTime(object_type = "layer", task = "build",
+ key = (str(m.directory) + "/" + str(m.filenamebase)))
+
+
+ return result
+
class Project(ModelNode):
@@ -307,6 +322,9 @@
if build.quiet == True:
cli_options += " -q"
+
+ if build.timing == True:
+ cli_options += " --timing"
nc = len(self.children)
@@ -377,20 +395,22 @@
spec_nodes.append(specNode)
binding_makefiles.addInclude(str(makefile_path)+"_all")
- ppstart = time.time()
- build.Info("Parallel Parsing: time: Start %d", int(ppstart))
+ build.InfoDiscovery(object_type = "layers", count = 1)
+ build.InfoStartTime(object_type = "layer", task = "parse",
+ key = str(build.topMakefile))
m = self.realise_makefile(build, spec_nodes)
m.close()
gen_result = build.Make(m)
- ppfinish = time.time()
- build.Info("Parallel Parsing: time: Finish %d", int(ppfinish))
- build.Info("Parallel Parsing: time: Parse Duration %d", int(ppfinish - ppstart))
+ build.InfoEndTime(object_type = "layer", task = "parse",
+ key = str(build.topMakefile))
+ build.InfoStartTime(object_type = "layer", task = "build",
+ key = str(build.topMakefile))
build.Debug("Binding Makefile base name is %s ", binding_makefiles.filenamebase)
binding_makefiles.close()
b = build.Make(binding_makefiles)
- buildfinish = time.time()
- build.Info("Parallel Parsing: time: Build Duration %d", int(buildfinish - ppfinish))
+ build.InfoEndTime(object_type = "layer", task = "build",
+ key = str(build.topMakefile))
return b
@@ -493,6 +513,7 @@
# what platform and filesystem are we running on?
self.filesystem = raptor_utilities.getOSFileSystem()
+ self.timing = False
self.toolset = None
self.starttime = time.time()
@@ -648,11 +669,17 @@
return False
return True
+
+ def SetTiming(self, TrueOrFalse):
+ self.timing = TrueOrFalse
+ return True
def SetParallelParsing(self, type):
type = type.lower()
if type == "on":
self.doParallelParsing = True
+ elif type == "slave":
+ self.isParallelParsingSlave = True
elif type == "off":
self.doParallelParsing = False
else:
@@ -1048,10 +1075,11 @@
self.out.write("<?xml version=\"1.0\" encoding=\"ISO-8859-1\" ?>\n")
namespace = "http://symbian.com/xml/build/log"
+ progress_namespace = "http://symbian.com/xml/build/log/progress"
schema = "http://symbian.com/xml/build/log/1_0.xsd"
- self.out.write("<buildlog sbs_version=\"%s\" xmlns=\"%s\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"%s %s\">\n"
- % (raptor_version.fullversion(), namespace, namespace, schema))
+ self.out.write("<buildlog sbs_version=\"%s\" xmlns=\"%s\" xmlns:progress=\"%s\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"%s %s\">\n"
+ % (raptor_version.fullversion(), namespace, progress_namespace, namespace, schema))
self.logOpen = True
except Exception,e:
self.out = sys.stdout # make sure that we can actually get errors out.
@@ -1088,6 +1116,30 @@
"""
self.out.write("<info" + self.attributeString(attributes) + ">" +
escape(format % extras) + "</info>\n")
+
+ def InfoDiscovery(self, object_type, count):
+ if self.timing:
+ try:
+ self.out.write(raptor_timing.Timing.discovery_string(object_type = object_type,
+ count = count))
+ except Exception, exception:
+ Error(exception.Text, function = "InfoDiscoveryTime")
+
+ def InfoStartTime(self, object_type, task, key):
+ if self.timing:
+ try:
+ self.out.write(raptor_timing.Timing.start_string(object_type = object_type,
+ task = task, key = key))
+ except Exception, exception:
+ Error(exception.Text, function = "InfoStartTime")
+
+ def InfoEndTime(self, object_type, task, key):
+ if self.timing:
+ try:
+ self.out.write(raptor_timing.Timing.end_string(object_type = object_type,
+ task = task, key = key))
+ except Exception, exception:
+ Error(exception.Text, function = "InfoEndTime")
def Debug(self, format, *extras, **attributes):
"Send a debugging message to the configured channel"
--- a/sbsv2/raptor/python/raptor_cli.py Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/python/raptor_cli.py Sun Dec 06 10:34:20 2009 +0000
@@ -147,10 +147,15 @@
"forced" - Check all tool versions. Don't use cached results.
""")
+
+parser.add_option("--timing",action="store_true",dest="timing",
+ help="Show extra timing information for various processes in the build.")
+
parser.add_option("--pp",action="store",dest="parallel_parsing",
help="""Controls how metadata (e.g. bld.infs) are parsed in Parallel.
Possible values are:
"on" - Parse bld.infs in parallel (should be faster on clusters/multicore machines)
+ "slave" - used internally by Raptor
"off" - Parse bld.infs serially
""")
@@ -277,6 +282,7 @@
'what' : Raptor.SetWhat,
'tries' : Raptor.SetTries,
'toolcheck' : Raptor.SetToolCheck,
+ 'timing' : Raptor.SetTiming,
'source_target' : Raptor.AddSourceTarget,
'command_file' : CommandFile,
'parallel_parsing' : Raptor.SetParallelParsing,
--- a/sbsv2/raptor/python/raptor_make.py Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/python/raptor_make.py Sun Dec 06 10:34:20 2009 +0000
@@ -20,6 +20,7 @@
import os
import random
import raptor
+import raptor_timing
import raptor_utilities
import raptor_version
import raptor_data
@@ -27,7 +28,6 @@
import subprocess
import time
from raptor_makefile import *
-import raptor_version
import traceback
import sys
@@ -135,9 +135,23 @@
USE_TALON:=
"""
-
+
+
+ timing_start = "$(info " + \
+ raptor_timing.Timing.custom_string(tag = "start",
+ object_type = "makefile", task = "parse",
+ key = "$(THIS_FILENAME)",
+ time="$(shell date +%s.%N)").rstrip("\n") + ")"
+
+ timing_end = "$(info " + \
+ raptor_timing.Timing.custom_string(tag = "end",
+ object_type = "makefile", task = "parse",
+ key = "$(THIS_FILENAME)",
+ time="$(shell date +%s.%N)").rstrip("\n") + ")"
+
self.makefile_prologue = """
+
# generated by %s %s
HOSTPLATFORM:=%s
@@ -145,6 +159,7 @@
OSTYPE:=%s
FLMHOME:=%s
SHELL:=%s
+THIS_FILENAME:=$(firstword $(MAKEFILE_LIST))
%s
@@ -159,8 +174,18 @@
talon_settings,
self.raptor.systemFLM.Append('globals.mk') )
+ # Only output timings if requested on CLI
+ if self.raptor.timing:
+ self.makefile_prologue += "\n# Print Start-time of Makefile parsing\n" \
+ + timing_start + "\n\n"
+
+
+ self.makefile_epilogue = "\n\n# Print End-time of Makefile parsing\n" \
+ + timing_end + "\n"
+ else:
+ self.makefile_epilogue = ""
- self.makefile_epilogue = """
+ self.makefile_epilogue += """
include %s
@@ -365,6 +390,9 @@
if clean_flag:
fileName_list.reverse()
+ # Report number of makefiles to be built
+ self.raptor.InfoDiscovery(object_type = "makefile", count = len(fileName_list))
+
# Process each file in turn
for makefile in fileName_list:
if not os.path.exists(makefile):
@@ -431,6 +459,10 @@
# bufsize=1 means "line buffered"
#
try:
+ # Time the build
+ self.raptor.InfoStartTime(object_type = "makefile",
+ task = "build", key = str(makefile))
+
makeenv=os.environ.copy()
if self.usetalon:
makeenv['TALON_RECIPEATTRIBUTES']="none"
@@ -458,6 +490,9 @@
# should be done now
returncode = p.wait()
+ # Report end-time of the build
+ self.raptor.InfoEndTime(object_type = "makefile",
+ task = "build", key = str(makefile))
if returncode != 0 and not self.raptor.keepGoing:
self.Tidy()
@@ -466,6 +501,9 @@
except Exception,e:
self.raptor.Error("Exception '%s' during '%s'", str(e), command)
self.Tidy()
+ # Still report end-time of the build
+ self.raptor.InfoEnd(object_type = "Building", task = "Makefile",
+ key = str(makefile))
return False
# run any shutdown script
--- a/sbsv2/raptor/python/raptor_meta.py Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/python/raptor_meta.py Sun Dec 06 10:34:20 2009 +0000
@@ -297,9 +297,8 @@
def call(self, aArgs, sourcefilename):
""" Override call so that we can do our own error handling."""
tool = self._ExternalTool__Tool
+ commandline = tool + " " + aArgs + " " + str(sourcefilename)
try:
- commandline = tool + " " + aArgs + " " + str(sourcefilename)
-
# the actual call differs between Windows and Unix
if raptor_utilities.getOSFileSystem() == "unix":
p = subprocess.Popen(commandline, \
@@ -345,7 +344,7 @@
raise MetaDataError("Errors in %s" % str(sourcefilename))
except Exception,e:
- raise MetaDataError("Preprocessor exception: %s" % str(e))
+ raise MetaDataError("Preprocessor exception: '%s' : in command : '%s'" % (str(e), commandline))
return 0 # all OK
@@ -2652,8 +2651,8 @@
def LeftPortionOf(pth,sep):
""" Internal function to return portion of str that is to the left of sep.
- The partition is case-insentive."""
- length = len((pth.lower().partition(sep.lower()))[0])
+ The split is case-insensitive."""
+ length = len((pth.lower().split(sep.lower()))[0])
return pth[0:length]
modulePath = LeftPortionOf(LeftPortionOf(os.path.dirname(aBldInfPath), "group"), "ongoing")
@@ -2930,6 +2929,11 @@
expfile = open(expfilename, 'wb')
expfile.write(exportzip.read(file))
expfile.close()
+
+ # Resurrect any file execution permissions present in the archived version
+ if (exportzip.getinfo(file).external_attr >> 16L) & 0100:
+ os.chmod(expfilename, stat.S_IMODE(os.stat(expfilename).st_mode) | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
+
# Each file keeps its modified time the same as what it was before unzipping
accesstime = time.time()
datetime = exportzip.getinfo(file).date_time
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/python/raptor_timing.py Sun Dec 06 10:34:20 2009 +0000
@@ -0,0 +1,168 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# timings API
+# This API can be used to start and stop timings in order to measure performance
+#
+import time
+
+class Timing(object):
+
+ @classmethod
+ def discovery_string(cls, object_type, count):
+ """
+ Returns a tag that can be used to show what is about to be
+ "processed"
+ Parameters:
+ object_type - string
+ Type of object that is about to be "processed" in this task
+ count - int
+ Number of objects of input "object_type" are about to be
+ "processed"
+ Returns:
+ string
+ XML tag in the format that can be printed directly to a
+ Raptor log
+ """
+ return "<progress:discovery object_type='" + str(object_type) + \
+ "' count='" + str(count) + "' />\n"
+
+
+ @classmethod
+ def start_string(cls, object_type, task, key):
+ """
+ Returns a tag that can be used to show what is being "processed"
+ and the time it started
+ Parameters:
+ object_type - string
+ Type of object that is being "processed" in this task
+ task - string
+ What is being done with the object being "processed"
+ key - string
+ Unique identifier for the object being "processed"
+ Returns:
+ string
+ XML tag in the format that can be printed directly to a
+ Raptor log
+ """
+ return "<progress:start object_type='" + str(object_type) + \
+ "' task='" + str(task) + "' key='" + str(key) + \
+ "' time='" + str(time.time()) + "' />\n"
+
+
+ @classmethod
+ def end_string(cls, object_type, task, key):
+ """
+ Returns a tag that can be used to show what was being "processed"
+ and the time it finished
+ Parameters:
+ object_type - string
+ Type of object that was being "processed" in this task
+ task - string
+ What was being done with the object being "processed"
+ key - string
+ Unique identifier for the object that was "processed"
+ Returns:
+ string
+ XML tag in the format that can be printed directly to a
+ Raptor log
+ """
+ return "<progress:end object_type='" + str(object_type) + \
+ "' task='" + str(task) + "' key='" + str(key) + \
+ "' time='" + str(time.time()) + "' />\n"
+
+
+ @classmethod
+ def custom_string(cls, tag = "duration", object_type = "all", task = "all",
+ key = "all", time = 0.0):
+ """
+ Returns a custom tag in the 'progress' tag format
+
+ Parameters:
+ tag - string
+ String to be used for the tag
+ object_type - string
+ Type of object that was being "processed" in this task
+ task - string
+ What was being done with the object being "processed"
+ key - string
+ Unique identifier for the object that was "processed"
+ time - float
+ The time to be included in the tag
+ Returns:
+ string
+ XML tag in the format that can be printed directly to a
+ Raptor log
+ """
+ time_string = "time"
+ if tag == "duration":
+ time_string = "duration"
+ return "<progress:" + str(tag) + " object_type='" + str(object_type) + \
+ "' task='" + str(task) + "' key='" + str(key) + \
+ "' " + time_string + "='" + str(time) + "' />\n"
+
+
+ @classmethod
+ def extract_values(cls, source):
+ """
+ Takes, as input, a single tag of the format returned by one of the
+ above progress functions. Will extract the attributes and
+ return them as a dictionary. Returns an empty dictionary {}
+ if the tag name is not recognised or there is a parse error
+ Parameters:
+ source - string
+ The input string from which extracted attributes are
+ required
+ Returns:
+ dictionary
+ Dictionary containing the attributes extracted from the
+ input string. Returns an empty dictionary {} if the
+ tag name is not recognised or there is a parse error
+ NB: This function will not work correctly if the 'source' variable
+ contains multiple tags
+ """
+ import re
+
+ attributes = {}
+
+ try:
+ match = re.match(re.compile(".*object_type='(?P<object_type>.*?)'"),
+ source)
+ attributes["object_type"] = match.group("object_type")
+ except AttributeError, e:
+ print e
+ attributes["object_type"] = ""
+ try:
+ match = re.match(re.compile(".*task='(?P<task>.*?)'"), source)
+ attributes["task"] = match.group("task")
+ except AttributeError, e:
+ print e
+ attributes["task"] = ""
+ try:
+ match = re.match(re.compile(".*key='(?P<key>.*?)'"), source)
+ attributes["key"] = match.group("key")
+ except AttributeError:
+ attributes["key"] = ""
+ try:
+ match = re.match(re.compile(".*time='(?P<time>.*?)'"), source)
+ attributes["time"] = match.group("time")
+ except AttributeError:
+ attributes["time"] = ""
+ try:
+ match = re.match(re.compile(".*count='(?P<count>.*?)'"), source)
+ attributes["count"] = match.group("count")
+ except AttributeError:
+ attributes["count"] = ""
+
+ return attributes
--- a/sbsv2/raptor/python/raptor_version.py Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/python/raptor_version.py Sun Dec 06 10:34:20 2009 +0000
@@ -15,7 +15,7 @@
# raptor version information module
#
-version=(2,11,0,"2009-11-23","symbian build system")
+version=(2,11,1,"2009-12-16","symbian build system")
def numericversion():
"""Raptor version string"""
--- a/sbsv2/raptor/python/raptor_xml.py Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/python/raptor_xml.py Sun Dec 06 10:34:20 2009 +0000
@@ -222,6 +222,10 @@
def DumpInfo(self):
self.__Logger.Info("Found %d bld.inf references in %s within %d layers:", len(self.GetAllComponents()), self.__SystemDefinitionFile, len(self.GetLayerNames()))
self.__Logger.Info("\t%s", ", ".join(self.GetLayerNames()))
+ self.__Logger.InfoDiscovery(object_type = "layers",
+ count = len(self.GetLayerNames()))
+ self.__Logger.InfoDiscovery(object_type = "bld.inf references",
+ count = len(self.GetAllComponents()))
def __Read(self):
if not os.path.exists(self.__SystemDefinitionFile):
--- a/sbsv2/raptor/test/common/raptor_tests.py Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/test/common/raptor_tests.py Sun Dec 06 10:34:20 2009 +0000
@@ -133,7 +133,6 @@
for line in manifest:
line = line.replace("$(HOSTPLATFORM_DIR)", host_platform)
line = line.replace("./", epocroot+"/").rstrip("\n")
- # Get rid of newline char and add to dictionary
all_files[line] = True
# This bit makes a record of unique folders into a list
pos = line.rfind("/", le)
@@ -171,6 +170,9 @@
# This loop handles folders
for name in dirs:
+ if name.find(".hg") != -1:
+ continue
+
name = os.path.join(root, name).replace("\\", "/")
if name not in all_files and name not in folders:
# Remove the folder fully with no errors if full
--- a/sbsv2/raptor/test/smoke_suite/stringtable_zip_whatlog.py Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/stringtable_zip_whatlog.py Sun Dec 06 10:34:20 2009 +0000
@@ -25,16 +25,13 @@
markerfile = re.sub("(\\\\|\/|:|;| )", "_",
ReplaceEnvs("$(SBS_HOME)_test_smoke_suite_test_resources_simple_zip_export_archive.zip$(EPOCROOT)_epoc32_testunzip.unzipped"))
- result = CheckWhatSmokeTest.PASS
-
t = CheckWhatSmokeTest()
t.id = "0069a"
t.name = "stringtable_zip_whatlog"
t.command = "sbs -b smoke_suite/test_resources/simple_stringtable/bld.inf -b smoke_suite/test_resources/simple_zip_export/bld.inf -f - -m ${SBSMAKEFILE} -c armv5_udeb.whatlog EXPORT"
componentpath1 = re.sub(r'\\','/',os.path.abspath("smoke_suite/test_resources/simple_stringtable"))
componentpath2 = re.sub(r'\\','/',os.path.abspath("smoke_suite/test_resources/simple_zip_export"))
- t.regexlinefilter = \
- re.compile("^<(whatlog|archive|stringtable>|archive|member>|zipmarker>)")
+ t.regexlinefilter = re.compile("^<(whatlog|archive|stringtable>|member>|zipmarker>)")
t.hostossensitive = False
t.usebash = True
t.targets = [
@@ -43,6 +40,7 @@
"$(EPOCROOT)/epoc32/testunzip/archive/archivefile2.txt",
"$(EPOCROOT)/epoc32/testunzip/archive/archivefile3.txt",
"$(EPOCROOT)/epoc32/testunzip/archive/archivefile4.txt",
+ "$(EPOCROOT)/epoc32/testunzip/archive/archivefilelinuxbin",
"$(EPOCROOT)/epoc32/build/" + markerfile
]
t.addbuildtargets('smoke_suite/test_resources/simple_stringtable/bld.inf', [
@@ -59,24 +57,18 @@
"<member>$(EPOCROOT)/epoc32/testunzip/archive/archivefile2.txt</member>",
"<member>$(EPOCROOT)/epoc32/testunzip/archive/archivefile3.txt</member>",
"<member>$(EPOCROOT)/epoc32/testunzip/archive/archivefile4.txt</member>",
+ "<member>$(EPOCROOT)/epoc32/testunzip/archive/archivefilelinuxbin</member>",
"<zipmarker>$(EPOCROOT)/epoc32/build/" + markerfile + "</zipmarker>"
]
t.run()
- if t.result == CheckWhatSmokeTest.FAIL:
- result = CheckWhatSmokeTest.FAIL
-
"Tests to check that up-to-date zip exports are reported"
t.id = "0069b"
t.name = "stringtable_zip_whatlog_rebuild"
t.targets = []
t.run()
- if t.result == CheckWhatSmokeTest.FAIL:
- result = CheckWhatSmokeTest.FAIL
-
t.id = "69"
t.name = "stringtable_zip_whatlog"
- t.result = result
t.print_result()
return t
Binary file sbsv2/raptor/test/smoke_suite/test_resources/simple_zip_export/archive.zip has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_featurevariant/traces/OstTraceDefinitions.h Sun Dec 06 10:34:20 2009 +0000
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+// #define OST_TRACE_COMPILER_IN_USE
+#include <OpenSystemTrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/multiple_variants/traces/OstTraceDefinitions.h Sun Dec 06 10:34:20 2009 +0000
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+// #define OST_TRACE_COMPILER_IN_USE
+#include <OpenSystemTrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child1_exe/OstTraceDefinitions.h Sun Dec 06 10:34:20 2009 +0000
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+// #define OST_TRACE_COMPILER_IN_USE
+#include <OpenSystemTrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child2_exe/OstTraceDefinitions.h Sun Dec 06 10:34:20 2009 +0000
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+// #define OST_TRACE_COMPILER_IN_USE
+#include <OpenSystemTrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child3_exe/OstTraceDefinitions.h Sun Dec 06 10:34:20 2009 +0000
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+// #define OST_TRACE_COMPILER_IN_USE
+#include <OpenSystemTrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/traces/OstTraceDefinitions.h Sun Dec 06 10:34:20 2009 +0000
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+// #define OST_TRACE_COMPILER_IN_USE
+#include <OpenSystemTrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/variant_source/traces/OstTraceDefinitions.h Sun Dec 06 10:34:20 2009 +0000
@@ -0,0 +1,7 @@
+#ifndef __OSTTRACEDEFINITIONS_H__
+#define __OSTTRACEDEFINITIONS_H__
+// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
+// REMOVE BEFORE CHECK-IN TO VERSION CONTROL
+// #define OST_TRACE_COMPILER_IN_USE
+#include <OpenSystemTrace.h>
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/timing.py Sun Dec 06 10:34:20 2009 +0000
@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+from raptor_tests import SmokeTest
+
+def run():
+ t = SmokeTest()
+ t.usebash = True
+
+ t.description = "Test that a timing log is created and contains total parse and build durations"
+
+ t.id = "0103a"
+ t.name = "timing_off"
+ t.command = "sbs -b smoke_suite/test_resources/simple/bld.inf -f-"
+ t.mustnotmatch = [
+ ".*progress:discovery.*",
+ ".*progress:start.*",
+ ".*progress:end.*"
+ ]
+ t.run()
+
+
+ t.id = "0103b"
+ t.name = "timing_on"
+ t.command = "sbs -b smoke_suite/test_resources/simple/bld.inf --timing " + \
+ "--filters=FilterLogfile,FilterTiming -f ${SBSLOGFILE} && " + \
+ "grep progress:duration ${SBSLOGFILE}.timings"
+ t.mustmatch = [
+ "^<progress:duration object_type='layer' task='parse' key='.*' duration='\d+.\d+' />$",
+ "^<progress:duration object_type='layer' task='build' key='.*' duration='\d+.\d+' />$",
+ "^<progress:duration object_type='all' task='all' key='all' duration='\d+.\d+' />$"
+ ]
+ t.mustnotmatch = []
+ t.run()
+
+
+ t.id = "103"
+ t.name = "timing"
+ t.print_result()
+
+ return t
+
--- a/sbsv2/raptor/test/smoke_suite/user_tools.py Sun Dec 06 08:59:11 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-import os
-import sys
-from raptor_tests import SmokeTest
-
-def run():
-
- t = SmokeTest()
- t.id = "86"
- t.name = "user_tools"
-
- if sys.platform.lower().startswith("win"):
- result = SmokeTest.PASS
- t.logfileOption = lambda :""
- t.makefileOption = lambda :""
- t.description = "Tests that Raptor picks up SBS_PYTHON, SBS_CYGWIN " \
- + "and SBS_MINGW from the environment when present"
-
-
- t.id = "0086a"
- t.name = "user_python"
- t.environ['SBS_PYTHON'] = "C:/pyt*hon"
-
- t.command = "sbs -b smoke_suite/test_resources/simple/bld.inf -c armv5_urel" \
- + " -n --toolcheck off -f " + t.logfile() + " -m " + t.makefile()
-
- t.mustmatch = [
- "'C:/pyt\*hon' is not recognized as an internal or external command,",
- "operable program or batch file."
- ]
- t.returncode = 9009
- t.run()
- if t.result == SmokeTest.FAIL:
- result = SmokeTest.FAIL
-
-
- t.id = "0086b"
- t.name = "user_cygwin"
- t.environ = {}
- t.environ['SBS_CYGWIN'] = "C:/cygwin"
-
- t.command = "sbs -b smoke_suite/test_resources/simple/bld.inf -c armv5_urel" \
- + " -n --toolcheck off -f " + t.logfile() + " -m " + t.makefile() \
- + " && $(__CYGWIN__)/bin/grep.exe -ir 'TALON_SHELL:=C:/cygwin/bin/sh.exe' " + t.makefile() + "_all.default"
-
- t.mustmatch = [
- "TALON_SHELL:=C:/cygwin/bin/sh.exe"
- ]
- t.returncode = 0
- t.run()
- if t.result == SmokeTest.FAIL:
- result = SmokeTest.FAIL
-
-
- t.id = "0086c"
- t.name = "user_mingw"
- t.environ = {}
- t.environ['SBS_MINGW'] = "C:/mingw"
-
- t.command = "sbs -b smoke_suite/test_resources/simple/bld.inf -c armv5_urel" \
- + " -n --toolcheck off -f " + t.logfile() + " -m " + t.makefile()
-
- t.mustmatch = [
- "sbs: error: Preprocessor exception: \[Error 3\] The system cannot find the path specified"
- ]
-
- t.errors = 1
- t.returncode = 1
-
- t.run()
- if t.result == SmokeTest.FAIL:
- result = SmokeTest.FAIL
-
- t.id = "86"
- t.name = "user_tools"
- t.result = result
- t.print_result()
-
- else:
- t.run("windows")
-
-
- return t
--- a/sbsv2/raptor/test/smoke_suite/zip_export_plus_clean.py Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/zip_export_plus_clean.py Sun Dec 06 10:34:20 2009 +0000
@@ -21,9 +21,8 @@
markerfile = re.sub("(\\\\|\/|:|;| )", "_",
ReplaceEnvs("$(SBS_HOME)_test_smoke_suite_test_resources_simple_zip_export_archive.zip$(EPOCROOT)_epoc32_testunzip.unzipped"))
- result = SmokeTest.PASS
+ t = SmokeTest()
- t = SmokeTest()
t.id = "0024a"
t.name = "zip_export"
t.command = "sbs -b smoke_suite/test_resources/simple_zip_export/bld.inf"
@@ -32,32 +31,34 @@
"$(EPOCROOT)/epoc32/testunzip/archive/archivefile2.txt",
"$(EPOCROOT)/epoc32/testunzip/archive/archivefile3.txt",
"$(EPOCROOT)/epoc32/testunzip/archive/archivefile4.txt",
+ "$(EPOCROOT)/epoc32/testunzip/archive/archivefilelinuxbin",
"$(EPOCROOT)/epoc32/build/" + markerfile
]
t.run()
- if t.result == SmokeTest.FAIL:
- result = SmokeTest.FAIL
-
+
+ t.id = "0024aa"
+ t.name = "zip_export_execute_permissions"
+ t.usebash = True
+ t.targets = []
+ t.command = "ls -l $(EPOCROOT)/epoc32/testunzip/archive/archivefilelinuxbin"
+ t.mustmatch = ["-[rw-]{2}x[rw-]{2}x[rw-]{2}x"]
+ t.run("linux")
t = AntiTargetSmokeTest()
t.id = "0024b"
t.name = "zip_export_reallyclean"
- t.command = "sbs -b smoke_suite/test_resources/simple_zip_export/bld.inf " \
- + "REALLYCLEAN"
+ t.command = "sbs -b smoke_suite/test_resources/simple_zip_export/bld.inf REALLYCLEAN"
t.antitargets = [
"$(EPOCROOT)/epoc32/testunzip/archive/archivefile1.txt",
"$(EPOCROOT)/epoc32/testunzip/archive/archivefile2.txt",
"$(EPOCROOT)/epoc32/testunzip/archive/archivefile3.txt",
"$(EPOCROOT)/epoc32/testunzip/archive/archivefile4.txt",
+ "$(EPOCROOT)/epoc32/testunzip/archive/archivefilelinuxbin",
"$(EPOCROOT)/epoc32/build/" + markerfile
]
t.run()
- if t.result == SmokeTest.FAIL:
- result = SmokeTest.FAIL
-
t.id = "24"
t.name = "zip_export_plus_clean"
- t.result = result
t.print_result()
return t
--- a/sbsv2/raptor/test/smoke_suite/zip_export_what.py Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/zip_export_what.py Sun Dec 06 10:34:20 2009 +0000
@@ -30,13 +30,16 @@
'$(EPOCROOT)/epoc32/testunzip/archive/archivefile1.txt',
'$(EPOCROOT)/epoc32/testunzip/archive/archivefile2.txt',
'$(EPOCROOT)/epoc32/testunzip/archive/archivefile3.txt',
- '$(EPOCROOT)/epoc32/testunzip/archive/archivefile4.txt'
+ '$(EPOCROOT)/epoc32/testunzip/archive/archivefile4.txt',
+ "$(EPOCROOT)/epoc32/testunzip/archive/archivefilelinuxbin"
]
+
t.targets = [
'$(EPOCROOT)/epoc32/testunzip/archive/archivefile1.txt',
'$(EPOCROOT)/epoc32/testunzip/archive/archivefile2.txt',
'$(EPOCROOT)/epoc32/testunzip/archive/archivefile3.txt',
'$(EPOCROOT)/epoc32/testunzip/archive/archivefile4.txt',
+ "$(EPOCROOT)/epoc32/testunzip/archive/archivefilelinuxbin",
"$(EPOCROOT)/epoc32/build/" + markerfile
]
t.run()
--- a/sbsv2/raptor/test/unit_suite/raptor_cli_unit.py Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/test/unit_suite/raptor_cli_unit.py Sun Dec 06 10:34:20 2009 +0000
@@ -116,6 +116,10 @@
def SetExportOnly(self, yesOrNo):
self.doExportOnly = yesOrNo
return True
+
+ def SetNoExport(self, yesOrNo):
+ self.doExport = not yesOrNo
+ return True
def SetKeepGoing(self, yesOrNo):
return True
@@ -131,6 +135,9 @@
def SetToolCheck(self, toolcheck):
return True
+
+ def SetTiming(self, yesOrNo):
+ return True
def SetParallelParsing(self, onoroff):
self.pp=onoroff
--- a/sbsv2/raptor/test/unit_suite/raptor_meta_unit.py Sun Dec 06 08:59:11 2009 +0000
+++ b/sbsv2/raptor/test/unit_suite/raptor_meta_unit.py Sun Dec 06 10:34:20 2009 +0000
@@ -141,12 +141,10 @@
# Get the version of CPP that we are using and hope it's correct
# since there is no tool check.
- if raptor_utilities.getOSFileSystem() == "cygwin":
- self.__gnucpp = os.environ[raptor.env] + "/win32/bv/bin/cpp"
+ if os.environ.has_key('SBS_GNUCPP'):
+ self.__gnucpp = os.environ['SBS_GNUCPP']
else:
self.__gnucpp = "cpp"
- if os.environ.has_key('GNUCPP'):
- self.__gnucpp = os.environ['GNUCPP']
def testPreProcessor(self):
# Just test for correct behaviour on failure, other tests excercise correct behaviour on success