# HG changeset patch
# User Iain Williamson <iain.williamson@nokia.com>
# Date 1260813423 0
# Node ID b806641dda89f21e867881ac940abb6c29271775
# Parent  2c3a3c79b512eb0f0c96e8a0c522cce714bda5d1
Adding test ids.  Fixing pdll test code to use its own def files.

diff -r 2c3a3c79b512 -r b806641dda89 sbsv2/raptor/test/smoke_suite/pdll_arm.py
--- a/sbsv2/raptor/test/smoke_suite/pdll_arm.py	Fri Dec 11 17:29:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/pdll_arm.py	Mon Dec 14 17:57:03 2009 +0000
@@ -50,7 +50,7 @@
 	# Note that ABIv1 import libraries are only generated for RVCT-based armv5
 	# builds on Windows
 	
-	t.id = "000xa"
+	t.id = "0104a"
 	t.name = "pdll_armv5_rvct"
 	t.command = command % "armv5"
 	t.targets = map(lambda p: p % "armv5", maintargets + armv5targets)[:]	# Shallow, as we optionally extend later and then re-use
@@ -62,7 +62,7 @@
 		t.targets.extend(map(lambda x: x % "armv5", abiv1libtargets))
 		t.run("windows")
 		
-	t.id = "000xb"
+	t.id = "0104b"
 	t.name = "pdll_armv5_clean"
 	t.command = command % "armv5" + " clean"
 	t.targets = []
@@ -70,7 +70,7 @@
 	t.mustnotmatch = []
 	t.run()
 	
-	t.id = "000xc"
+	t.id = "0104c"
 	t.name = "pdll_armv5_gcce"
 	t.command = command % "gcce_armv5"
 	t.targets = map(lambda p: p % "armv5", maintargets + armv5targets)
@@ -80,15 +80,15 @@
 	t.mustnotmatch = mustnotmatch
 	t.run()
 
-	t.id = "000xd"
+	t.id = "0104d"
 	t.name = "pdll_armv5_gcce_clean"
-	t.command = command % "gcce_armv5" + "clean"
+	t.command = command % "gcce_armv5" + " clean"
 	t.targets = []
 	t.mustmatch = []
 	t.mustnotmatch = []
 	t.run()
 
-	t.id = "000xe"
+	t.id = "0104e"
 	t.name = "pdll_armv7_rvct"
 	t.command = command % "armv7"
 	t.targets = map(lambda p: p % "armv7", maintargets)[:]	# Shallow, as we optionally extend later and then re-use
@@ -97,7 +97,7 @@
 	t.mustnotmatch = mustnotmatch
 	t.run()
 	
-	t.id = "000xf"
+	t.id = "0104f"
 	t.name = "pdll_armv7_clean"
 	t.command = command % "armv7" + " clean"
 	t.targets = []
@@ -105,7 +105,7 @@
 	t.mustnotmatch = []
 	t.run()
 	
-	t.id = "000xg"
+	t.id = "0104g"
 	t.name = "pdll_armv7_gcce"
 	t.command = command % "arm.v7.udeb.gcce4_3_2 -c arm.v7.urel.gcce4_3_2"
 	t.targets = map(lambda p: p % "armv7", maintargets)
@@ -115,7 +115,7 @@
 	t.mustnotmatch = mustnotmatch
 	t.run()
 
-	t.id = "x"
+	t.id = "104"
 	t.name = "pdll_arm"
 	t.print_result()
 	return t
diff -r 2c3a3c79b512 -r b806641dda89 sbsv2/raptor/test/smoke_suite/pdll_winscw.py
--- a/sbsv2/raptor/test/smoke_suite/pdll_winscw.py	Fri Dec 11 17:29:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/pdll_winscw.py	Mon Dec 14 17:57:03 2009 +0000
@@ -18,7 +18,7 @@
 
 def run():
 	t = SmokeTest()
-	t.id = "y"
+	t.id = "105"
 	t.name = "pdll_winscw"
 	t.command = "sbs -b smoke_suite/test_resources/simple_dll/pbld.inf -c winscw"
 	t.targets = [
diff -r 2c3a3c79b512 -r b806641dda89 sbsv2/raptor/test/smoke_suite/test_resources/simple_dll/CREATESTATICPDLLARM.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/simple_dll/CREATESTATICPDLLARM.def	Mon Dec 14 17:57:03 2009 +0000
@@ -0,0 +1,6 @@
+EXPORTS
+	_ZN10CMessenger11ShowMessageEv @ 1 NONAME
+	_ZN10CMessenger5NewLCER12CConsoleBaseRK7TDesC16 @ 2 NONAME
+	_ZTI10CMessenger @ 3 NONAME
+	_ZTV10CMessenger @ 4 NONAME
+
diff -r 2c3a3c79b512 -r b806641dda89 sbsv2/raptor/test/smoke_suite/test_resources/simple_dll/CREATESTATICPDLLWINS.def
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/simple_dll/CREATESTATICPDLLWINS.def	Mon Dec 14 17:57:03 2009 +0000
@@ -0,0 +1,4 @@
+EXPORTS
+	?ShowMessage@CMessenger@@QAEXXZ @ 1 NONAME ; ?ShowMessage@CMessenger@@QAEXXZ
+	?NewLC@CMessenger@@SAPAV1@AAVCConsoleBase@@ABVTDesC16@@@Z @ 2 NONAME ; ?NewLC@CMessenger@@SAPAV1@AAVCConsoleBase@@ABVTDesC16@@@Z
+
diff -r 2c3a3c79b512 -r b806641dda89 sbsv2/raptor/test/smoke_suite/test_resources/simple_dll/CreateStaticPDLL.mmp
--- a/sbsv2/raptor/test/smoke_suite/test_resources/simple_dll/CreateStaticPDLL.mmp	Fri Dec 11 17:29:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/simple_dll/CreateStaticPDLL.mmp	Mon Dec 14 17:57:03 2009 +0000
@@ -40,9 +40,9 @@
 LIBRARY       euser.lib
 
 #if defined(WINS)
-    deffile ./CREATESTATICDLLWINS.def
+    deffile ./CREATESTATICPDLLWINS.def
 #elif defined(MARM)
-    deffile ./CREATESTATICDLLARM.def
+    deffile ./CREATESTATICPDLLARM.def
 #endif
 nostrictdef