Mercurial Mercurial > oss > FCL > sftools > dev > build / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test changes for abiv1 kit property wip
authorRichard Taylor <richard.i.taylor@nokia.com>
Fri, 30 Apr 2010 16:52:27 +0100
branchwip
changeset 506 efe4a967495a
parent 505 ed08f3d1e6b9
child 507 54a88b895bcd
test changes for abiv1 kit property
sbsv2/raptor/lib/config/arm.xml file | annotate | diff | comparison | revisions
sbsv2/raptor/test/config/abiv1kit/os_properties.xml file | annotate | diff | comparison | revisions
sbsv2/raptor/test/smoke_suite/dll_armv5.py file | annotate | diff | comparison | revisions
sbsv2/raptor/test/smoke_suite/implib_armv5.py file | annotate | diff | comparison | revisions
sbsv2/raptor/test/smoke_suite/implib_armv5_smp.py file | annotate | diff | comparison | revisions
sbsv2/raptor/test/smoke_suite/implib_armv5_what.py file | annotate | diff | comparison | revisions
sbsv2/raptor/test/smoke_suite/implib_armv5_with_armv5_smp.py file | annotate | diff | comparison | revisions
sbsv2/raptor/test/smoke_suite/implib_nodef.py file | annotate | diff | comparison | revisions
sbsv2/raptor/test/smoke_suite/implib_whatlog.py file | annotate | diff | comparison | revisions
sbsv2/raptor/test/smoke_suite/lib_versioned.py file | annotate | diff | comparison | revisions
sbsv2/raptor/test/smoke_suite/pdll_arm.py file | annotate | diff | comparison | revisions
sbsv2/raptor/test/smoke_suite/unfrozen.py file | annotate | diff | comparison | revisions 
--- a/sbsv2/raptor/lib/config/arm.xml	Fri Apr 30 16:07:47 2010 +0100
+++ b/sbsv2/raptor/lib/config/arm.xml	Fri Apr 30 16:52:27 2010 +0100
@@ -91,6 +91,7 @@
 		<set name="STATIC_RUNTIME_DIR" value="$(EPOCROOT)/epoc32/release/armv5/$(VARIANTTYPE)"/>
 		<set name="COMPILER_FPU_DEFAULT" value="$(CC.SOFTVFP_MAYBE_VFPV2)"/>
 		<set name="POSTLINKER_FPU_DEFAULT" value="$(PL.SOFTVFP_MAYBE_VFPV2)"/>
+		<set name="SUPPORTS_ABIV1_IMPLIBS" value=""/>
 	</var>
 	<var name="v7">
 		<set name="TRADITIONAL_PLATFORM" value="ARMV7"/>
@@ -102,6 +103,7 @@
 		<set name="LINKER_ARCH_OPTION" value="$(LD.ARMV7)"/>
 		<set name="COMPILER_FPU_DEFAULT" value="$(CC.SOFTVFP_MAYBE_VFPV3)"/>
 		<set name="POSTLINKER_FPU_DEFAULT" value="$(PL.SOFTVFP_MAYBE_VFPV3)"/>
+		<set name="SUPPORTS_ABIV1_IMPLIBS" value=""/>
 	</var>
 	<var name="9e" extends="v5">
 		<set name="VARIANTPLATFORM" value="arm9e"/>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/config/abiv1kit/os_properties.xml	Fri Apr 30 16:52:27 2010 +0100
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<build xmlns="http://symbian.com/xml/build"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://symbian.com/xml/build build/2_0.xsd">
+
+  <!-- This variant modifies the root variant for this particular kit. -->
+  <var name="root.changes">
+
+    <!-- ask for ABIv1 import libraries
+    --> 
+    <set name='SUPPORTS_ABIV1_IMPLIBS' value='1'/>
+  </var>
+  
+</build>
--- a/sbsv2/raptor/test/smoke_suite/dll_armv5.py	Fri Apr 30 16:07:47 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/dll_armv5.py	Fri Apr 30 16:52:27 2010 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
 # under the terms of the License "Eclipse Public License v1.0"
@@ -19,7 +19,6 @@
 def run():
 	t = AntiTargetSmokeTest()
 	t.usebash = True
