--- a/sbsv2/raptor/lib/flm/tools2common.flm Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/lib/flm/tools2common.flm Wed Dec 02 00:21:12 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 Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/lib/flm/tools2exe.flm Wed Dec 02 00:21:12 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 Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/lib/flm/tools2lib.flm Wed Dec 02 00:21:12 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 Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/python/filter_utils.py Wed Dec 02 00:21:12 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 Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/python/plugins/filter_carbide.py Wed Dec 02 00:21:12 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 Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/python/plugins/filter_checksource.py Wed Dec 02 00:21:12 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 Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/python/plugins/filter_logfile.py Wed Dec 02 00:21:12 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 Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/python/plugins/filter_splitlog.py Wed Dec 02 00:21:12 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
--- a/sbsv2/raptor/python/raptor.py Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/python/raptor.py Wed Dec 02 00:21:12 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 Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/python/raptor_cli.py Wed Dec 02 00:21:12 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 Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/python/raptor_make.py Wed Dec 02 00:21:12 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 Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/python/raptor_meta.py Wed Dec 02 00:21:12 2009 +0000
@@ -2652,8 +2652,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 +2930,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
--- a/sbsv2/raptor/python/raptor_xml.py Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/python/raptor_xml.py Wed Dec 02 00:21:12 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/smoke_suite/stringtable_zip_whatlog.py Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/stringtable_zip_whatlog.py Wed Dec 02 00:21:12 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 Wed Dec 02 00:21:12 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 Wed Dec 02 00:21:12 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 Wed Dec 02 00:21:12 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 Wed Dec 02 00:21:12 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 Wed Dec 02 00:21:12 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 Wed Dec 02 00:21:12 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 Wed Dec 02 00:21:12 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
--- a/sbsv2/raptor/test/smoke_suite/zip_export_plus_clean.py Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/zip_export_plus_clean.py Wed Dec 02 00:21:12 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 Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/zip_export_what.py Wed Dec 02 00:21:12 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 Tue Dec 01 23:06:30 2009 +0000
+++ b/sbsv2/raptor/test/unit_suite/raptor_cli_unit.py Wed Dec 02 00:21:12 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