diff options
| author | Simo Fält <simo.falt@digia.com> | 2013-10-07 11:36:43 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-14 07:10:10 +0200 |
| commit | 134f1f4dc0c1b31c4a6fc25a2437c7973a0003a3 (patch) | |
| tree | 690f0b91b81f80de431d0e4bb4c73d494a8cc6bb /scripts/qt | |
| parent | 54dce5d63de2ae6987c49d7ed8c4331066d9f34c (diff) | |
qtqa: Make flaky test mode configurable
There has been a request to disable flaky test plugin. We should
rely the result of initial test run.
Change-Id: I8fa62873ee94b5265d3c572dd734e8fbe451140d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'scripts/qt')
| -rwxr-xr-x | scripts/qt/qtmod_test.pl | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl index f9d2bf04..793cf2ca 100755 --- a/scripts/qt/qtmod_test.pl +++ b/scripts/qt/qtmod_test.pl @@ -195,6 +195,8 @@ my @PROPERTIES = ( => q{arguments to pass to testscheduler, if any; for example, -j4 } . q{to run autotests in parallel}, + q{qt.tests.flaky.enabled} => q{enable flaky test plugin }, + q{qt.tests.flaky_mode} => q{how to handle flaky autotests ("best", "worst" or "ignore")}, q{qt.tests.dir} => q{directory where to run the testplanner and execute tests}, @@ -509,6 +511,7 @@ sub read_and_store_configuration 'qt.tests.args' => \&default_qt_tests_args , 'qt.tests.backtraces' => \&default_qt_tests_backtraces , 'qt.tests.flaky_mode' => q{} , + 'qt.tests.flaky.enabled' => 1 , 'qt.qtqa-tests.enabled' => 0 , 'qt.qtqa-tests.insignificant' => 0 , @@ -1192,6 +1195,7 @@ sub get_testrunner_args my $qt_tests_tee_logs = $self->{ 'qt.tests.tee_logs' }; my $qt_tests_backtraces = $self->{ 'qt.tests.backtraces' }; my $qt_tests_flaky_mode = $self->{ 'qt.tests.flaky_mode' }; + my $qt_tests_flaky_enabled = $self->{ 'qt.tests.flaky.enabled' }; my $qt_tests_testscheduler = $self->{ 'qt.tests.testscheduler' }; my @testrunner_args = ( @@ -1216,10 +1220,13 @@ sub get_testrunner_args } } - # give more info about unstable / flaky tests - push @testrunner_args, '--plugin', 'flaky'; - if ($qt_tests_flaky_mode) { - push @testrunner_args, '--flaky-mode', $qt_tests_flaky_mode; + # enable flaky test plugin + if ($qt_tests_flaky_enabled) { + # give more info about unstable / flaky tests + push @testrunner_args, '--plugin', 'flaky'; + if ($qt_tests_flaky_mode) { + push @testrunner_args, '--flaky-mode', $qt_tests_flaky_mode; + } } if ($qt_coverage_tool) { |