-	result = AntiTargetSmokeTest.PASS
 	
 	command = "sbs -b smoke_suite/test_resources/simple_dll/bld.inf -c %s -f-"
 	maintargets = [
@@ -47,7 +46,7 @@
 		]
 	
 	# Note that ABIv1 import libraries are only generated for RVCT-based armv5
-	# builds on Windows
+	# builds on Windows if the kit asks for it (off by default)
 	
 	t.id = "0009a"
 	t.name = "dll_armv5_rvct"
@@ -56,24 +55,23 @@
 	t.addbuildtargets('smoke_suite/test_resources/simple_dll/bld.inf', buildtargets)
 	t.mustmatch = mustmatch
 	t.mustnotmatch = mustnotmatch
-	t.run("linux")
-	if t.result == AntiTargetSmokeTest.SKIP:
-		t.targets.extend(abiv1libtargets)
-		t.run("windows")
-	if t.result == AntiTargetSmokeTest.FAIL:
-		result = AntiTargetSmokeTest.FAIL
+	t.run()
+	
+	t.id = "0009b"
+	t.name = "dll_armv5_rvct_abiv1"
+	t.command += " --configpath=test/config/abiv1kit"
+	t.targets.extend(abiv1libtargets)
+	t.run("windows")
 		
-	t.id = "0009b"
+	t.id = "0009c"
 	t.name = "dll_armv5_clean"
 	t.command = "sbs -b smoke_suite/test_resources/simple_dll/bld.inf -c armv5 clean"
 	t.targets = []
 	t.mustmatch = []
 	t.mustnotmatch = []
 	t.run()	
-	if t.result == AntiTargetSmokeTest.FAIL:
-		result = AntiTargetSmokeTest.FAIL		
 		
-	t.id = "0009c"
+	t.id = "0009d"
 	t.name = "dll_armv5_gcce"
 	t.command = command % "gcce_armv5"
 	t.targets = maintargets
@@ -82,11 +80,8 @@
 	t.mustmatch = mustmatch
 	t.mustnotmatch = mustnotmatch
 	t.run()	
-	if t.result == AntiTargetSmokeTest.FAIL:
-		result = AntiTargetSmokeTest.FAIL
 	
 	t.id = "9"
 	t.name = "dll_armv5"
-	t.result = result
 	t.print_result()
 	return t
--- a/sbsv2/raptor/test/smoke_suite/implib_armv5.py	Fri Apr 30 16:07:47 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/implib_armv5.py	Fri Apr 30 16:52:27 2010 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
 # under the terms of the License "Eclipse Public License v1.0"
@@ -22,7 +22,6 @@
 	t.name = "implib_armv5"
 	t.command = "sbs -b smoke_suite/test_resources/simple_implib/bld.inf" \
 		+ " -c armv5 LIBRARY"
-	# ABIv1 .lib files are not generated on Linux
 	t.targets = [
 		"$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib.dso",
 		"$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib{000a0000}.dso"
@@ -31,13 +30,7 @@
 		['simple_implib_lib/armv5/udeb/simple_implib.prep',
                  'simple_implib_lib/armv5/urel/simple_implib.prep']
 	])
-	t.run("linux")
-	# Run test on Windows if that is the current OS
-	if t.result == SmokeTest.SKIP:
-		t.targets.extend([
-			"$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib.lib",
-			"$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib{000a0000}.lib"
-		])
-		t.run("windows")
-		
+	t.run()
+	
+	t.print_result()	
 	return t
--- a/sbsv2/raptor/test/smoke_suite/implib_armv5_smp.py	Fri Apr 30 16:07:47 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/implib_armv5_smp.py	Fri Apr 30 16:52:27 2010 +0100
@@ -27,12 +27,7 @@
 		"$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib.dso",
 		"$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib{000a0000}.dso"
 		]
-	t.run("linux")
-	if t.result == AntiTargetSmokeTest.SKIP:
-		t.antitargets = [
-			'$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib.lib',
-			'$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib{000a0000}.lib'
-		]
-		t.run("windows")
-		
+	t.run()
+	
+	t.print_result()
 	return t
--- a/sbsv2/raptor/test/smoke_suite/implib_armv5_what.py	Fri Apr 30 16:07:47 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/implib_armv5_what.py	Fri Apr 30 16:52:27 2010 +0100
@@ -22,18 +22,11 @@
 	t.name = "implib_armv5_what"
 	t.command = "sbs -b smoke_suite/test_resources/simple_implib/bld.inf -c " + \
 			"armv5 --what LIBRARY"
