projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "New Popup implementation" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
test-harness.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-harness.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-harness.cpp
index
3fed0a2
..
55beebc
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-harness.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-harness.cpp
@@
-42,27
+42,23
@@
int RunTestCase( struct ::testcase_s& testCase )
{
int result = EXIT_STATUS_TESTCASE_FAILED;
{
int result = EXIT_STATUS_TESTCASE_FAILED;
- try
+// dont want to catch exception as we want to be able to get
+// gdb stack trace from the first error
+// by default tests should all always pass with no exceptions
+ if( testCase.startup )
{
{
- if( testCase.startup )
- {
- testCase.startup();
- }
- result = testCase.function();
- if( testCase.cleanup )
- {
- testCase.cleanup();
- }
+ testCase.startup();
}
}
- catch (...)
+ result = testCase.function();
+ if( testCase.cleanup )
{
{
- printf("Caught exception in test case.\n");
- result = EXIT_STATUS_TESTCASE_ABORTED;
+ testCase.cleanup();
}
return result;
}
}
return result;
}
+
int RunTestCaseInChildProcess( struct ::testcase_s& testCase, bool suppressOutput )
{
int testResult = EXIT_STATUS_TESTCASE_FAILED;
int RunTestCaseInChildProcess( struct ::testcase_s& testCase, bool suppressOutput )
{
int testResult = EXIT_STATUS_TESTCASE_FAILED;
@@
-109,14
+105,14
@@
int RunTestCaseInChildProcess( struct ::testcase_s& testCase, bool suppressOutpu
#ifdef WCOREDUMP
if(WCOREDUMP(status))
{
#ifdef WCOREDUMP
if(WCOREDUMP(status))
{
- printf("Test case %s
crashed
\n", testCase.name);
+ printf("Test case %s
failed: due to a crash
\n", testCase.name);
}
#endif
}
#endif
- printf("Test case %s
exited
with signal %s\n", testCase.name, strsignal(WTERMSIG(status)));
+ printf("Test case %s
failed: exit
with signal %s\n", testCase.name, strsignal(WTERMSIG(status)));
}
else if(WIFSTOPPED(status))
{
}
else if(WIFSTOPPED(status))
{
- printf("Test case %s stopped with signal %s\n", testCase.name, strsignal(WSTOPSIG(status)));
+ printf("Test case %s
failed:
stopped with signal %s\n", testCase.name, strsignal(WSTOPSIG(status)));
}
}
return testResult;
}
}
return testResult;