# HG changeset patch # User timothy.murphy@nokia.com # Date 1259603376 0 # Node ID ecf6c5729e53606d5a49bb04457eb2bad8e4f392 # Parent e9dc34adfa0e3d1207d46ba452c1536ba9ffff08# Parent a5abe4904f43c815e9785f56926399b63f38f4ab Merge up diff -r e9dc34adfa0e -r ecf6c5729e53 sbsv2/raptor/test/smoke_suite/metadep.py --- a/sbsv2/raptor/test/smoke_suite/metadep.py Mon Nov 30 17:47:19 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +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: -# - -from raptor_tests import SmokeTest - -def run(): - t = SmokeTest() - t.id = "71" - t.name = "metadep" - t.description = """Tests metadata dependency generation. Changes - to bld.infs and mmps can be detected.""" - t.usebash = True - t.command = """export SBSLOGFILE SBSMAKEFILE; bash smoke_suite/test_resources/metadep.sh 2>&1""" - - t.targets = [ - ] - - t.mustmatch_multiline = [ -""".*Step 1 .*no warnings or errors.* -sbs: build log in.* -\+ sleep 1.* -.*make -rf .*epoc32/build/metadata_all.mk.* -.*make.*epoc32/build/metadata_all.mk. is up to date.* -Step 2 .* -.*RE-RUNNING SBS with previous parameters.* -Step 3 .* -.*RE-RUNNING SBS with previous parameters.* -.*RE-RUNNING SBS with previous parameters.*""" - ] - t.mustnotmatch_multiline = [ -"""RE-RUNNING SBS with previous parameters.* -RE-RUNNING SBS with previous parameters.* -RE-RUNNING SBS with previous parameters.* -RE-RUNNING SBS with previous parameters.*""" - ] - t.run() - return t diff -r e9dc34adfa0e -r ecf6c5729e53 sbsv2/raptor/test/smoke_suite/mmp_newlib_keyword.py --- a/sbsv2/raptor/test/smoke_suite/mmp_newlib_keyword.py Mon Nov 30 17:47:19 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +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: -# - -from raptor_tests import SmokeTest - -def run(): - t = SmokeTest() - t.id = "40" - t.name = "mmp_newlib_keyword" - t.description = "Test the NEWLIB MMP keyword by specifying an invalid " + \ - "library to link against" - t.command = "sbs -b smoke_suite/test_resources/newlib/bld.inf" - # 1 error is expected because the NEWLIB library we are trying to link - # Against does not exist - t.errors = 1 - t.run() - return t diff -r e9dc34adfa0e -r ecf6c5729e53 sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/apply_test_exported_variants.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/apply_test_exported_variants.xml Mon Nov 30 17:49:36 2009 +0000 @@ -0,0 +1,14 @@ + + + + + + + + + + + diff -r e9dc34adfa0e -r ecf6c5729e53 sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/bld.inf Mon Nov 30 17:49:36 2009 +0000 @@ -0,0 +1,7 @@ + +PRJ_EXPORTS +apply_test_exported_variants.xml /epoc32/tools/makefile_templates/ + +PRJ_MMPFILES +test_mmp_apply.mmp + diff -r e9dc34adfa0e -r ecf6c5729e53 sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/test_mmp_apply.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/test_mmp_apply.cpp Mon Nov 30 17:49:36 2009 +0000 @@ -0,0 +1,9 @@ + +#include "e32def.h" + +char test[] = "test mmp keyword APPLY"; + +TInt E32Main() +{ + return 0; +} diff -r e9dc34adfa0e -r ecf6c5729e53 sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/test_mmp_apply.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/test_mmp_apply.mmp Mon Nov 30 17:49:36 2009 +0000 @@ -0,0 +1,16 @@ + +TARGET test_mmp_apply +TARGETTYPE EXE + +APPLY no_such_var + +LIBRARY euser.lib + +SYSTEMINCLUDE /epoc32/include + +APPLY apply_test_append_cdefs + +SOURCE test_mmp_apply.cpp + +APPLY apply_test_exported_var + diff -r e9dc34adfa0e -r ecf6c5729e53 sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/bld.inf Mon Nov 30 17:49:36 2009 +0000 @@ -0,0 +1,27 @@ +/* +* 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: +* +*/ + + +PRJ_PLATFORMS +ARMV5 + +PRJ_MMPFILES +compresstarget.mmp +nocompresstarget.mmp +bytepaircompresstarget.mmp +inflatecompresstarget.mmp +combinedcompresstarget.mmp diff -r e9dc34adfa0e -r ecf6c5729e53 sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/bytepaircompresstarget.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/bytepaircompresstarget.mmp Mon Nov 30 17:49:36 2009 +0000 @@ -0,0 +1,27 @@ +/* +* 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: +* +*/ + +TARGET bytepaircompress.exe +TARGETTYPE exe +SOURCEPATH . +SOURCE compress.cpp +UID 0x100039ce 0x00000001 +LIBRARY euser.lib +SECUREID 0x10003a5c +SYSTEMINCLUDE /epoc32/include + +BYTEPAIRCOMPRESSTARGET diff -r e9dc34adfa0e -r ecf6c5729e53 sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/combinedcompresstarget.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/combinedcompresstarget.mmp Mon Nov 30 17:49:36 2009 +0000 @@ -0,0 +1,30 @@ +/* +* 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: +* +*/ + +TARGET combinedcompress.exe +TARGETTYPE exe +SOURCEPATH . +SOURCE compress.cpp +UID 0x100039ce 0x00000001 +LIBRARY euser.lib +SECUREID 0x10003a5c +SYSTEMINCLUDE /epoc32/include + +NOCOMPRESSTARGET +COMPRESSTARGET +INFLATECOMPRESSTARGET +BYTEPAIRCOMPRESSTARGET diff -r e9dc34adfa0e -r ecf6c5729e53 sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/compress.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/compress.cpp Mon Nov 30 17:49:36 2009 +0000 @@ -0,0 +1,22 @@ +/* +* 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: +* +*/ + +#include "e32def.h" +TInt E32Main() + { + return 0; + } diff -r e9dc34adfa0e -r ecf6c5729e53 sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/compresstarget.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/compresstarget.mmp Mon Nov 30 17:49:36 2009 +0000 @@ -0,0 +1,27 @@ +/* +* 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: +* +*/ + +TARGET compress.exe +TARGETTYPE exe +SOURCEPATH . +SOURCE compress.cpp +UID 0x100039ce 0x00000001 +LIBRARY euser.lib +SECUREID 0x10003a5c +SYSTEMINCLUDE /epoc32/include + +COMPRESSTARGET diff -r e9dc34adfa0e -r ecf6c5729e53 sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/inflatecompresstarget.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/inflatecompresstarget.mmp Mon Nov 30 17:49:36 2009 +0000 @@ -0,0 +1,27 @@ +/* +* 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: +* +*/ + +TARGET inflatecompress.exe +TARGETTYPE exe +SOURCEPATH . +SOURCE compress.cpp +UID 0x100039ce 0x00000001 +LIBRARY euser.lib +SECUREID 0x10003a5c +SYSTEMINCLUDE /epoc32/include + +INFLATECOMPRESSTARGET diff -r e9dc34adfa0e -r ecf6c5729e53 sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/nocompresstarget.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/nocompresstarget.mmp Mon Nov 30 17:49:36 2009 +0000 @@ -0,0 +1,27 @@ +/* +* 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: +* +*/ + +TARGET nocompress.exe +TARGETTYPE exe +SOURCEPATH . +SOURCE compress.cpp +UID 0x100039ce 0x00000001 +LIBRARY euser.lib +SECUREID 0x10003a5c +SYSTEMINCLUDE /epoc32/include + +NOCOMPRESSTARGET diff -r e9dc34adfa0e -r ecf6c5729e53 sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu.cpp Mon Nov 30 17:49:36 2009 +0000 @@ -0,0 +1,27 @@ +/* +* 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: +* +*/ +#include "e32def.h" // intentional include + +char test[]="Simple test"; + + +TInt test1; + +TInt E32Main() +{ + return 0; +} diff -r e9dc34adfa0e -r ecf6c5729e53 sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu_soft.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu_soft.mmp Mon Nov 30 17:49:36 2009 +0000 @@ -0,0 +1,30 @@ +/* +* Copyright (c) 2005-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: +* +*/ +target test_softvfp +TARGETTYPE exe +SOURCEPATH . +SOURCE armfpu.cpp + +UID 0x100039ce 0x00000001 +LIBRARY euser.lib +SECUREID 0x10003a5c +SYSTEMINCLUDE /epoc32/include + +ARMFPU softvfp + +capability all +paged diff -r e9dc34adfa0e -r ecf6c5729e53 sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu_vfpv2.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu_vfpv2.mmp Mon Nov 30 17:49:36 2009 +0000 @@ -0,0 +1,30 @@ +/* +* Copyright (c) 2005-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: +* +*/ +target test_vfpv2 +TARGETTYPE exe +SOURCEPATH . +SOURCE armfpu.cpp + +UID 0x100039ce 0x00000001 +LIBRARY euser.lib +SECUREID 0x10003a5c +SYSTEMINCLUDE /epoc32/include + +ARMFPU vfpv2 + +capability all +paged diff -r e9dc34adfa0e -r ecf6c5729e53 sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/bld.inf Mon Nov 30 17:49:36 2009 +0000 @@ -0,0 +1,26 @@ +/* +* 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: +* +*/ + + +PRJ_PLATFORMS +ARMV5 + +PRJ_MMPFILES +armfpu_soft.mmp +armfpu_vfpv2.mmp + +