-	# ABIv1 .lib files are not generated on Linux
 	t.stdout = [
 		'$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib.dso',
 		'$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib{000a0000}.dso'
 	]
-	t.run("linux")
-	# Run test on Windows if that is the current OS
-	if t.result == CheckWhatSmokeTest.SKIP:
-		t.stdout.extend([
-			'$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib.lib',
-			'$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib{000a0000}.lib'
-		])
-		t.run("windows")
+	t.run()
 	
+	t.print_result()
 	return t
--- a/sbsv2/raptor/test/smoke_suite/implib_armv5_with_armv5_smp.py	Fri Apr 30 16:07:47 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/implib_armv5_with_armv5_smp.py	Fri Apr 30 16:52:27 2010 +0100
@@ -27,12 +27,7 @@
 		"$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib.dso",
 		"$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib{000a0000}.dso"
 		]
-	t.run("linux")
-	if t.result == SmokeTest.SKIP:
-		t.targets.extend([
-			"$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib.lib",
-			"$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib{000a0000}.lib"
-		])
-		t.run("windows")
-		
+	t.run()
+	
+	t.print_result()	
 	return t
--- a/sbsv2/raptor/test/smoke_suite/implib_nodef.py	Fri Apr 30 16:07:47 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/implib_nodef.py	Fri Apr 30 16:52:27 2010 +0100
@@ -28,13 +28,7 @@
 		"$(EPOCROOT)/epoc32/release/armv5/lib/implib_implicit_def{000a0000}.dso",
 		"$(EPOCROOT)/epoc32/release/winscw/udeb/implib_implicit_def.lib"
 		]
-	t.run("linux")
-	if t.result == SmokeTest.SKIP:
-		t.targets.extend([
-			"$(EPOCROOT)/epoc32/release/armv5/lib/implib_implicit_def.lib",
-			"$(EPOCROOT)/epoc32/release/armv5/lib/implib_implicit_def{000a0000}.lib"
-			])
-		t.run("windows")
+	t.run()
 
 	t.id = "71b"
 	t.name = "implib_no_def"
--- a/sbsv2/raptor/test/smoke_suite/implib_whatlog.py	Fri Apr 30 16:07:47 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/implib_whatlog.py	Fri Apr 30 16:52:27 2010 +0100
@@ -45,16 +45,7 @@
 		"<build>$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib.dso</build>",
 		"<build>$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib{000a0000}.dso</build>"
 	]
-	t.run("linux")
-	if t.result == CheckWhatSmokeTest.SKIP:
-		t.targets.extend([
-			"$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib.lib",
-			"$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib{000a0000}.lib"
-		])
-		t.stdout.extend([
-			"<build>$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib.lib</build>",
-			"<build>$(EPOCROOT)/epoc32/release/armv5/lib/simple_implib{000a0000}.lib</build>"
-		])
-		t.run("windows")
-		
+	t.run()
+	
+	t.print_result()
 	return t
--- a/sbsv2/raptor/test/smoke_suite/lib_versioned.py	Fri Apr 30 16:07:47 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/lib_versioned.py	Fri Apr 30 16:52:27 2010 +0100
@@ -49,22 +49,7 @@
 		"$(EPOCROOT)/epoc32/release/winscw/udeb/versionedlib.02.lib",
 		"$(EPOCROOT)/epoc32/release/winscw/udeb/versionedlib01.lib"
 		]
-
-	if sys.platform.lower().startswith("win"):
-		t.targets.extend (	
-		[
-		"$(EPOCROOT)/epoc32/release/armv5/lib/testver.lib",
-		"$(EPOCROOT)/epoc32/release/armv5/lib/versionedlib01.lib",
-		"$(EPOCROOT)/epoc32/release/armv5/lib/versioned.lib.03.lib",
-		"$(EPOCROOT)/epoc32/release/armv5/lib/versionedlib.02.lib",
-		"$(EPOCROOT)/epoc32/release/armv5/lib/testver{00020000}.lib",
-		"$(EPOCROOT)/epoc32/release/armv5/lib/testver{00030000}.lib",
-		"$(EPOCROOT)/epoc32/release/armv5/lib/versioned.lib{000a0000}.03.lib",
-		"$(EPOCROOT)/epoc32/release/armv5/lib/version.ed.lib.04.lib",
-		"$(EPOCROOT)/epoc32/release/armv5/lib/version.ed.lib{000a0000}.04.lib",
-		"$(EPOCROOT)/epoc32/release/armv5/lib/versionedlib01{000a0000}.lib",
-		"$(EPOCROOT)/epoc32/release/armv5/lib/versionedlib{000a0000}.02.lib"
-		] )
-		
 	t.run()
