--- a/sbsv2/raptor/RELEASE-NOTES.txt Tue Feb 09 05:20:29 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt Wed Feb 10 01:13:10 2010 +0200
@@ -5,6 +5,8 @@
Defect Fixes:
- SF Bug 1569 - excessive recompilation in incremental tracecompiler builds
- Better error messages for make-engine selection. e.g. "sbs -e arm" will now produce a useful error message rather than a traceback. "arm" is a real variant but it's not a make engine. In the past sbs would have tried to use it and would have failed with a complicated traceback. Also doesn't traceback for non-existent make engines.
+- sbs_filter chose wrong embedded default python version. Set to 2.6.4 now.
+- FilterCheck did not check files when run from sbs_filter
version 2.12.1
--- a/sbsv2/raptor/bin/sbs_filter Tue Feb 09 05:20:29 2010 +0000
+++ b/sbsv2/raptor/bin/sbs_filter Wed Feb 10 01:13:10 2010 +0200
@@ -45,8 +45,8 @@
__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}
+ __PYTHON__=${SBS_PYTHON:-$SBS_HOME/$HOSTPLATFORM_DIR/python264/python.exe}
+ export PYTHONPATH=${SBS_PYTHONPATH:-$SBS_HOME/$HOSTPLATFORM_DIR/python264}
# Command for unifying path strings. For example, "c:\some\path" and
# "/cygdrive/c/some/path" will both be converted into "c:/some/path".
--- a/sbsv2/raptor/python/plugins/filter_what.py Tue Feb 09 05:20:29 2010 +0000
+++ b/sbsv2/raptor/python/plugins/filter_what.py Wed Feb 10 01:13:10 2010 +0200
@@ -26,6 +26,7 @@
super(filter_interface.Filter,self).__init__()
self.path_prefix_to_strip = None
self.path_prefix_to_add_on = None
+ self.check = False
def print_file(self, line, start, end):
"Ensure DOS slashes on Windows"
@@ -64,7 +65,8 @@
"initialise"
self.buildparameters = build_parameters
- self.check = build_parameters.doCheck
+ if build_parameters.doCheck:
+ self.check = True
self.what = build_parameters.doWhat
self.outfile = sys.stdout
--- a/sbsv2/raptor/test/smoke_suite/exe_armv5.py Tue Feb 09 05:20:29 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/exe_armv5.py Wed Feb 10 01:13:10 2010 +0200
@@ -117,6 +117,17 @@
if t.result == SmokeTest.FAIL:
result = SmokeTest.FAIL
+ t.id = "0001d"
+ t.command = "rm $(EPOCROOT)/epoc32/release/armv5/udeb/test.exe.map; sbs_filter --filters=FilterCheck < ${SBSLOGFILE}"
+ t.targets = []
+ t.mustmatch = ["MISSING"]
+ t.mustnotmatch = []
+ t.warnings = 1
+ t.returncode = 2
+ t.run()
+
+ if t.result == SmokeTest.FAIL:
+ result = SmokeTest.FAIL
t.id = "1"
t.name = "exe_armv5"
t.result = result