# HG changeset patch # User raptorbot # Date 1259366997 0 # Node ID d1f6767eec1a5463b9c8954fb158d9033128119c # Parent 830586221171d0844d39faf1db0e336d84d286b5 Tests working with separate test-epocroot. diff -r 830586221171 -r d1f6767eec1a sbsv2/raptor/python/plugins/filter_checksource.py --- a/sbsv2/raptor/python/plugins/filter_checksource.py Fri Nov 27 15:16:54 2009 +0000 +++ b/sbsv2/raptor/python/plugins/filter_checksource.py Sat Nov 28 00:09:57 2009 +0000 @@ -221,14 +221,14 @@ # so we only check each one once depset = set(deps) deplistnodups = list(depset) - # Do the check for each file + for dep in deplistnodups: - dep = os.path.normpath(dep).replace('\\', '/') + dep = os.path.abspath(dep).replace('\\', '/') self.checksource(dep) except Exception, e: - sys.stderr.write("sbs: could not access temporary file for FilterClean\n") + sys.stderr.write("sbs: FilterCheckSource failed: %s\n" % str(e)) if self.errors == 0: sys.stdout.write("No checksource errors found\n") @@ -263,7 +263,7 @@ def checkcase(self, path): """Checks the path matches the file system""" - path = os.path.normpath(path) + path = os.path.abspath(path) path = path.replace('\\', '/') if not os.path.exists(path): @@ -277,7 +277,7 @@ for part in parts: if not self.checkkeyignorecase(cacheItem, part): - + dirItems = os.listdir(dirBeingChecked) found = False diff -r 830586221171 -r d1f6767eec1a sbsv2/raptor/python/plugins/filter_clean.py --- a/sbsv2/raptor/python/plugins/filter_clean.py Fri Nov 27 15:16:54 2009 +0000 +++ b/sbsv2/raptor/python/plugins/filter_clean.py Sat Nov 28 00:09:57 2009 +0000 @@ -93,8 +93,8 @@ dirs.add(directory) self.tmp.close() # this also deletes the temporary file - except: - sys.stderr.write("sbs: could not access temporary file for FilterClean\n") + except Exception,e: + sys.stderr.write("sbs: problem reading temporary file for FilterClean: %s\n" % str(e)) self.ok = False # finally remove (empty) directories diff -r 830586221171 -r d1f6767eec1a sbsv2/raptor/test/smoke_suite/exe_checksource.py --- a/sbsv2/raptor/test/smoke_suite/exe_checksource.py Fri Nov 27 15:16:54 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/exe_checksource.py Sat Nov 28 00:09:57 2009 +0000 @@ -14,6 +14,10 @@ # Description: # +# NB - the checksource filter can find the same problem twice +# So the count of 5 errors here is not actually accurate (AFAIK there are only 4) + + from raptor_tests import SmokeTest def run(): @@ -30,7 +34,7 @@ t.command = cmd1 + " && " + cmd2 + " && " + cmd3 t.mustmatch = [ - ".* 6 checksource errors found.*" + ".* 5 checksource errors found.*" ] t.returncode = 1 t.run("windows") diff -r 830586221171 -r d1f6767eec1a sbsv2/raptor/test/smoke_suite/featurevariants.py --- a/sbsv2/raptor/test/smoke_suite/featurevariants.py Fri Nov 27 15:16:54 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/featurevariants.py Sat Nov 28 00:09:57 2009 +0000 @@ -231,7 +231,7 @@ vmap = " -o " + vmapfile if 'SBS_BVCPP' in os.environ: - bvcpp = " -c " + os.environ['SBS_BVCPP'] + bvcpp = " -c " + os.environ['SBS_BVCPP'].replace('\\','/') else: bvcpp = " -c $(SBS_HOME)/$(HOSTPLATFORM_DIR)/bv/bin/cpp" if t.onWindows: diff -r 830586221171 -r d1f6767eec1a sbsv2/raptor/test/smoke_suite/gnumakefile.py --- a/sbsv2/raptor/test/smoke_suite/gnumakefile.py Fri Nov 27 15:16:54 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/gnumakefile.py Sat Nov 28 00:09:57 2009 +0000 @@ -25,7 +25,7 @@ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_bld_ARMV5_UDEB.txt", "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_bld_ARMV5_UREL.txt", "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_bld_WINSCW_UDEB.txt", - "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_bld_WINSCW_UREL.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_bld_WINSCW_UREL.txt", "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_final_ARMV5_UDEB.txt", "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_final_ARMV5_UREL.txt", "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_final_WINSCW_UDEB.txt", @@ -41,7 +41,27 @@ "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_resource_ARMV5_UDEB.txt", "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_resource_ARMV5_UREL.txt", "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_resource_WINSCW_UDEB.txt", - "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_resource_WINSCW_UREL.txt" + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/master_resource_WINSCW_UREL.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_bld_ARMV5_UDEB.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_bld_ARMV5_UREL.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_bld_WINSCW_UDEB.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_bld_WINSCW_UREL.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_final_ARMV5_UDEB.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_final_ARMV5_UREL.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_final_WINSCW_UDEB.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_final_WINSCW_UREL.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_lib_ARMV5_UDEB.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_lib_ARMV5_UREL.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_lib_WINSCW_UDEB.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_lib_WINSCW_UREL.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_makmake_ARMV5_UDEB.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_makmake_ARMV5_UREL.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_makmake_WINSCW_UDEB.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_makmake_WINSCW_UREL.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_resource_ARMV5_UDEB.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_resource_ARMV5_UREL.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_resource_WINSCW_UDEB.txt", + "$(SBS_HOME)/test/smoke_suite/test_resources/gnumakefile/slave_resource_WINSCW_UREL.txt" ] t.run("windows") # we don't have make 3.79 on Linux return t diff -r 830586221171 -r d1f6767eec1a sbsv2/raptor/test/smoke_suite/gnumakefile_what.py --- a/sbsv2/raptor/test/smoke_suite/gnumakefile_what.py Fri Nov 27 15:16:54 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/gnumakefile_what.py Sat Nov 28 00:09:57 2009 +0000 @@ -45,7 +45,27 @@ componentpath+"/master_resource_ARMV5_UDEB.txt", componentpath+"/master_resource_ARMV5_UREL.txt", componentpath+"/master_resource_WINSCW_UDEB.txt", - componentpath+"/master_resource_WINSCW_UREL.txt" + componentpath+"/master_resource_WINSCW_UREL.txt", + componentpath+"/slave_bld_ARMV5_UDEB.txt", + componentpath+"/slave_bld_ARMV5_UREL.txt", + componentpath+"/slave_bld_WINSCW_UDEB.txt", + componentpath+"/slave_bld_WINSCW_UREL.txt", + componentpath+"/slave_final_ARMV5_UDEB.txt", + componentpath+"/slave_final_ARMV5_UREL.txt", + componentpath+"/slave_final_WINSCW_UDEB.txt", + componentpath+"/slave_final_WINSCW_UREL.txt", + componentpath+"/slave_lib_ARMV5_UDEB.txt", + componentpath+"/slave_lib_ARMV5_UREL.txt", + componentpath+"/slave_lib_WINSCW_UDEB.txt", + componentpath+"/slave_lib_WINSCW_UREL.txt", + componentpath+"/slave_makmake_ARMV5_UDEB.txt", + componentpath+"/slave_makmake_ARMV5_UREL.txt", + componentpath+"/slave_makmake_WINSCW_UDEB.txt", + componentpath+"/slave_makmake_WINSCW_UREL.txt", + componentpath+"/slave_resource_ARMV5_UDEB.txt", + componentpath+"/slave_resource_ARMV5_UREL.txt", + componentpath+"/slave_resource_WINSCW_UDEB.txt", + componentpath+"/slave_resource_WINSCW_UREL.txt" ] t.run("windows") # we don't have make 3.79 on Linux return t diff -r 830586221171 -r d1f6767eec1a sbsv2/raptor/test/smoke_suite/gnumakefile_whatlog.py --- a/sbsv2/raptor/test/smoke_suite/gnumakefile_whatlog.py Fri Nov 27 15:16:54 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/gnumakefile_whatlog.py Sat Nov 28 00:09:57 2009 +0000 @@ -47,7 +47,27 @@ componentpath+"/master_resource_ARMV5_UDEB.txt", componentpath+"/master_resource_ARMV5_UREL.txt", componentpath+"/master_resource_WINSCW_UDEB.txt", - componentpath+"/master_resource_WINSCW_UREL.txt" + componentpath+"/master_resource_WINSCW_UREL.txt", + componentpath+"/slave_bld_ARMV5_UDEB.txt", + componentpath+"/slave_bld_ARMV5_UREL.txt", + componentpath+"/slave_bld_WINSCW_UDEB.txt", + componentpath+"/slave_bld_WINSCW_UREL.txt", + componentpath+"/slave_final_ARMV5_UDEB.txt", + componentpath+"/slave_final_ARMV5_UREL.txt", + componentpath+"/slave_final_WINSCW_UDEB.txt", + componentpath+"/slave_final_WINSCW_UREL.txt", + componentpath+"/slave_lib_ARMV5_UDEB.txt", + componentpath+"/slave_lib_ARMV5_UREL.txt", + componentpath+"/slave_lib_WINSCW_UDEB.txt", + componentpath+"/slave_lib_WINSCW_UREL.txt", + componentpath+"/slave_makmake_ARMV5_UDEB.txt", + componentpath+"/slave_makmake_ARMV5_UREL.txt", + componentpath+"/slave_makmake_WINSCW_UDEB.txt", + componentpath+"/slave_makmake_WINSCW_UREL.txt", + componentpath+"/slave_resource_ARMV5_UDEB.txt", + componentpath+"/slave_resource_ARMV5_UREL.txt", + componentpath+"/slave_resource_WINSCW_UDEB.txt", + componentpath+"/slave_resource_WINSCW_UREL.txt" ] t.stdout = [ "", @@ -73,7 +93,31 @@ ""+componentpath+"/master_final_WINSCW_UDEB.txt", ""+componentpath+"/master_lib_WINSCW_UDEB.txt", ""+componentpath+"/master_makmake_WINSCW_UDEB.txt", - ""+componentpath+"/master_resource_WINSCW_UDEB.txt" + ""+componentpath+"/master_resource_WINSCW_UDEB.txt", + "", + ""+componentpath+"/slave_bld_ARMV5_UDEB.txt", + ""+componentpath+"/slave_final_ARMV5_UDEB.txt", + ""+componentpath+"/slave_lib_ARMV5_UDEB.txt", + ""+componentpath+"/slave_makmake_ARMV5_UDEB.txt", + ""+componentpath+"/slave_resource_ARMV5_UDEB.txt", + "", + ""+componentpath+"/slave_bld_ARMV5_UREL.txt", + ""+componentpath+"/slave_final_ARMV5_UREL.txt", + ""+componentpath+"/slave_lib_ARMV5_UREL.txt", + ""+componentpath+"/slave_makmake_ARMV5_UREL.txt", + ""+componentpath+"/slave_resource_ARMV5_UREL.txt", + "", + ""+componentpath+"/slave_bld_WINSCW_UREL.txt", + ""+componentpath+"/slave_final_WINSCW_UREL.txt", + ""+componentpath+"/slave_lib_WINSCW_UREL.txt", + ""+componentpath+"/slave_makmake_WINSCW_UREL.txt", + ""+componentpath+"/slave_resource_WINSCW_UREL.txt", + "", + ""+componentpath+"/slave_bld_WINSCW_UDEB.txt", + ""+componentpath+"/slave_final_WINSCW_UDEB.txt", + ""+componentpath+"/slave_lib_WINSCW_UDEB.txt", + ""+componentpath+"/slave_makmake_WINSCW_UDEB.txt", + ""+componentpath+"/slave_resource_WINSCW_UDEB.txt" ] t.run("windows") # we don't have make 3.79 on Linux return t diff -r 830586221171 -r d1f6767eec1a sbsv2/raptor/test/smoke_suite/mmp_newlib_keyword.py --- a/sbsv2/raptor/test/smoke_suite/mmp_newlib_keyword.py Fri Nov 27 15:16:54 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 830586221171 -r d1f6767eec1a sbsv2/raptor/test/smoke_suite/test_resources/gnumakefile/slave.mak --- a/sbsv2/raptor/test/smoke_suite/test_resources/gnumakefile/slave.mak Fri Nov 27 15:16:54 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/gnumakefile/slave.mak Sat Nov 28 00:09:57 2009 +0000 @@ -9,34 +9,34 @@ MAKMAKE : - echo SLAVE.MAK MAKMAKE >> master_makmake_$(PLATFORM)_$(CFG).txt + echo SLAVE.MAK MAKMAKE > slave_makmake_$(PLATFORM)_$(CFG).txt RESOURCE : - echo SLAVE.MAK RESOURCE >> master_resource_$(PLATFORM)_$(CFG).txt + echo SLAVE.MAK RESOURCE > slave_resource_$(PLATFORM)_$(CFG).txt SAVESPACE : BLD BLD : - echo SLAVE.MAK BLD >> master_bld_$(PLATFORM)_$(CFG).txt + echo SLAVE.MAK BLD > slave_bld_$(PLATFORM)_$(CFG).txt FREEZE : - echo SLAVE.MAK FREEZE >> master_freeze_$(PLATFORM)_$(CFG).txt + echo SLAVE.MAK FREEZE > slave_freeze_$(PLATFORM)_$(CFG).txt LIB : - echo SLAVE.MAK LIB >> master_lib_$(PLATFORM)_$(CFG).txt + echo SLAVE.MAK LIB > slave_lib_$(PLATFORM)_$(CFG).txt CLEANLIB : do_nothing FINAL : - echo SLAVE.MAK FINAL >> master_final_$(PLATFORM)_$(CFG).txt + echo SLAVE.MAK FINAL >> slave_final_$(PLATFORM)_$(CFG).txt CLEAN : rm -f *.txt RELEASABLES : - @echo $(DIRECTORY)/master_makmake_$(PLATFORM)_$(CFG).txt - @echo $(DIRECTORY)/master_resource_$(PLATFORM)_$(CFG).txt - @echo $(DIRECTORY)/master_bld_$(PLATFORM)_$(CFG).txt - @echo $(DIRECTORY)/master_lib_$(PLATFORM)_$(CFG).txt - @echo $(DIRECTORY)/master_final_$(PLATFORM)_$(CFG).txt + @echo $(DIRECTORY)/slave_makmake_$(PLATFORM)_$(CFG).txt + @echo $(DIRECTORY)/slave_resource_$(PLATFORM)_$(CFG).txt + @echo $(DIRECTORY)/slave_bld_$(PLATFORM)_$(CFG).txt + @echo $(DIRECTORY)/slave_lib_$(PLATFORM)_$(CFG).txt + @echo $(DIRECTORY)/slave_final_$(PLATFORM)_$(CFG).txt diff -r 830586221171 -r d1f6767eec1a sbsv2/raptor/test/smoke_suite/test_resources/toolchain_macros/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/toolchain_macros/bld.inf Sat Nov 28 00:09:57 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: +* +*/ + +PRJ_PLATFORMS +ARMV5 WINSCW + +PRJ_MMPFILES +macros.mmp diff -r 830586221171 -r d1f6767eec1a sbsv2/raptor/test/smoke_suite/test_resources/toolchain_macros/macros.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/toolchain_macros/macros.cpp Sat Nov 28 00:09:57 2009 +0000 @@ -0,0 +1,71 @@ +/* +* 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() + { + +// Confirm macro presence in processing through warnings + +#ifdef __ARMCC__ +#warning __ARMCC__ +#endif + +#ifdef __ARMCC_2__ +#warning __ARMCC_2__ +#endif + +#ifdef __ARMCC_2_2__ +#warning __ARMCC_2_2__ +#endif + +#ifdef __ARMCC_3__ +#warning __ARMCC_3__ +#endif + +#ifdef __ARMCC_3_1__ +#warning __ARMCC_3_1__ +#endif + +#ifdef __ARMCC_4__ +#warning __ARMCC_4__ +#endif + +#ifdef __ARMCC_4_0__ +#warning __ARMCC_4_0__ +#endif + +#ifdef __GCCE__ +#warning __GCCE__ +#endif + +#ifdef __GCCE_4__ +#warning __GCCE_4__ +#endif + +#ifdef __GCCE_4_3__ +#warning __GCCE_4_3__ +#endif + +#ifdef __GCCE_4_4__ +#warning __GCCE_4_4__ +#endif + + return 0; + } diff -r 830586221171 -r d1f6767eec1a sbsv2/raptor/test/smoke_suite/test_resources/toolchain_macros/macros.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sbsv2/raptor/test/smoke_suite/test_resources/toolchain_macros/macros.mmp Sat Nov 28 00:09:57 2009 +0000 @@ -0,0 +1,70 @@ +/* +* 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 macros +TARGETTYPE EXE +UID 0x100039ce 0x00000001 +LIBRARY euser.lib +SYSTEMINCLUDE /epoc32/include +SOURCE macros.cpp + +// Confirm macro presence in processing through warnings + +#ifdef ARMCC +#warning ARMCC +#endif + +#ifdef ARMCC_2 +#warning ARMCC_2 +#endif + +#ifdef ARMCC_2_2 +#warning ARMCC_2_2 +#endif + +#ifdef ARMCC_3 +#warning ARMCC_3 +#endif + +#ifdef ARMCC_3_1 +#warning ARMCC_3_1 +#endif + +#ifdef ARMCC_4 +#warning ARMCC_4 +#endif + +#ifdef ARMCC_4_0 +#warning ARMCC_4_0 +#endif + +#ifdef GCCE +#warning GCCE +#endif + +#ifdef GCCE_4 +#warning GCCE_4 +#endif + +#ifdef GCCE_4_3 +#warning GCCE_4_3 +#endif + +#ifdef GCCE_4_4 +#warning GCCE_4_4 +#endif