+	
+	t.print_result()
 	return t
--- a/sbsv2/raptor/test/smoke_suite/pdll_arm.py	Fri Apr 30 16:07:47 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/pdll_arm.py	Fri Apr 30 16:52:27 2010 +0100
@@ -31,10 +31,6 @@
 		"$(EPOCROOT)/epoc32/release/%s/lib/createstaticpdll.dso",
 		"$(EPOCROOT)/epoc32/release/%s/lib/createstaticpdll{000a0000}.dso"
 		]
-	abiv1libtargets = [
-		"$(EPOCROOT)/epoc32/release/%s/lib/createstaticpdll.lib",
-		"$(EPOCROOT)/epoc32/release/%s/lib/createstaticpdll{000a0000}.lib"
-		]
 	buildtargets =  [
 		"createstaticpdll_dll/%s/udeb/CreateStaticDLL.o",
 		"createstaticpdll_dll/%s/urel/CreateStaticDLL.o"
@@ -47,9 +43,6 @@
 		".*ksrt.*"
 		]
 	
-	# Note that ABIv1 import libraries are only generated for RVCT-based armv5
-	# builds on Windows
-	
 	t.id = "0109a"
 	t.name = "pdll_armv5_rvct"
 	t.command = command % "armv5"
@@ -57,10 +50,7 @@
 	t.addbuildtargets('smoke_suite/test_resources/simple_dll/pbld.inf', map(lambda p: p % "armv5", buildtargets))
 	t.mustmatch = mustmatch
 	t.mustnotmatch = mustnotmatch
-	t.run("linux")
-	if t.result == AntiTargetSmokeTest.SKIP:
-		t.targets.extend(map(lambda x: x % "armv5", abiv1libtargets))
-		t.run("windows")
+	t.run()
 		
 	t.id = "0109b"
 	t.name = "pdll_armv5_clean"
@@ -74,7 +64,6 @@
 	t.name = "pdll_armv5_gcce"
 	t.command = command % "gcce_armv5"
 	t.targets = map(lambda p: p % "armv5", maintargets + armv5targets)
-	t.antitargets = map(lambda p: p % "armv5", abiv1libtargets)
 	t.addbuildtargets('smoke_suite/test_resources/simple_dll/pbld.inf', map(lambda p: p % "armv5", buildtargets))
 	t.mustmatch = mustmatch
 	t.mustnotmatch = mustnotmatch
@@ -109,7 +98,6 @@
 	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)
-	t.antitargets = map(lambda p: p % "armv7", abiv1libtargets)
 	t.addbuildtargets('smoke_suite/test_resources/simple_dll/pbld.inf', map(lambda p: p % "armv7", buildtargets))
 	t.mustmatch = mustmatch
 	t.mustnotmatch = mustnotmatch
--- a/sbsv2/raptor/test/smoke_suite/unfrozen.py	Fri Apr 30 16:07:47 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/unfrozen.py	Fri Apr 30 16:52:27 2010 +0100
@@ -156,14 +156,7 @@
 				]
 	t.warnings = 8
 	# ABIv1 .lib files are not generated on Linux
-	t.run("linux")
-	if t.result == SmokeTest.SKIP:
-		t.targets.extend([
-			"$(EPOCROOT)/epoc32/release/armv5/lib/unfrozensymbols.lib",
-			"$(EPOCROOT)/epoc32/release/armv5/lib/unfrozensymbols{000a0000}.lib",
-			"$(EPOCROOT)/epoc32/release/armv5/lib/unfrozensymbols2.lib",
-			"$(EPOCROOT)/epoc32/release/armv5/lib/unfrozensymbols2{000a0000}.lib"
-			])
-		t.run("windows")
+	t.run()
 	
+	t.print_result()
 	return t
FCL/sftools/dev/build