summaryrefslogtreecommitdiffstats
path: root/scripts/qt
diff options
context:
space:
mode:
authorSimo Fält <simo.falt@digia.com>2013-08-20 13:52:29 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-29 11:49:25 +0200
commit04ac80df296160858aef23145a71c74ccdaea9cc (patch)
tree2de41c7b062530644489a170a090d4da5bea33db /scripts/qt
parentddae64503c402fd5a108db2b25549ab6f3b7b36c (diff)
qtqa: Run submodule update for module under test
When fetching all required sources to test one submodule, init-repository script is used for all submodules except for the one being tested. To get its possible submodules as well, we have to run submodule update for it separately. Change-Id: I6f6b79d82faa68fdc8307ae07c8ae1166cf0404c Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'scripts/qt')
-rwxr-xr-xscripts/qt/qtmod_test.pl8
1 files changed, 8 insertions, 0 deletions
diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl
index ee090fad..3fa1f58e 100755
--- a/scripts/qt/qtmod_test.pl
+++ b/scripts/qt/qtmod_test.pl
@@ -896,6 +896,14 @@ sub run_git_checkout
}
$self->exe( 'git', 'clone', '--shared', $base_dir, $qt_gitmodule );
+ # run git submodule update for module under test, if there is one for module
+ chdir( $qt_gitmodule );
+ my $res = $self->exe_qx( 'git', 'submodule', 'status');
+ if ($res ne "") {
+ $self->exe( 'git', 'submodule', 'update', '--recursive', '--init' );
+ }
+ # return just in case
+ chdir( $qt_dir );
}
}