# HG changeset patch
# User yiluzhu
# Date 1272460715 -3600
# Node ID 79e0aa507647c15c53c59b290c62722236f8d6bd
# Parent 4a86d5ea40ef18c24a5d15014509641ae7019b29
fix test cases
diff -r 4a86d5ea40ef -r 79e0aa507647 sbsv2/raptor/test/common/raptor_tests.py
--- a/sbsv2/raptor/test/common/raptor_tests.py Tue Apr 27 16:45:26 2010 +0100
+++ b/sbsv2/raptor/test/common/raptor_tests.py Wed Apr 28 14:18:35 2010 +0100
@@ -604,13 +604,14 @@
# .whatlog output is used verbatim from the build/TEM/EM output
self.hostossensitive = True
- # Indicate whether ouput is expected to appear only once. If so, set it to True
+ # Indicate whether output is expected to appear only once. If so, set it to True
self.output_expected_only_once = False
def posttest(self):
outlines = self.output.splitlines()
- outlines_left = outlines
-
+ if self.output_expected_only_once:
+ outlines_left = list(outlines)
+
ok = True
seen = []
@@ -624,7 +625,8 @@
if line in outlines:
seen.append(line)
- outlines_left.remove(line)
+ if self.output_expected_only_once:
+ outlines_left.remove(line)
else:
print "OUTPUT NOT FOUND:", line
ok = False
@@ -636,7 +638,6 @@
if not line in seen:
print "UNEXPECTED OUTPUT:", line
ok = False
- outlines_left.remove(line)
# and check for lines that we expected to see only once
if self.output_expected_only_once:
diff -r 4a86d5ea40ef -r 79e0aa507647 sbsv2/raptor/test/smoke_suite/tracecompiler_whatlog.py
--- a/sbsv2/raptor/test/smoke_suite/tracecompiler_whatlog.py Tue Apr 27 16:45:26 2010 +0100
+++ b/sbsv2/raptor/test/smoke_suite/tracecompiler_whatlog.py Wed Apr 28 14:18:35 2010 +0100
@@ -60,7 +60,17 @@
"$(EPOCROOT)/epoc32/ost_dictionaries/test_TC_0x1000008d_Dictionary.xml",
"$(EPOCROOT)/epoc32/include/internal/SymbianTraces/autogen/test_TC_0x1000008d_TraceDefinitions.h"
]
- t.run()
+ t.run("linux")
+ if t.result == CheckWhatSmokeTest.SKIP:
+ t.targets.extend([
+ '$(EPOCROOT)/epoc32/release/armv5/lib/testTC.lib',
+ '$(EPOCROOT)/epoc32/release/armv5/lib/testTC{000a0000}.lib'
+ ])
+ t.stdout.extend([
+ '$(EPOCROOT)/epoc32/release/armv5/lib/testTC.lib',
+ '$(EPOCROOT)/epoc32/release/armv5/lib/testTC{000a0000}.lib'
+ ])
+ t.run("windows")
t.id = "112"