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 "Fixing SVACE error on 3rd party template" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
tct-dali-toolkit-core.cpp
diff --git
a/automated-tests/src/dali-toolkit/tct-dali-toolkit-core.cpp
b/automated-tests/src/dali-toolkit/tct-dali-toolkit-core.cpp
index
87b2f56
..
5e64bd3
100644
(file)
--- a/
automated-tests/src/dali-toolkit/tct-dali-toolkit-core.cpp
+++ b/
automated-tests/src/dali-toolkit/tct-dali-toolkit-core.cpp
@@
-8,8
+8,9
@@
int main(int argc, char * const argv[])
{
int result = TestHarness::EXIT_STATUS_BAD_ARGUMENT;
{
int result = TestHarness::EXIT_STATUS_BAD_ARGUMENT;
- const char* optString = "r";
- bool optRerunFailed(false);
+ const char* optString = "sf";
+ bool optRerunFailed(true);
+ bool optRunSerially(false);
int nextOpt = 0;
do
int nextOpt = 0;
do
@@
-17,8
+18,11
@@
int main(int argc, char * const argv[])
nextOpt = getopt( argc, argv, optString );
switch(nextOpt)
{
nextOpt = getopt( argc, argv, optString );
switch(nextOpt)
{
- case 'r':
- optRerunFailed = true;
+ case 'f':
+ optRerunFailed = false;
+ break;
+ case 's':
+ optRunSerially = true;
break;
case '?':
TestHarness::Usage(argv[0]);
break;
case '?':
TestHarness::Usage(argv[0]);
@@
-29,7
+33,14
@@
int main(int argc, char * const argv[])
if( optind == argc ) // no testcase name in argument list
{
if( optind == argc ) // no testcase name in argument list
{
- result = TestHarness::RunAllInParallel(argv[0], tc_array, optRerunFailed);
+ if( optRunSerially )
+ {
+ result = TestHarness::RunAll( argv[0], tc_array );
+ }
+ else
+ {
+ result = TestHarness::RunAllInParallel( argv[0], tc_array, optRerunFailed );
+ }
}
else
{
}
else
{