# HG changeset patch # User raptorbot # Date 1259025202 0 # Node ID d5821e136caacfd8394574dc7db4faf9a655bad1 # Parent 4d5bb8330a27bed453cf650374cafc133af796d4 Some test fixes Also remove regenerated trace headers diff -r 4d5bb8330a27 -r d5821e136caa sbsv2/raptor/test/smoke_suite/longpath.py --- a/sbsv2/raptor/test/smoke_suite/longpath.py Mon Nov 23 23:31:36 2009 +0000 +++ b/sbsv2/raptor/test/smoke_suite/longpath.py Tue Nov 24 01:13:22 2009 +0000 @@ -74,14 +74,12 @@ e32def = dirname + 'e32def.h' deftestu = dirname + 'deftestu.def' - distpol = dirname + 'distribution.policy.s60' dst_cpp = sbsHome + path + 'test.cpp' dst_bld = sbsHome + path + 'bld.inf' dst_deftest = sbsHome + path + 'deftest.mmp' dst_e32def = sbsHome + path + 'e32def.h' dst_deftestu = sbsHome + path_eabi + 'deftestu.def' - dst_distpol = sbsHome + path_eabi + 'distribution.policy.s60' if os.path.exists(dst_cpp): @@ -92,7 +90,6 @@ shutil.copy(deftest, dst_deftest) shutil.copy(e32def, dst_e32def) shutil.copy(deftestu , dst_deftestu) - shutil.copy(distpol , dst_distpol) dirname = sbsHome + path t = SmokeTest() diff -r 4d5bb8330a27 -r d5821e136caa sbsv2/raptor/test/smoke_suite/metadep.py --- a/sbsv2/raptor/test/smoke_suite/metadep.py Mon Nov 23 23:31:36 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 4d5bb8330a27 -r d5821e136caa sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_featurevariant/traces/HelloWorldTraces.h --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_featurevariant/traces/HelloWorldTraces.h Mon Nov 23 23:31:36 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -// Created by TraceCompiler 1.3.0 -// DO NOT EDIT, CHANGES WILL BE LOST - -#ifndef __HELLOWORLDTRACES_H__ -#define __HELLOWORLDTRACES_H__ - -#define KOstTraceComponentID 0xe78a5aa3 - -#define _DOSTARTL 0x30001 - - -#endif - -// End of file - diff -r 4d5bb8330a27 -r d5821e136caa sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_featurevariant/traces/OstTraceDefinitions.h --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_featurevariant/traces/OstTraceDefinitions.h Mon Nov 23 23:31:36 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -#ifndef __OSTTRACEDEFINITIONS_H__ -#define __OSTTRACEDEFINITIONS_H__ -// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler -// REMOVE BEFORE CHECK-IN TO VERSION CONTROL -// #define OST_TRACE_COMPILER_IN_USE -#include -#endif diff -r 4d5bb8330a27 -r d5821e136caa sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_featurevariant/traces/fixed_id.definitions --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/TC_featurevariant/traces/fixed_id.definitions Mon Nov 23 23:31:36 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,3 +0,0 @@ -#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. -[GROUP]TRACE_NORMAL=0x3 -[TRACE]TRACE_NORMAL[0x3]__DOSTARTL=0x1 diff -r 4d5bb8330a27 -r d5821e136caa sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/multiple_variants/traces/OstTraceDefinitions.h --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/multiple_variants/traces/OstTraceDefinitions.h Mon Nov 23 23:31:36 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -#ifndef __OSTTRACEDEFINITIONS_H__ -#define __OSTTRACEDEFINITIONS_H__ -// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler -// REMOVE BEFORE CHECK-IN TO VERSION CONTROL -// #define OST_TRACE_COMPILER_IN_USE -#include -#endif diff -r 4d5bb8330a27 -r d5821e136caa sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child1_exe/OstTraceDefinitions.h --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child1_exe/OstTraceDefinitions.h Mon Nov 23 23:31:36 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -#ifndef __OSTTRACEDEFINITIONS_H__ -#define __OSTTRACEDEFINITIONS_H__ -// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler -// REMOVE BEFORE CHECK-IN TO VERSION CONTROL -// #define OST_TRACE_COMPILER_IN_USE -#include -#endif diff -r 4d5bb8330a27 -r d5821e136caa sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child2_exe/OstTraceDefinitions.h --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child2_exe/OstTraceDefinitions.h Mon Nov 23 23:31:36 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -#ifndef __OSTTRACEDEFINITIONS_H__ -#define __OSTTRACEDEFINITIONS_H__ -// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler -// REMOVE BEFORE CHECK-IN TO VERSION CONTROL -// #define OST_TRACE_COMPILER_IN_USE -#include -#endif diff -r 4d5bb8330a27 -r d5821e136caa sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child3_exe/OstTraceDefinitions.h --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/mum_children_mmps/traces_child3_exe/OstTraceDefinitions.h Mon Nov 23 23:31:36 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -#ifndef __OSTTRACEDEFINITIONS_H__ -#define __OSTTRACEDEFINITIONS_H__ -// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler -// REMOVE BEFORE CHECK-IN TO VERSION CONTROL -// #define OST_TRACE_COMPILER_IN_USE -#include -#endif diff -r 4d5bb8330a27 -r d5821e136caa sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/traces/OstTraceDefinitions.h --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/testTC/traces/OstTraceDefinitions.h Mon Nov 23 23:31:36 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -#ifndef __OSTTRACEDEFINITIONS_H__ -#define __OSTTRACEDEFINITIONS_H__ -// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler -// REMOVE BEFORE CHECK-IN TO VERSION CONTROL -// #define OST_TRACE_COMPILER_IN_USE -#include -#endif diff -r 4d5bb8330a27 -r d5821e136caa sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/variant_source/traces/OstTraceDefinitions.h --- a/sbsv2/raptor/test/smoke_suite/test_resources/tracecompiler/variant_source/traces/OstTraceDefinitions.h Mon Nov 23 23:31:36 2009 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -#ifndef __OSTTRACEDEFINITIONS_H__ -#define __OSTTRACEDEFINITIONS_H__ -// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler -// REMOVE BEFORE CHECK-IN TO VERSION CONTROL -// #define OST_TRACE_COMPILER_IN_USE -#include -#endif