# HG changeset patch
# User yiluzhu
# Date 1264517360 0
# Node ID a4bc95a3b539ec63e7cee08d7f2be9400050ab55
# Parent  abc1aa76870fbee0491075a8ec3c20bc38d69e22# Parent  49da1e705345845a1da2c0a746f3bb09a8d4fef6
Merge

diff -r 49da1e705345 -r a4bc95a3b539 sbsv2/raptor/test/smoke_suite/tools2_cross_compilation.py
--- a/sbsv2/raptor/test/smoke_suite/tools2_cross_compilation.py	Tue Jan 26 14:44:35 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/tools2_cross_compilation.py	Tue Jan 26 14:49:20 2010 +0000
@@ -20,7 +20,7 @@
 	t = SmokeTest()	
 	t.description = "Tests Raptor can build win32 tools on linux"
 
-	t.id = "105a"
+	t.id = "111a"
 	t.name = "tools2_cross_compilation_pdrtran" 
 	t.command = "sbs -b smoke_suite/test_resources/tools2/pdrtran/BLD.INF -c tools2 -c tools2.win32"
 
@@ -65,7 +65,7 @@
 	t.run("linux")
 
 	
-	t.id = "105b"
+	t.id = "111b"
 	t.name = "tools2_cross_compilation_libs"
 	t.command = "sbs -b smoke_suite/test_resources/tools2/bld.inf -c tools2.win32 -c tools2"
 
@@ -115,7 +115,7 @@
 
 
 	t.usebash = True
-	t.id = "105c"
+	t.id = "111c"
 	t.name = "tools2_cross_compilation_toolcheck_linux"
 	t.command = "$(EPOCROOT)/epoc32/tools/pdrtran smoke_suite/test_resources/tools2/pdrtran/TEST.PD $(EPOCROOT)/epoc32/build/TEST_PDRTRAN.PDR"
 	t.targets = [
@@ -127,7 +127,7 @@
 	t.run("linux")
 
 	
-	t.id = "105d"
+	t.id = "111d"
 	t.name = "tools2_cross_compilation_toolcheck_windows"
 	t.command = "file $(EPOCROOT)/epoc32/tools/pdrtran.exe"
 	t.targets = []
@@ -137,7 +137,7 @@
 	t.run("linux")
 
 
-	t.id = "105"
+	t.id = "111"
 	t.name = "tools2_cross_compilation"
 	t.print_result()
 	return t