diff options
| author | Simo Fält <simo.falt@digia.com> | 2014-07-29 14:07:21 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@digia.com> | 2014-07-31 06:44:13 +0200 |
| commit | 9556d421d1b76a59db66f97dc46c0b103a5a95a2 (patch) | |
| tree | 94edc99d02915c782baa5c382a9e22847b201ee2 /scripts/qt | |
| parent | 8107fb0578ea83eb5e4205700bf856c5f5108d69 (diff) | |
QtQA: Change relative submodule path to absolute path
While using relative submodule paths for modules under test is not
working properly, we can change the path before doing submodule
update.
Change-Id: I7510400cdbbae0bc38ac1922c3729bccf7335845
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'scripts/qt')
| -rwxr-xr-x | scripts/qt/qtmod_test.pl | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/scripts/qt/qtmod_test.pl b/scripts/qt/qtmod_test.pl index e8068fb8..c3676c08 100755 --- a/scripts/qt/qtmod_test.pl +++ b/scripts/qt/qtmod_test.pl @@ -938,6 +938,14 @@ sub run_git_checkout chdir( $qt_gitmodule ); my $res = $self->exe_qx( 'git', 'submodule', 'status'); if ($res ne "") { + # Check the submodules url and make it to point local mirror if it is relative + my $submodule_url = $self->exe_qx('git config -f .gitmodules --get-regexp submodule\..*\.url'); + for (split /^/, $submodule_url) { + my ($submodule, $url) = split / /; + if ($url =~ s/^\.\./qtgitreadonly:qt/) { + $self->exe('git', 'config', $submodule, $url); + } + } $self->exe( 'git', 'submodule', 'update', '--recursive', '--init' ); } # return just in case |