--- a/sbsv2/raptor/python/raptor_data.py Sat Feb 06 22:42:29 2010 +0000
+++ b/sbsv2/raptor/python/raptor_data.py Mon Feb 08 22:47:19 2010 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-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"
--- a/sbsv2/raptor/python/raptor_make.py Sat Feb 06 22:42:29 2010 +0000
+++ b/sbsv2/raptor/python/raptor_make.py Mon Feb 08 22:47:19 2010 +0200
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-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"
--- a/sbsv2/raptor/test/smoke_suite/input_validation.py Sat Feb 06 22:42:29 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/input_validation.py Mon Feb 08 22:47:19 2010 +0200
@@ -20,7 +20,6 @@
t = SmokeTest()
t.description = "Set of tests for commandline option validation e.g. checking that the specified make engine exists"
- t.mustmatch = ["Unable to use make engine: 'amakeenginethatdoesnotexist' does not appear to be a make engine - no settings found for it"]
t.usebash = True
t.errors = 1
@@ -28,19 +27,20 @@
t.exceptions = 0
base_command = "sbs -b smoke_suite/test_resources/simple/bld.inf -f ${SBSLOGFILE} -m ${SBSMAKEFILE}"
- t.id = "114a"
+ t.id = "42562a"
t.name = "validate_makeengine_nonexist"
t.command = base_command + " -e amakeenginethatdoesnotexist"
+ t.mustmatch = ["Unable to use make engine: 'amakeenginethatdoesnotexist' does not appear to be a make engine - no settings found for it"]
t.run()
- t.id = "114b"
+ 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.command = base_command + " -e arm"
t.run()
- t.id = "114"
+ t.id = "43562"
t.name = "input_validation"
t.print_result()
return t