Renumbering commandline, pdll_arm and toolchain_macro tests to avoid duplicates.
Renaming qt_helloworld, commandline and whatcomp to match the test and file names.
Allocating ids to qt_helloworld and apply_usecases.
Fixing typo in commandline test and enabling it so it actually runs.
--- a/sbsv2/raptor/test/smoke_suite/apply_usecases.py Mon Jan 25 11:43:34 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/apply_usecases.py Mon Jan 25 17:17:52 2010 +0000
@@ -22,7 +22,7 @@
t.usebash = True
# Introduce LINKER_OPTIONS for tools2 linker
- t.id = "xx"
+ t.id = "0108"
t.name = "apply_linker_options"
t.command = "sbs -b smoke_suite/test_resources/apply_usecases/linker_options/bld.inf -c tools2 -f -"
t.targets = [
--- a/sbsv2/raptor/test/smoke_suite/commandline.py Mon Jan 25 11:43:34 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/commandline.py Mon Jan 25 17:17:52 2010 +0000
@@ -4,7 +4,7 @@
def run():
t = SmokeTest()
- t.id = "91a"
+ t.id = "85a"
t.name = "commandline_nodefaults"
t.description = """Test that raptor complains if you run it without specifying any components and there is no default bld.inf or system definition in the current directory."""
t.usebash = True
@@ -13,9 +13,12 @@
TMPDIR="build/commandline_testdefaults";
cd $(EPOCROOT)/epoc32 && rm -rf "$TMPDIR" 2>/dev/null; mkdir -p "$TMPDIR" && cd "$TMPDIR" &&
sbs ${SBSLOGFILE} -n ; rm -rf "$TMPDIR"
-m """
+ """
t.mustmatch = [".*warning: No default bld.inf or system definition.*found.* "]
t.warnings = 1
- t.result = t.run()
+ t.run()
+
+ t.id = "0085"
+ t.name = "commandline"
return t
--- a/sbsv2/raptor/test/smoke_suite/pdll_arm.py Mon Jan 25 11:43:34 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/pdll_arm.py Mon Jan 25 17:17:52 2010 +0000
@@ -50,7 +50,7 @@
# Note that ABIv1 import libraries are only generated for RVCT-based armv5
# builds on Windows
- t.id = "0104a"
+ t.id = "0109a"
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 = "0104b"
+ t.id = "0109b"
t.name = "pdll_armv5_clean"
t.command = command % "armv5" + " clean"
t.targets = []
@@ -70,7 +70,7 @@
t.mustnotmatch = []
t.run()
- t.id = "0104c"
+ t.id = "0109c"
t.name = "pdll_armv5_gcce"
t.command = command % "gcce_armv5"
t.targets = map(lambda p: p % "armv5", maintargets + armv5targets)
@@ -80,7 +80,7 @@
t.mustnotmatch = mustnotmatch
t.run()
- t.id = "0104d"
+ t.id = "0109d"
t.name = "pdll_armv5_gcce_clean"
t.command = command % "gcce_armv5" + " clean"
t.targets = []
@@ -88,7 +88,7 @@
t.mustnotmatch = []
t.run()
- t.id = "0104e"
+ t.id = "0109e"
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 = "0104f"
+ t.id = "0109f"
t.name = "pdll_armv7_clean"
t.command = command % "armv7" + " clean"
t.targets = []
@@ -105,7 +105,7 @@
t.mustnotmatch = []
t.run()
- t.id = "0104g"
+ t.id = "0109g"
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 = "104"
+ t.id = "109"
t.name = "pdll_arm"
t.print_result()
return t
--- a/sbsv2/raptor/test/smoke_suite/qt.py Mon Jan 25 11:43:34 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2009 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"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-# This test case requires install of Qt.
-
-from raptor_tests import SmokeTest
-
-def run():
- t = SmokeTest()
-
- t.description = "Ensure Raptor builds Qt applications successfully"
-
- t.id = "00xx" # TO DO: update ID
- t.name = "qt_helloworld"
- t.command = "cd smoke_suite/test_resources/qt && qmake -spec symbian-sbsv2 && sbs"
- t.targets = [
- "$(SBS_HOME)/test/smoke_suite/test_resources/qt/bld.inf",
- "$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt.loc",
- "$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt.rss",
- "$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt_reg.rss",
- "$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt_template.pkg",
- "$(SBS_HOME)/test/smoke_suite/test_resources/qt/Makefile",
- "$(EPOCROOT)/epoc32/release/armv5/udeb/helloworldqt.exe",
- "$(EPOCROOT)/epoc32/release/armv5/udeb/helloworldqt.exe.map",
- "$(EPOCROOT)/epoc32/release/armv5/urel/helloworldqt.exe",
- "$(EPOCROOT)/epoc32/release/armv5/urel/helloworldqt.exe.map",
- "$(EPOCROOT)/epoc32/release/winscw/udeb/helloworldqt.exe",
- "$(EPOCROOT)/epoc32/release/winscw/urel/helloworldqt.exe",
- "$(EPOCROOT)/epoc32/release/winscw/urel/helloworldqt.exe.map"
- ]
- t.addbuildtargets('smoke_suite/test_resources/qt/bld.inf', [
- "helloworldqt_exe/armv5/udeb/helloworld.o",
- "helloworldqt_exe/armv5/udeb/helloworld.o.d",
- "helloworldqt_exe/armv5/urel/helloworld.o",
- "helloworldqt_exe/armv5/urel/helloworld.o.d",
- "helloworldqt_exe/winscw/udeb/helloworld.o",
- "helloworldqt_exe/winscw/udeb/helloworld.o.d",
- "helloworldqt_exe/winscw/urel/helloworld.o",
- "helloworldqt_exe/winscw/urel/helloworld.o.d"
- ])
- t.run("windows")
-
- return t
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sbsv2/raptor/test/smoke_suite/qt_helloworld.py Mon Jan 25 17:17:52 2010 +0000
@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2009 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"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+# This test case requires install of Qt.
+
+from raptor_tests import SmokeTest
+
+def run():
+ t = SmokeTest()
+
+ t.description = "Ensure Raptor builds Qt applications successfully"
+
+ t.id = "0107"
+ t.name = "qt_helloworld"
+ t.command = "cd smoke_suite/test_resources/qt && qmake -spec symbian-sbsv2 && sbs"
+ t.targets = [
+ "$(SBS_HOME)/test/smoke_suite/test_resources/qt/bld.inf",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt.loc",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt.rss",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt_reg.rss",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/qt/helloworldqt_template.pkg",
+ "$(SBS_HOME)/test/smoke_suite/test_resources/qt/Makefile",
+ "$(EPOCROOT)/epoc32/release/armv5/udeb/helloworldqt.exe",
+ "$(EPOCROOT)/epoc32/release/armv5/udeb/helloworldqt.exe.map",
+ "$(EPOCROOT)/epoc32/release/armv5/urel/helloworldqt.exe",
+ "$(EPOCROOT)/epoc32/release/armv5/urel/helloworldqt.exe.map",
+ "$(EPOCROOT)/epoc32/release/winscw/udeb/helloworldqt.exe",
+ "$(EPOCROOT)/epoc32/release/winscw/urel/helloworldqt.exe",
+ "$(EPOCROOT)/epoc32/release/winscw/urel/helloworldqt.exe.map"
+ ]
+ t.addbuildtargets('smoke_suite/test_resources/qt/bld.inf', [
+ "helloworldqt_exe/armv5/udeb/helloworld.o",
+ "helloworldqt_exe/armv5/udeb/helloworld.o.d",
+ "helloworldqt_exe/armv5/urel/helloworld.o",
+ "helloworldqt_exe/armv5/urel/helloworld.o.d",
+ "helloworldqt_exe/winscw/udeb/helloworld.o",
+ "helloworldqt_exe/winscw/udeb/helloworld.o.d",
+ "helloworldqt_exe/winscw/urel/helloworld.o",
+ "helloworldqt_exe/winscw/urel/helloworld.o.d"
+ ])
+ t.run("windows")
+
+ return t
+
--- a/sbsv2/raptor/test/smoke_suite/toolchain_macros.py Mon Jan 25 11:43:34 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/toolchain_macros.py Mon Jan 25 17:17:52 2010 +0000
@@ -37,14 +37,14 @@
count = 0
for toolchain in sorted(toolchains.keys()):
- t.id = "0103" + string.ascii_lowercase[count]
+ t.id = "0095" + string.ascii_lowercase[count]
t.name = rootname % (toolchain, "clean")
t.command = rootcommand + toolchain + " clean"
t.mustmatch_singleline = []
t.run()
count += 1
- t.id = "0103" + string.ascii_lowercase[count]
+ t.id = "0095" + string.ascii_lowercase[count]
t.name = rootname % (toolchain, "build")
t.command = rootcommand + toolchain
mustmatch = []
@@ -54,7 +54,7 @@
t.run()
count += 1
- t.id = "103"
+ t.id = "95"
t.name = "toolchain_macros"
t.print_result()
return t
--- a/sbsv2/raptor/test/smoke_suite/whatcomp.py Mon Jan 25 11:43:34 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/whatcomp.py Mon Jan 25 17:17:52 2010 +0000
@@ -58,7 +58,7 @@
warnings = 0
t.id = "0106"
- t.name = "filter_whatcomp_sbs_filter"
+ t.name = "whatcomp"
t.description = description
t.command = command % "arm.v5.urel.gcce4_4_1"
t.targets = targets