# HG changeset patch
# User timothy.murphy@nokia.com
# Date 1266865911 0
# Node ID e083e4a626555483c8b8bcf30db8fabd287d0be6
# Parent c6f095c06fadfbd32187f5db8ab7a2155ce194b6# Parent 9c346075cd97da30cdc9d1ee160b66378b540802
Merge
diff -r 9c346075cd97 -r e083e4a62655 sbsv2/raptor/RELEASE-NOTES.txt
--- a/sbsv2/raptor/RELEASE-NOTES.txt Mon Feb 22 11:42:09 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt Mon Feb 22 19:11:51 2010 +0000
@@ -1,8 +1,10 @@
Release Notes for Symbian Build System v2
+
next version
Defect Fixes:
+- SF Bug 1861 - [Raptor] More helpful console message in case of timeouts
- DPDEF142718 Incremental rebuild fails if dependent files deleted
--no-depend-generate added to suppress the generation and processing of dependency files
.DEFAULT target introduced for all non --no-depend-generate and/or --no-depend-include builds
diff -r 9c346075cd97 -r e083e4a62655 sbsv2/raptor/lib/flm/tracecompiler.mk
--- a/sbsv2/raptor/lib/flm/tracecompiler.mk Mon Feb 22 11:42:09 2010 +0000
+++ b/sbsv2/raptor/lib/flm/tracecompiler.mk Mon Feb 22 19:11:51 2010 +0000
@@ -25,13 +25,16 @@
TRACE_PRJNAME:=$(TARGET)_$(TARGETTYPE)
endif
-TRACE_DICTIONARY:=$(EPOCROOT)/epoc32/ost_dictionaries/$(TRACE_PRJNAME)_0x$(UID_TC)_Dictionary.xml
-AUTOGEN_HEADER:=$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/$(TRACE_PRJNAME)_0x$(UID_TC)_TraceDefinitions.h
+# initialise (so what output will be correct if we don't actually run the TC)
+TRACE_DICTIONARY:=
+AUTOGEN_HEADER:=
$(if $(FLMDEBUG),$(info TRACE_PATH = $(TRACE_PATH)))
# Run trace compiler only if TRACE_PATH exists
ifneq ($(TRACE_PATH),)
+
+
TRACE_MARKER:=$(TRACE_MARKER_PATH)/tracecompile_$(TRACE_PRJNAME)_$(UID_TC).done
TRACE_HEADERS:=
@@ -52,6 +55,9 @@
ifeq ($(GUARD_$(call sanitise,$(TRACE_MARKER))),)
GUARD_$(call sanitise,$(TRACE_MARKER)):=1
+TRACE_DICTIONARY:=$(EPOCROOT)/epoc32/ost_dictionaries/$(TRACE_PRJNAME)_0x$(UID_TC)_Dictionary.xml
+AUTOGEN_HEADER:=$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/$(TRACE_PRJNAME)_0x$(UID_TC)_TraceDefinitions.h
+
JAVA_COMMAND:=$(SBS_JAVATC)
TRACE_COMPILER_PATH:=$(EPOCROOT)/epoc32/tools
TRACE_COMPILER_START:=-classpath $(TRACE_COMPILER_PATH)/tracecompiler com.nokia.tracecompiler.TraceCompiler
diff -r 9c346075cd97 -r e083e4a62655 sbsv2/raptor/python/plugins/filter_terminal.py
--- a/sbsv2/raptor/python/plugins/filter_terminal.py Mon Feb 22 11:42:09 2010 +0000
+++ b/sbsv2/raptor/python/plugins/filter_terminal.py Mon Feb 22 19:11:51 2010 +0000
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2008-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"
@@ -230,6 +230,8 @@
# detect the status report from a recipe
if text.find('failed') != -1:
self.failed = True
+ if text.find("reason='timeout'") != -1:
+ self.timedout = True
else:
self.failed = False
return
@@ -282,6 +284,7 @@
# This variable holds all recipe information
self.failed = False # Recipe status
+ self.timedout = False # Did it Timeout?
self.recipeBody = []
self.recipelineExceeded = 0
return
@@ -298,16 +301,30 @@
if self.failed == True:
if not self.analyseonly:
- sys.stderr.write("\n FAILED %s for %s: %s\n" % \
+ reason=""
+ if self.timedout:
+ reason="(timeout)"
+
+ sys.stderr.write("\n FAILED %s %s for %s: %s\n" % \
(self.recipe_dict['name'],
+ reason,
self.recipe_dict['config'],
self.recipe_dict['name_to_user']))
mmppath = generic_path.Path(self.recipe_dict['mmp']).From(generic_path.CurrentDir()).GetShellPath()
- sys.stderr.write(" mmp: %s\n" % mmppath)
- for L in self.recipeBody:
- if not L.startswith('+'):
- sys.stdout.write(" %s\n" % L.rstrip())
+ if mmppath is not "":
+ sys.stderr.write(" mmp: %s\n" % mmppath)
+ if self.timedout:
+ sys.stderr.write( \
+""" Timeouts may be due to network related issues (e.g. license servers),
+ tool bugs or abnormally large components. TALON_TIMEOUT can be adjusted
+ in the make engine configuration if required. Make engines may have
+ their own timeouts that Raptor cannot influence
+""")
+ else:
+ for L in self.recipeBody:
+ if not L.startswith('+'):
+ sys.stdout.write(" %s\n" % L.rstrip())
self.err_count += 1
else:
r = Recipe.factory(self.recipe_dict['name'], "".join(self.recipeBody))
diff -r 9c346075cd97 -r e083e4a62655 sbsv2/raptor/schema/build/log/1_0.xsd
--- a/sbsv2/raptor/schema/build/log/1_0.xsd Mon Feb 22 11:42:09 2010 +0000
+++ b/sbsv2/raptor/schema/build/log/1_0.xsd Mon Feb 22 19:11:51 2010 +0000
@@ -3,7 +3,7 @@
- Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+ Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
All rights reserved.
This component and the accompanying materials are made available
uunder the terms of the License "Eclipse Public License v1.0"
@@ -60,7 +60,8 @@
-
+
+
diff -r 9c346075cd97 -r e083e4a62655 sbsv2/raptor/test/smoke_suite/timeout.py
--- a/sbsv2/raptor/test/smoke_suite/timeout.py Mon Feb 22 11:42:09 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/timeout.py Mon Feb 22 19:11:51 2010 +0000
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2009-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"
@@ -21,9 +21,7 @@
t = SmokeTest()
t.description = "test that long commands time out and get retried"
- exitCode = "15"
- if t.onWindows:
- exitCode = "128" # why are they different?
+ exitCode = "128"
t.id = "60a"
t.name = "timeout"
@@ -31,7 +29,7 @@
t.command = "sbs -b smoke_suite/test_resources/timeout/bld.inf -f-"
t.mustmatch = [
- "status exit='failed' code='" + exitCode + "' attempt='1'",
+ "status exit='failed' code='" + exitCode + "' attempt='1' *reason='timeout'",
]
t.errors = -1
t.returncode = 1
@@ -43,9 +41,9 @@
t.command = "sbs -b smoke_suite/test_resources/timeout/bld.inf -t 3 -f-"
t.mustmatch = [
- "status exit='retry' code='" + exitCode + "' attempt='1'",
- "status exit='retry' code='" + exitCode + "' attempt='2'",
- "status exit='failed' code='" + exitCode + "' attempt='3'",
+ "status exit='retry' code='" + exitCode + "' attempt='1' *reason='timeout'",
+ "status exit='retry' code='" + exitCode + "' attempt='2' *reason='timeout'",
+ "status exit='failed' code='" + exitCode + "' attempt='3' *reason='timeout'",
]
t.errors = -1
t.returncode = 1
diff -r 9c346075cd97 -r e083e4a62655 sbsv2/raptor/util/talon/process.c
--- a/sbsv2/raptor/util/talon/process.c Mon Feb 22 11:42:09 2010 +0000
+++ b/sbsv2/raptor/util/talon/process.c Mon Feb 22 19:11:51 2010 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -176,11 +176,15 @@
p->returncode = WEXITSTATUS(status);
DEBUG(("process exited normally \n"));
} else {
- p->causeofdeath = PROC_SOMEODDDEATH;
- if (WIFSIGNALED(status))
- p->returncode = WTERMSIG(status);
- else
+ if (p->causeofdeath == PROC_TIMEOUTDEATH)
p->returncode = 128;
+ else {
+ p->causeofdeath = PROC_SOMEODDDEATH;
+ if (WIFSIGNALED(status))
+ p->returncode = WTERMSIG(status);
+ else
+ p->returncode = 128;
+ }
DEBUG(("process terminated \n"));
}
diff -r 9c346075cd97 -r e083e4a62655 sbsv2/raptor/util/talon/talon.c
--- a/sbsv2/raptor/util/talon/talon.c Mon Feb 22 11:42:09 2010 +0000
+++ b/sbsv2/raptor/util/talon/talon.c Mon Feb 22 19:11:51 2010 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2009-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"
@@ -38,7 +38,7 @@
#define TALON_ATTEMPT_STRMAX 32
#define RECIPETAG_STRMAX 2048
-#define STATUS_STRMAX 100
+#define STATUS_STRMAX 120
#define TALONDELIMITER '|'
#define VARNAMEMAX 100
@@ -549,14 +549,18 @@
if (dotagging)
{
- char *forcesuccessstr = force_success == 0 ? "" : " forcesuccess='FORCESUCCESS'";
+ char *flagsstr = force_success == 0 ? "" : " flags='FORCESUCCESS'";
+ char *reasonstr = "" ;
+
+ if (p->causeofdeath == PROC_TIMEOUTDEATH)
+ reasonstr = " reason='timeout'";
if (p->returncode != 0)
{
char *exitstr = retries > 0 ? "retry" : "failed";
- snprintf(status, STATUS_STRMAX - 1, "\n", exitstr, p->returncode, attempt, forcesuccessstr );
+ snprintf(status, STATUS_STRMAX - 1, "\n", exitstr, p->returncode, attempt, flagsstr, reasonstr );
} else {
- snprintf(status, STATUS_STRMAX - 1, "\n", attempt, forcesuccessstr );
+ snprintf(status, STATUS_STRMAX - 1, "\n", attempt, flagsstr, reasonstr );
}
status[STATUS_STRMAX-1] = '\0';
diff -r 9c346075cd97 -r e083e4a62655 sbsv2/raptor/win32/bin/talon.exe
Binary file sbsv2/raptor/win32/bin/talon.exe has changed