--- a/sbsv2/raptor/test/smoke_suite/romfile.py	Tue Nov 02 16:54:53 2010 +0800
+++ b/sbsv2/raptor/test/smoke_suite/romfile.py	Fri Nov 12 14:49:36 2010 +0000
@@ -39,8 +39,8 @@
 	
 	t.targets = [
 		"$(EPOCROOT)/epoc32/rom/src/ongoing/group/romfile/armv5test.iby",
-		"$(EPOCROOT)/epoc32/data/z/test/src/armv5.auto.bat",
-		"$(EPOCROOT)/epoc32/data/z/test/src/armv5.manual.bat"
+		"$(EPOCROOT)/epoc32/data/z/test/src_ongoing_romfile/armv5.auto.bat",
+		"$(EPOCROOT)/epoc32/data/z/test/src_ongoing_romfile/armv5.manual.bat"
 		]
 
 	# Check the content of the generated .iby file.
@@ -49,8 +49,8 @@
 		r".*// epoc32/rom/src/ongoing/group/romfile/armv5test\.iby\n.*",
 
 		# The batch files that are added by the build system.
-		r".*\ndata=/epoc32/data/z/test/src/armv5\.auto\.bat test/src\.auto\.bat\n.*",
-		r".*\ndata=/epoc32/data/z/test/src/armv5\.manual\.bat test/src\.manual\.bat\n.*",
+		r".*\ndata=/epoc32/data/z/test/src_ongoing_romfile/armv5\.auto\.bat test/armv5\.auto\.bat\n.*",
+		r".*\ndata=/epoc32/data/z/test/src_ongoing_romfile/armv5\.manual\.bat test/armv5\.manual\.bat\n.*",
 
 		# Some normal files.
 		r".*\nfile=/epoc32/release/##MAIN##/##BUILD##/t_rand\.exe\s+sys/bin/t_rand\.exe\n.*",
@@ -86,8 +86,8 @@
 	t.mustmatch = [
 		# Check whatlog output includes batch files and .iby file
 		r".*/epoc32/rom/src/ongoing/group/romfile/armv5test.iby</build>.*",
-		r".*/epoc32/data/z/test/src/armv5.auto.bat</build>.*",
-		r".*/epoc32/data/z/test/src/armv5.manual.bat</build>.*"
+		r".*/epoc32/data/z/test/src_ongoing_romfile/armv5.auto.bat</build>.*",
+		r".*/epoc32/data/z/test/src_ongoing_romfile/armv5.manual.bat</build>.*"
 		]
 	t.mustnotmatch = []
 	t.run()