# HG changeset patch
# User timothy.murphy@nokia.com
# Date 1265982069 -7200
# Node ID ce7b587b436cfd93604d8b5caa5cc87f3cfc8258
# Parent  a19456c0778379f9ea79ce3cb66199db62f13cdc
fix: filterwhatcomp and filtercheckcomp - correctly strip absolute directory and replace with EPOCROOT on windows.

diff -r a19456c07783 -r ce7b587b436c sbsv2/raptor/python/plugins/filter_what.py
--- a/sbsv2/raptor/python/plugins/filter_what.py	Fri Feb 12 14:57:02 2010 +0200
+++ b/sbsv2/raptor/python/plugins/filter_what.py	Fri Feb 12 15:41:09 2010 +0200
@@ -36,9 +36,9 @@
 				actually starts at 'start + 1' """
 
 		abs_filename = line[(start + 1):end]
-		filename = abs_filename.replace("/","\\")
+		filename = abs_filename
 
-		# Hack drive letters for case insensitivity on windows
+		# Adjust drive letters for case insensitivity on windows
 
 		path_prefix_to_strip = self.path_prefix_to_strip
 		if "win" in self.buildparameters.platform:
@@ -47,7 +47,7 @@
 
 		if path_prefix_to_strip:
 			if "win" in self.buildparameters.platform:
-				path_prefix_to_strip = path_prefix_to_strip[0].upper()+path_prefix_to_strip[1:]
+				path_prefix_to_strip = path_prefix_to_strip[0].upper()+path_prefix_to_strip[1:].replace("/","\\")
 			if filename.startswith(path_prefix_to_strip):
 				filename = filename[len(path_prefix_to_strip):]
 			if self.path_prefix_to_add_on != None:
diff -r a19456c07783 -r ce7b587b436c sbsv2/raptor/test/smoke_suite/exe_armv5.py
--- a/sbsv2/raptor/test/smoke_suite/exe_armv5.py	Fri Feb 12 14:57:02 2010 +0200
+++ b/sbsv2/raptor/test/smoke_suite/exe_armv5.py	Fri Feb 12 15:41:09 2010 +0200
@@ -104,7 +104,8 @@
 	t.run()	
 	if t.result == SmokeTest.FAIL:
 		result = SmokeTest.FAIL	
-		
+	
+
 	t.id = "0001c"
 	t.name = "exe_armv5_gcce"
 	t.command = command % "gcce_armv5"
@@ -117,10 +118,12 @@
 	if t.result == SmokeTest.FAIL:
 		result = SmokeTest.FAIL	
 
+	import os
+	abs_epocroot = os.path.abspath(os.environ["EPOCROOT"])
 	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.mustmatch = ["MISSING: *" + abs_epocroot + ".epoc32.release.armv5.udeb.test\.exe\.map"]
 	t.mustnotmatch = []
 	t.warnings = 1
 	t.returncode = 2