Skip to contentSkip to conversation

archive-source.sh: Clone the submodules locally and add to MAINTAINERS

PATCH In review Philippe Mathieu-Daudé 3 participants 5 messages Jan 24, 2019 – Feb 1, 2019

lore
Share & tools
lore
#0 lore raw

cover archive-source.sh: Clone the submodules locally and add to MAINTAINERS

A minor change to speed up VM testing: clone submodules locally (like we do with the QEMU repository).
Also add the script to MAINTAINERS.

Regards,

Phil.

Philippe Mathieu-Daudé (2):
MAINTAINERS: Add an entry for scripts/archive-source.sh archive-source.sh: Clone the submodules locally

 MAINTAINERS               | 1 +
 scripts/archive-source.sh | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/2 MAINTAINERS: Add an entry for scripts/archive-source.sh

The scripts/archive-source.sh is used by the VM tests, it makes sense to add it in the "Build and test automation" section.

---
 MAINTAINERS | 1 +
 1 file changed, 1 insertion(+)
MAINTAINERS +1 -0
index af339b86db..f7c38848ca 100644
@@ -2479,6 +2479,7 @@ F: scripts/travis/
 F: .shippable.yml
 F: tests/docker/
 F: tests/vm/
+F: scripts/archive-source.sh
 W: https://travis-ci.org/qemu/qemu
 W: https://app.shippable.com/github/qemu/qemu
 W: http://patchew.org/QEMU/
Signature · 1 line
2.20.1
#2 lore raw

PATCH 2/2 archive-source.sh: Clone the submodules locally

In reply to Philippe Mathieu-Daudé

We cloned the QEMU repository from the local storage. Since the submodules are also available there, clone them too. This is quicker and reduce network use.

---
 scripts/archive-source.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)
scripts/archive-source.sh +4 -5
index 62bd22578b..e80c47caa3 100755
@@ -38,6 +38,10 @@ else
 fi
 git clone --shared . "$vroot_dir"
 test $? -ne 0 && error "failed to clone into '$vroot_dir'"
+for sm in $submodules; do
+    git clone --shared "$sm" "$vroot_dir/$sm"
+    test $? -ne 0 && error "failed to clone submodule $sm"
+done
 
 cd "$vroot_dir"
 test $? -ne 0 && error "failed to change into '$vroot_dir'"
@@ -45,11 +49,6 @@ test $? -ne 0 && error "failed to change into '$vroot_dir'"
 git checkout $HEAD
 test $? -ne 0 && error "failed to checkout $HEAD revision"
 
-for sm in $submodules; do
-    git submodule update --init $sm
-    test $? -ne 0 && error "failed to init submodule $sm"
-done
-
 if test -n "$submodules"; then
     {
         git ls-files || error "git ls-files failed"
Signature · 1 line
2.20.1
#3 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 3 lines · Philippe Mathieu-Daudé

A minor change to speed up VM testing: clone submodules locally (like we do with the QEMU repository).
Also add the script to MAINTAINERS.

<snip>

Queued to testing/next, thanks.

--
Alex Bennée

#4 lore raw
In reply to Philippe Mathieu-Daudé
Patchew URL: https://patchew.org/QEMU/[email protected]/

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.

=== TEST SCRIPT BEGIN ===
#!/bin/bash
time make docker-test-mingw@fedora SHOW_ENV=1 J=14 === TEST SCRIPT END ===

The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [http://patchew.org/].
Please send your feedback to [email protected]