test: test for make_engines that are aliases referring to a sequence of variants. fix
authortimothy.murphy@nokia.com
Sun, 14 Feb 2010 21:04:58 +0200 (2010-02-14)
branchfix
changeset 207 f7f333fcfeeb
parent 206 9bc64f367d8a
child 208 432f3175b677
test: test for make_engines that are aliases referring to a sequence of variants.
sbsv2/raptor/test/custom_options/dfsconfig/.sbs_init.xml
sbsv2/raptor/test/smoke_suite/input_validation.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/custom_options/dfsconfig/.sbs_init.xml	Sun Feb 14 21:04:58 2010 +0200
@@ -0,0 +1,23 @@
+<?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">
+
+	<var name="make_changes">
+	<set name="bitmap.selector.iface" value="\.(bitmap|extension|mifconv|akniconinterfaces|removegtfiles|skingenerator|cryptoprep|builder|help_files|version_update)$"/>
+		<set name="resource.selector.iface" value="\.(resource|extension|mif2cdlindex|nativejava|genericcopy)$"/>
+   <set name="default.selector.iface" value="\.(?!export$|bitmap$|resource$|mifconv$|mif2cdlindex$|nativejava$|akniconinterfaces$|removegtfiles$|genericcopy$|skingenerator$|cryptoprep$|builder$|help_files$|version_update$).*$"/>
+    <!-- 4.5 min -->
+	  <set name='TALON_TIMEOUT' value='540000'/> 
+  </var>
+
+	<!-- emake -->
+	<alias name="emake" meaning="emake_engine.make_changes"/>  
+
+	<!-- gnu make -->
+	<alias name="make" meaning="make_engine.make_changes"/>
+	<alias name="dfstestmake" meaning="make_engine.make_changes"/>
+
+	
+</build>
--- a/sbsv2/raptor/test/smoke_suite/input_validation.py	Sun Feb 14 19:46:52 2010 +0200
+++ b/sbsv2/raptor/test/smoke_suite/input_validation.py	Sun Feb 14 21:04:58 2010 +0200
@@ -36,9 +36,21 @@
 
 	t.id = "43562b"
 	t.mustmatch = ["Unable to use make engine: 'arm' is not a build engine \(it's a variant but it does not extend 'make_engine'"]
-	t.name = "validate_makeengine_is_a_non_makenegine_variant"
+	t.name = "validate_makeengine_is_a_non_makengine_variant"
 	t.command = base_command + " -e arm"
 	t.run()
+
+	# aliases can be of the form name='blah' meaning='x.y.z'  i.e. where the alias is for a sequence of variants
+	# this tests that we detect that at least one of these variants has make_engine as a parent
+	# it is possible for one of them not to and we mustn't bomb-out just because of that
+	t.id = "43562c"
+	t.mustmatch = []
+	t.name = "validate_real_dfs_modded_makeengine_alias"
+	t.command = "export HOME=$SBS_HOME/test/custom_options/dfsconfig;  " + base_command + " -e dfstestmake -c arm.v5.urel.gcce4_4_1"
+	t.errors = 0
+	t.warnings = 0
+	t.returncode = 0
+	t.run()
 	
 	t.id = "43562"
 	t.name = "input_validation"