support/download/git: log checked out sha1

In preparation to have automated tests for this script, display the checked out sha1 in the build log.

---
Another solution would be to use an environment variable set by the test to print that info, e.g. if [ "1" == "${GIT_DOWNLOAD_AUTOTEST}" ]; then

---
 support/download/git | 6 ++++++
 1 file changed, 6 insertions(+)

index 7921411..7c44c65 100755
@@ -85,6 +85,12 @@ if [ ${recurse} -eq 1 ]; then
     _git submodule update --init --recursive
 fi
 
+# Log the sha1. It can be used for automated tests and debug.
+if [ -z ${verbose} ]; then
+    sha1=$(_git rev-parse HEAD)
+    printf "Checked out '%s'.\n" "${sha1}"
+fi
+
 # We do not need the .git dir; we keep other .git files, in case they
 # are the only files in their directory.
 rm -rf .git

2.9.3

This test assumes:
- it is run from the buildroot base dir;
- there is a ssh server installed;
- there is a key pair to allow the current user to ssh to localhost without being prompted for a password;
- there is no ./.config ./stdout ./package/package;

For each testcase, it creates a new git repo, and then download from this repo using a fake package named 'package'.

---
This test needs some instrumentation in the source code (previous patch) to work properly.

---
 support/download/git                  |   1 +
 test/support/download/git             | 202 ++++++++++++++++++++++++++++++++++
 test/support/download/git_keywords.py |  84 ++++++++++++++
 test/support/download/git_util.py     | 196 +++++++++++++++++++++++++++++++++
 4 files changed, 483 insertions(+)
 create mode 100755 test/support/download/git
 create mode 100755 test/support/download/git_keywords.py
 create mode 100644 test/support/download/git_util.py

index 7c44c65..f7eef15 100755
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+# Please test this script using test/support/download/git
 
 # We want to catch any unexpected failure, and exit immediately
 set -e

2.9.3

All,

On Tue, Nov 01, 2016 at 05:33 PM, Ricardo Martincoski <[email protected]> wrote:

[snip]

WARNING to anyone willing to test this script:
- please test it :)
- but, since it is a experimental script, I recommend to run it in a complete SEPARATE new clone of buildroot in order to avoid any problems if the script behaves poorly in some scenario (I don't want anyone risking to loose any work in progress!). I didn't see any problem in the 2 days I am using it, but it's always better to be safe!

Regards,
Ricardo

So I've taken another look at the tests you created, and it looks like it is
indeed a lot simpler and more effective to create the repo on the fly rather than having a repo checked in into Buildroot. So forget this remark.

Regards,
Arnout

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Arnout,

Right now I will resend this series without the test and later on I will send two follow-up series adding tests already based on the test infra.

The first series will introduce changes and/or new module(s) to the test infra to support the test of the git download script, and also 1 or 2 testcases; The second series will introduce the rest of the testcases.

The advantages of this approach are:
- the tests I wrote works enough for me to reduce the load of manual tests if other improvements are needed in the download script;
- avoid duplicate rework (as the test infra already solves some issues my test has, especially some ugly code);
- avoid duplicate new work (as the test infra already brings features that I need/want to implement, such as the out-of-tree build);
- avoid non-trivial rebase (it is not that complex too, but it takes time) as the infra is currently functional but is right now under stylistic rework;
- the review of each patch/series should become easier.

I think it makes more sense to keep the test and the patch "log checked out sha1" in the same series, so I won't resend that just yet.

On Sat, Nov 05, 2016 at 10:19 PM, Arnout Vandecappelle wrote:

[snip]

A working version is here:
http://git.free-electrons.com/users/thomas-petazzoni/buildroot/?h=runtime-tests
but it is being refactored before merge.

Yes.
Probably will become support/testing/tests/download/test_git.py

[snip]

OK. Probably it can be done about the same way the qemu is started by the test infra.

Something similar (delay the test) is done for qemu in the infra.

[snip]

OK.
The only corner case I found so far regarding the transport protocol is when the remote server does not support smart http/https. In this case any use of --depth is refused (git clone, git fetch) and fallback to a full clone. This case can easily be tested manually:
make defconfig ; make am33x-cm3-source

Indeed. Sorry the wrong comment.

[snip]

OK.
But in the test infra I don't need to write this code :)

I used this because verbosity=2 can only be passed for main() when using at least python 2.7 and I wanted to keep compatibility to 2.6.
But in the test infra I don't need to write this code :)

[snip]

I will use the same testcase style as other tests in test infra.

[snip]

Yes. Another error in my abstraction.

[snip]

[snip]

I will raise an exception.

[snip]

When using the test infra I will use a module.

[snip]

Yes. Much better.

OK.

[snip]

Won't be needed in the test infra, that generates a log for each stage (build, run).

[snip]

I will use the same as in the test infra, that uses subprocess.

[snip]

OK. Fair enough.

[snip]

OK.
I first started to write these tests in a bash script. Some ugly things like this survived the port to python.

This will move to a committed br2-external in the test infra.

I will use the same style as the test infra after stylistic refactor.

Of course it's possible to create a unit test.
But in this case I think the total effort (including maintenance) will be smaller if we keep calling make ...-source.
The test infra is ready to do calls to the main Buildroot makefile.

There are some cases, e.g. package version with slash, that we would need to mimic other scripts in the infra to test the wrapper by itself.

I will use a package in a br2-external.

[snip]

OK.

That I get for free from the test infra.

[snip]

I will point the download directory inside the builddir, so the infra will take care of this for me. BTW the test infra uses shutil.rmtree.

OK.

[snip]

Thanks, much cleaner solution.

[snip]

Indeed. This is the only one I am not sure how I will do in the test infra, but should not be too hard. I will keep this suggestion in mind when rewriting the tests.

[snip]

Will do.
That grep was another ugly code that survived the port from shell script.

Regards,
Ricardo

On 02-12-16 03:34, Ricardo Martincoski wrote:
[snip]

Here's a hint:

import tarfile
with tarfile.open(expected_download) as tf:
files = tf.getnames()
...

Regards,
Arnout

[snip]

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Arnout,

Thank you very much.

Regards,
Ricardo

I've given comments on this patch which I think are important, so I've marked
it as Changes Requested in patchwork. However, patch 3/3 can be committed without this one.

Regards,
Arnout

[snip]

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Hello All

----- Mensagem original -----

Regarding the test comments, i think that part of the proposal is to show the tests written in Given-When-Then format without using nothing more than python and unittest class. Using GWT, it becomes easier to separate the pre-conditions, the operations to be tested, and the results. I think GWT exposes this nicely.

But, i must say that we (at Datacom) accepts both formats to tests, because there are cases where a tabular format is easier, and using GWT is just cumbersome. For instance, testing (ssh, sftp, https) connections is tabular, there is no preparation, and the operation and result comes together.

Another advantage of GWT here is to serve as an example. As buildroot is discussing test infra-structure, the GWT git tests are useful as an example on how to do it with GWT, python and unittest.

Thanks all.

Dr. Henrique Marks
henrique.marks at datacom.ind.br
R. Am?rica, 1000 - Eldorado do Sul - RS
CEP: 92990-000 - Brasil
Fone: +55 51 3933 3000 - Ramal 3466

Yes, it's good to have such an example so other Buildroot developers can get a
feel of it. But I suspect that most Buildroot developers will not find it attractive. Maybe I shouldn't speak for others however :-)

In my experience, the GWT format works well for integration tests because they
are completely black-box, and because the Given and When often hide complicated setups and stubs. For unit tests, however, I don't see them working that well because they tend to be more gray box than black box, and they often involve sequential tests (do this, expect that, then do this, expect that). Doing a when-then-when-then that relies on the sequencing is kind of breaking the concept.

BTW, why do you distinguish GWT from tabular format? I've always used them
combined, like:

Given
Given
----------------------------
+ Foo + Bar + Expect +
----------------------------

+ When   + When   + Then   +
+ When   + When   + Then   +
+ When   + When   + Then   +
+ When   + When   + Then   +

----------------------------

Regards,
Arnout

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

From: Ricardo Martincoski <[email protected]>

Some test cases don't use a full build as setup, so split the build() method into configure() and build().
It allows a test case to perform configuration at the setup stage and the build inside the test itself.

Call this new method just before build in the BRTest base class, to keep the current behavior for existing test cases.

This change will be needed when adding a common class to test the git download infra.

---
Changes v1 -> v2:
- new patch to adapt the test infra to test git download

---
 support/testing/infra/basetest.py | 1 +
 support/testing/infra/builder.py  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

index 431605b23f..d61f4d337b 100644
@@ -57,6 +57,7 @@ class BRTest(unittest.TestCase):
 
         if not self.b.is_finished():
             self.show_msg("Building")
+            self.b.configure()
             self.b.build()
             self.show_msg("Building done")
 

index 905b127c91..e7c8e0102c 100644
@@ -10,7 +10,7 @@ class Builder(object):
         self.builddir = builddir
         self.logfile = infra.open_log_file(builddir, "build", logtofile)
 
-    def build(self):
+    def configure(self):
         if not os.path.isdir(self.builddir):
             os.makedirs(self.builddir)
 

@@ -29,6 +29,7 @@ class Builder(object):
         if ret != 0:
             raise SystemError("Cannot olddefconfig")
 
+    def build(self):
         cmd = ["make", "-C", self.builddir]
         ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile)
         if ret != 0:

2.13.0

From: Ricardo Martincoski <[email protected]>

Make the builder able to call 'VAR1=1 make VAR2=2 target'.

Allow to send extra parameters to be added to the end of make command line. It can be used for these purposes:
- to configure a br2-external, by passing 'BR2_EXTERNAL="dir"';
- to specify a make target, such as 'foo-source'.

Allow to add variables to the environment in which make runs. It can be used for these purposes:
- to override values from environment, such as 'BR2_DL_DIR="dl"';
- to set variables not set in the .mk files (for testing purpose), as FOO_VERSION='1/1', triggering the preprocessing of values.

This change will be needed when adding a common class to test the git download infra.

---
Changes v1 -> v2:
- new patch to adapt the test infra to test git download

---
 support/testing/infra/builder.py | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

index e7c8e0102c..de7c141a76 100644
@@ -10,7 +10,12 @@ class Builder(object):
         self.builddir = builddir
         self.logfile = infra.open_log_file(builddir, "build", logtofile)
 
-    def configure(self):
+    # Configure the build
+    #
+    # makecmdline: a list of arguments to be passed to the make command.
+    # e.g. makecmdline=["BR2_EXTERNAL=/path"]
+    #
+    def configure(self, makecmdline=None):
         if not os.path.isdir(self.builddir):
             os.makedirs(self.builddir)
 

@@ -22,16 +27,36 @@ class Builder(object):
                            "> end defconfig\n")
         self.logfile.flush()
 
-        cmd = ["make",
-               "O={}".format(self.builddir),
-               "olddefconfig"]
+        cmd = ["make", "O={}".format(self.builddir)]
+        if makecmdline:
+            cmd += makecmdline
+        cmd += ["olddefconfig"]
+
         ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile)
         if ret != 0:
             raise SystemError("Cannot olddefconfig")
 
-    def build(self):
+    # Perform the build
+    #
+    # makecmdline: a list of arguments to be passed to the make command. It can
+    # include a make target.
+    # e.g. makecmdline=["foo-source"]
+    #
+    # env: a dict of variables to be appended (or replaced) in the environment
+    # that calls make.
+    # e.g. env={"BR2_DL_DIR": "/path"}
+    #
+    def build(self, makecmdline=None, env=None):
+        buildenv = os.environ.copy()
+        if env:
+            buildenv.update(env)
+
         cmd = ["make", "-C", self.builddir]
-        ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile)
+        if makecmdline:
+            cmd += makecmdline
+
+        ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile,
+                              env=buildenv)
         if ret != 0:
             raise SystemError("Build failed")
 

2.13.0

[snip]

Sorry, += is the same as extend, of course...

Regards,
Arnout

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Hello,

[snip]

OK.

Yes. It's better.

OK.

I will default it to [].

OK.
It also allows me to rename buildenv -> env as you did below.

Indeed. As long we never change this parameter inside the function we are safe and the parameter will always point to the same empty dict, NOT falling in following scenario:

... b[a]=1
... print b
...

{1: 1}

{1: 1, 2: 1}

A completely empty environment won't work because
subprocess.call(..., env={})
is equivalent to calling 'env -i make' in the buildroot directory, it lacks the path to host libraries, for instance.
But we can import only PATH from the environment. I will add a separate patch in the beginning of the series to deal with this while keeping the current -d precedence over BR2_DL_DIR.

Regards,
Ricardo

From: Ricardo Martincoski <[email protected]>

Some test cases can use only the configure step as setup, while the build is part of the test itself.
Allow the caller to build() to override the logfile used. This way all the log for the actual test can be directed to *-run.log.

This change will be needed to make nice logs for git downloader test cases.

---
Changes v1 -> v2:
- new patch to adapt the test infra to test git download

---
 support/testing/infra/builder.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

index de7c141a76..d634c211ac 100644
@@ -46,7 +46,13 @@ class Builder(object):
     # that calls make.
     # e.g. env={"BR2_DL_DIR": "/path"}
     #
-    def build(self, makecmdline=None, env=None):
+    # ovrdlogfile: when the build is part of the actual test case instead of
+    # the setup, this parameter can be used to override the logfile used.
+    # e.g. ovrdlogfile=handler_for_the_run_log
+    #
+    def build(self, makecmdline=None, env=None, ovrdlogfile=None):
+        logfile = ovrdlogfile or self.logfile
+
         buildenv = os.environ.copy()
         if env:
             buildenv.update(env)

@@ -55,7 +61,7 @@ class Builder(object):
         if makecmdline:
             cmd += makecmdline
 
-        ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile,
+        ret = subprocess.call(cmd, stdout=logfile, stderr=logfile,
                               env=buildenv)
         if ret != 0:
             raise SystemError("Build failed")

2.13.0

This feels weird to me. If you need this kind of argument, then there is
something wrong with the logfile member of Builder.

Your explanation here seems to suggest that the only reason to have this is to
split the -build and the -run logs so the -run logs contains something useful for the git tests. I don't think that that's a good enough reason. What's wrong with collecting all the output in the -build log?

But looking at later patches, it looks like you're actually trying to solve a
problem here that a file is opened from two places and they run over each other. If that is the case, I think a better solution needs to be found to handle the log files. Could be as simple as the log file being maintained by the test class itself, and passed as an argument to the Builder functions every time.

Regards,
Arnout

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Hello,

Rethinking now, after your comments, this patch is hackish.

Nothing wrong. I will remove this patch from the series.

That's not the case. I was only trying to get all the "setup" output to -build.log and all the "run" output to -run.log. Silly and not needed.

Regards,
Ricardo

From: Ricardo Martincoski <[email protected]>

Add GitRemote class, that can start a git server in the host machine to emulate a remote git server under the control of the test.

Add a new base class, called GitTestBase, that inherits from BRTest and must be subclassed by all git test cases.
Its setUp() method takes care of configuring the build with a br2-external, avoiding to hit http://sources.buildroot.net by using an empty BR2_BACKUP_SITE. It also avoids downloading not pre-installed dependencies (i.e. lzip) every time by calling 'make dependencies' using the common dl directory, and it instantiates the GitRemote object. Its tearDown() method cleans things up similarly to the one from BRTest.

---
Changes v1 -> v2:
- use git daemon + git:// instead of ssh (Arnout);
- remove __main__ handling since the test infra already does that;
- use the logging support from test infra;
- this patch is part of series 1/3 of a new version of

    http://patchwork.ozlabs.org/patch/690097/
---
 support/testing/tests/download/__init__.py  |  0
 support/testing/tests/download/gitbase.py   | 41 +++++++++++++++++++++++
 support/testing/tests/download/gitremote.py | 50 +++++++++++++++++++++++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 support/testing/tests/download/__init__.py
 create mode 100644 support/testing/tests/download/gitbase.py
 create mode 100644 support/testing/tests/download/gitremote.py

new file mode 100644
index 0000000000..e69de29bb2

2.13.0

I would personally have split the patches differently: include a very minimal
GitTestBase in the patch that adds the hash tests, then extend it with features needed for the later tests.

These empty __init__.py files were removed at some point.

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Hello,

Good idea. I will do that.

[snip]

Sorry. I did not understand what you meant.

[snip]

I will put the support for BR2_EXTERNAL directly in BRTest instead.

I will create a patch for these 2.

OK. Much better this way avoiding code duplication.

I didn't know that! In my everyday use I always passed a make variable. The example in the manual does the same so I will keep it.

I will create a patch for this.

This code matters when running the tests in a local machine. I will add this info to the comment.

Er... I don't see such code on Emulator.
But anyway... I will move to __init__. Few lines of code can removed this way.

OK.

[snip]

I will remove it, it will not be needed.

Regards,
Ricardo

My mistake, I was confusing with another project where we used to have empty
__init__.py files everywhere but we removed them again because they turned out not to be needed. But in that project we use dynamic loading with importlib.import_module, that's why they could be removed.

[snip]

Er, I don't know what I was thinking... I must have been tired when writing
this mail :-)

Maybe that is not such a good idea after all... I think __init__ is still
called when you do run-tests -l, but we don't want the git server to be started in that case.

Regards,
Arnout

[snip]

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Hello,

[snip]

Indeed __init__ is called when running run-tests -l for all classes that inherits from unittest.TestCase, but since in this case GitRemote is instantiated from GitTestBase.setUp it is safe to start the server in GitRemote.__init__ so I will do that.

Regards,
Ricardo

From: Ricardo Martincoski <[email protected]>

Add three test cases for hash of a git package:
- correct hash;
- wrong hash;
- no hash file.

Besides the Python script, add some fixtures used during the tests:
- a br2-external (git-hash) with one package for each test case;
- a static git bare repo (repo.git) to be served using GitRemote class for all these test cases.

Neither the br2-external nor the check hash functionalities are the subject of these tests per se, so for simplicity limit the check to the error codes and don't look for the messages in the log.

Thanks to Arnout for the hint about how to add a bare repo to test.

---
Changes v1 -> v2:
- new patch

---
 .gitlab-ci.yml                                     |   3 ++
 .../tests/download/br2-external/git-hash/Config.in |   0
 .../download/br2-external/git-hash/external.desc   |   1 +
 .../download/br2-external/git-hash/external.mk     |   1 +
 .../br2-external/git-hash/package/bad/bad.hash     |   1 +
 .../br2-external/git-hash/package/bad/bad.mk       |  12 ++++++++
 .../br2-external/git-hash/package/good/good.hash   |   1 +
 .../br2-external/git-hash/package/good/good.mk     |  12 ++++++++
 .../br2-external/git-hash/package/nohash/nohash.mk |  12 ++++++++
 .../download/git-remote/repo.git/.gitattributes    |   1 +
 .../tests/download/git-remote/repo.git/HEAD        |   1 +
 .../tests/download/git-remote/repo.git/config      |   4 +++
 .../12/33c8f882d130978246a30da75892321f13e5bb      | Bin 0 -> 49 bytes
 .../74/46f8dab6cdb166aaf130aa88633dc627a4e8ad      | Bin 0 -> 153 bytes
 .../8e/27be7d6154a1f68ea9160ef0e18691d20560dc      | Bin 0 -> 20 bytes
 .../download/git-remote/repo.git/refs/heads/master |   1 +
 support/testing/tests/download/test_git_hash.py    |  34 +++++++++++++++++++++
 17 files changed, 84 insertions(+)
 create mode 100644 support/testing/tests/download/br2-external/git-hash/Config.in
 create mode 100644 support/testing/tests/download/br2-external/git-hash/external.desc
 create mode 100644 support/testing/tests/download/br2-external/git-hash/external.mk
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/bad/bad.mk
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/good/good.hash
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/good/good.mk
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/nohash/nohash.mk
 create mode 100644 support/testing/tests/download/git-remote/repo.git/.gitattributes
 create mode 100644 support/testing/tests/download/git-remote/repo.git/HEAD
 create mode 100644 support/testing/tests/download/git-remote/repo.git/config
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/12/33c8f882d130978246a30da75892321f13e5bb
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/74/46f8dab6cdb166aaf130aa88633dc627a4e8ad
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/8e/27be7d6154a1f68ea9160ef0e18691d20560dc
 create mode 100644 support/testing/tests/download/git-remote/repo.git/refs/heads/master
 create mode 100644 support/testing/tests/download/test_git_hash.py

index fb50692976..98022b6d7f 100644
@@ -219,6 +219,9 @@ tests.core.test_rootfs_overlay.TestRootfsOverlay: *runtime_test
 tests.core.test_timezone.TestGlibcAllTimezone: *runtime_test
 tests.core.test_timezone.TestGlibcNonDefaultLimitedTimezone: *runtime_test
 tests.core.test_timezone.TestNoTimezone: *runtime_test
+tests.download.test_git_hash.TestGitBadHash: *runtime_test
+tests.download.test_git_hash.TestGitGoodHash: *runtime_test
+tests.download.test_git_hash.TestGitNoHash: *runtime_test
 tests.fs.test_ext.TestExt2: *runtime_test
 tests.fs.test_ext.TestExt2r1: *runtime_test
 tests.fs.test_ext.TestExt3: *runtime_test

new file mode 100644
index 0000000000..e69de29bb2

new file mode 100644
index 0000000000..41316c8b25
@@ -0,0 +1 @@
+name: GIT_HASH

new file mode 100644
index 0000000000..b69746e06e
@@ -0,0 +1 @@
+include $(sort $(wildcard $(BR2_EXTERNAL_GIT_HASH_PATH)/package/*/*.mk))

new file mode 100644
index 0000000000..90bfb63085
@@ -0,0 +1 @@
+sha256  0000000000000000000000000000000000000000000000000000000000000000  bad-7446f8dab6cdb166aaf130aa88633dc627a4e8ad.tar.gz

new file mode 100644
index 0000000000..2ad06fa47f
@@ -0,0 +1,12 @@
+################################################################################
+#
+# bad
+#
+################################################################################
+
+BAD_VERSION = 7446f8dab6cdb166aaf130aa88633dc627a4e8ad
+# Get the git server port number from the test infra
+GITREMOTE_PORT_NUMBER ?= 9418
+BAD_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git
+
+$(eval $(generic-package))

new file mode 100644
index 0000000000..ccb2efbffe
@@ -0,0 +1 @@
+sha256  9302294b11ac6742c97eec6b7fd677fc3ac79b3f9348fbb1a46ba3ccb5287f9f  good-7446f8dab6cdb166aaf130aa88633dc627a4e8ad.tar.gz

new file mode 100644
index 0000000000..0e82e0e6c6
@@ -0,0 +1,12 @@
+################################################################################
+#
+# good
+#
+################################################################################
+
+GOOD_VERSION = 7446f8dab6cdb166aaf130aa88633dc627a4e8ad
+# Get the git server port number from the test infra
+GITREMOTE_PORT_NUMBER ?= 9418
+GOOD_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git
+
+$(eval $(generic-package))

new file mode 100644
index 0000000000..4e3943211c
@@ -0,0 +1,12 @@
+################################################################################
+#
+# nohash
+#
+################################################################################
+
+NOHASH_VERSION = 7446f8dab6cdb166aaf130aa88633dc627a4e8ad
+# Get the git server port number from the test infra
+GITREMOTE_PORT_NUMBER ?= 9418
+NOHASH_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git
+
+$(eval $(generic-package))

new file mode 100644
index 0000000000..eb50c64a21
@@ -0,0 +1 @@
+objects/*/* binary

new file mode 100644
index 0000000000..cb089cd89a
@@ -0,0 +1 @@
+ref: refs/heads/master

new file mode 100644
index 0000000000..07d359d07c
@@ -0,0 +1,4 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true

new file mode 100644
index 0000000000000000000000000000000000000000..9f711b51ca36f85619d9cff0226e163f84a9d232
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..f25a70acdb1fe93d61fa64cee624b3eaee653adf
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..a8e78a9d1b29e6afe9554cd3ac26c33ab697b782
GIT binary patch

new file mode 100644
index 0000000000..0180a4d15f
@@ -0,0 +1 @@
+7446f8dab6cdb166aaf130aa88633dc627a4e8ad

new file mode 100644
index 0000000000..1d483844fa
@@ -0,0 +1,34 @@
+import os
+
+import infra
+from gitbase import GitTestBase
+
+
+class TestGitHash(GitTestBase):
+    br2_external = infra.filepath("tests/download/br2-external/git-hash")
+    serveddir = infra.filepath("tests/download/git-remote")
+
+    def check_hash(self, package):
+        # store downloaded tarball inside the output dir so the test infra
+        # cleans it up@the end
+        env = {"BR2_DL_DIR": os.path.join(self.builddir, "dl"),
+               "GITREMOTE_PORT_NUMBER": str(self.gitremote.port)}
+        self.b.build(["{}-dirclean".format(package),
+                      "{}-source".format(package)],
+                     env, self.logfile)
+
+
+class TestGitGoodHash(TestGitHash):
+    def test_run(self):
+        self.check_hash("good")
+
+
+class TestGitBadHash(TestGitHash):
+    def test_run(self):
+        with self.assertRaises(SystemError):
+            self.check_hash("bad")
+
+
+class TestGitNoHash(TestGitHash):
+    def test_run(self):
+        self.check_hash("nohash")

2.13.0

Hello,

This patch didn't get to mailing list.
I guess it is because of binary files added.

Did I miss something to properly send this?

Anyway it can be seen here:
https://gitlab.com/RicardoMartincoski/buildroot/commit/32611754f77a17dbbfae26e10da55300ebea0b83

Regards,
Ricardo

Hi Ricardo,

I got this patch from the list. It is also archived at
http://lists.busybox.net/pipermail/buildroot/2017-August/200933.html.

baruch

     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

Regards,
Arnout

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Darn, I was too quick with my Rev-by tag...

On 27-08-17 00:20, Ricardo Martincoski wrote:
[snip]

[snip]

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Hello,

OK, I will remove it.

OK.

Regards,
Ricardo

From: Ricardo Martincoski <[email protected]>

Add a test to download the package with git method and its version set to a sha1 reachable by a branch name, but not pointed by it. This is the most common use case for git refs in the tree.

Besides the test case Python script, add:
- a br2-external (git-refs) with a fake package (foo) as a fixture for this and upcoming tests;
- support in GitTestBase for repos created on the fly;
- a new class GitRepo to create and manipulate repos. It is a class and not a simple module because it will become very useful when testing submodules.

After the download, compare the tarball to a checkout of the original remote repo.

---
Changes v1 -> v2:
- rename the main test file to testgit (Arnout). Actually I broke it down to a common gitbase and the two test_git_refs and test_git_hash (this last one is new, in the previous patch);
- remove some weird/wrong TODO I had in v1 code (Arnout);
- use the same structure for test cases as used in the test infra;
- raise an exception when the download fails (Arnout). I did not add

    code for this since I let the builder class to raise it;
  - I reimplemented git_util as gitrepo. Arnout suggested to use it as
    module and I first implemented that way locally, but then I created
    test cases for submodules and I realized now I have a reason to use
    a class (see next patch);
  - move package (now called foo) to a BR2_EXTERNAL (Arnout);
  - override BR2_DL_DIR when calling make (Arnout);
  - the test infra uses O= so I don't need to;
  - instead of removing the files in the dl/ folder, use a different dir
    as dl/ dir since now each repo has a different name;
  - open the tarball to check its contents (Arnout). I create a fresh
    clone of the repo before the test to compare against;
  - this patch is not checking for the actual sha1 anymore, it can be
    done later. But the check for the contents should cover most cases;
  - my old argument to not test only the support/download/dl-wrapper is
    not valid anymore since I mimic the logic from the scripts to know
    the name of the tarball. But I still think calling make ...-source
    has better maintenance. And also the previous patch (test for hash
    of packages with git method) can use the same base class;
  - this patch is part of series 1/3 of a new version of
    http://patchwork.ozlabs.org/patch/690097/
---
 .gitlab-ci.yml                                     |  1 +
 .../tests/download/br2-external/git-refs/Config.in |  0
 .../download/br2-external/git-refs/external.desc   |  1 +
 .../download/br2-external/git-refs/external.mk     |  1 +
 .../br2-external/git-refs/package/foo/foo.mk       | 13 +++
 support/testing/tests/download/gitbase.py          | 13 +++
 support/testing/tests/download/gitrepo.py          | 82 ++++++++++++++++++
 support/testing/tests/download/test_git_refs.py    | 96 ++++++++++++++++++++++
 8 files changed, 207 insertions(+)
 create mode 100644 support/testing/tests/download/br2-external/git-refs/Config.in
 create mode 100644 support/testing/tests/download/br2-external/git-refs/external.desc
 create mode 100644 support/testing/tests/download/br2-external/git-refs/external.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/foo/foo.mk
 create mode 100644 support/testing/tests/download/gitrepo.py
 create mode 100644 support/testing/tests/download/test_git_refs.py

index 98022b6d7f..6d64a2c0b6 100644
@@ -222,6 +222,7 @@ tests.core.test_timezone.TestNoTimezone: *runtime_test
 tests.download.test_git_hash.TestGitBadHash: *runtime_test
 tests.download.test_git_hash.TestGitGoodHash: *runtime_test
 tests.download.test_git_hash.TestGitNoHash: *runtime_test
+tests.download.test_git_refs.TestGitSha1InsideBranch: *runtime_test
 tests.fs.test_ext.TestExt2: *runtime_test
 tests.fs.test_ext.TestExt2r1: *runtime_test
 tests.fs.test_ext.TestExt3: *runtime_test

new file mode 100644
index 0000000000..e69de29bb2

new file mode 100644
index 0000000000..69f40d46c6
@@ -0,0 +1 @@
+name: GIT_REFS

new file mode 100644
index 0000000000..de1aad635f
@@ -0,0 +1 @@
+include $(sort $(wildcard $(BR2_EXTERNAL_GIT_REFS_PATH)/package/*/*.mk))

new file mode 100644
index 0000000000..01c926e177
@@ -0,0 +1,13 @@
+################################################################################
+#
+# foo
+#
+################################################################################
+
+# Get all the data from the test infra
+FOO_VERSION ?= 0
+GITREMOTE_PORT_NUMBER ?= 9418
+GITREMOTE_REPO ?= repo.git
+FOO_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/$(GITREMOTE_REPO)
+
+$(eval $(generic-package))

index b259914c77..b70e6400bc 100644
@@ -1,6 +1,9 @@
+import os
+
 import infra.basetest
 from infra.builder import Builder
 from gitremote import GitRemote
+from gitrepo import GitRepo
 
 
 class GitTestBase(infra.basetest.BRTest):

@@ -9,6 +12,7 @@ class GitTestBase(infra.basetest.BRTest):
         BR2_BACKUP_SITE=""
         """
     br2_external = None
+    repo = None
     serveddir = None
     gitremote = None
     logfile = None

@@ -27,6 +31,15 @@ class GitTestBase(infra.basetest.BRTest):
             # time a test runs
             self.b.build(["dependencies"])
 
+        # for the case we are dinamically creating repos
+        if self.serveddir is None:
+            # place the repo in the images/ dir so it appears as an artifact
+            # when the test runs in gitlab infra
+            self.serveddir = os.path.join(self.builddir, "images")
+            if not os.path.exists(self.serveddir):  # for run-tests -k
+                os.mkdir(self.serveddir)
+            self.repo = GitRepo(self.builddir, self.serveddir, self.logtofile)
+
         self.gitremote = GitRemote(self.builddir, self.serveddir,
                                    self.logtofile)
         # send output from the test to the logfile created by GitRemote

2.13.0

I'd use a more descriptive name than foo, e.g. git-refs.mk

So why do you suddenly need to create repos on the fly now? I still believe it
is much simpler to include the repo directly. I also think it's easier if the same repo is used for all git tests - which should be possible, I think.

Regards,
Arnout

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Hello,

OK. In order to use a static repo I will create one package for each ref type to check so I can have hashes for each tarball so I don't need to manually open the tarball to know it is OK. But I will keep the tip for "more descriptive name" in mind while creating the packages.

Fair enough. I will switch to a single static repo in the next spin.

Regards,
Ricardo

From: Ricardo Martincoski <[email protected]>

Add a test that downloads a git package with recursive submodules.

Add the required support in the GitRepo class.

Use the br2-external added by the first test.

---
Changes v1 -> v2:
- rewrite using new git test infra;
- this patch is part of series 1/3 of a new version of

    http://patchwork.ozlabs.org/patch/690097/
---
 .gitlab-ci.yml                                  |  1 +
 support/testing/tests/download/gitrepo.py       | 35 +++++++++++++++++++--
 support/testing/tests/download/test_git_refs.py | 42 +++++++++++++++++++++----
 3 files changed, 70 insertions(+), 8 deletions(-)

index 6d64a2c0b6..c782f66d5d 100644
@@ -222,6 +222,7 @@ tests.core.test_timezone.TestNoTimezone: *runtime_test
 tests.download.test_git_hash.TestGitBadHash: *runtime_test
 tests.download.test_git_hash.TestGitGoodHash: *runtime_test
 tests.download.test_git_hash.TestGitNoHash: *runtime_test
+tests.download.test_git_refs.TestGitRecursiveSubmodule: *runtime_test
 tests.download.test_git_refs.TestGitSha1InsideBranch: *runtime_test
 tests.fs.test_ext.TestExt2: *runtime_test
 tests.fs.test_ext.TestExt2r1: *runtime_test

index 47bdba1b7c..5940f94522 100644
@@ -8,8 +8,12 @@ import infra
 class GitRepo(object):
 
     def __init__(self, builddir, serveddir, logtofile):
+        self.builddir = builddir
+        self.serveddir = serveddir
+        self.logtofile = logtofile
         self.logfile = infra.open_log_file(builddir, "run", logtofile)
         self.remotedir = tempfile.mkdtemp(dir=serveddir)
+        self.submodule = None
 
     # Run a git command in the emulated remote repo
     def _git(self, git_cmd):

@@ -64,19 +68,46 @@ class GitRepo(object):
         self._git(["checkout", "-f", ref])
         return self._sha1()
 
+    def git_submodule(self, recurse=1):
+        if recurse < 1:
+            return self.git_commit()
+
+        self.submodule = GitRepo(self.builddir, self.serveddir, self.logtofile)
+        d = self.submodule.git_init()
+        ref = self.submodule.git_submodule(recurse - 1)
+
+        # make submodule commit reachable by a branch but not@its head
+        self.submodule.git_commit()
+        self.submodule.git_branch("anybranch")
+        self.submodule.git_checkout(ref)
+
+        self._git(["submodule", "add",
+                   os.path.join("..", os.path.basename(d))])
+        self._git(["commit", "-m", os.path.basename(d)])
+        return self._sha1()
+
     # Create a fresh clone of the repo to be compared to the tarball.
     # For simplicity, create this copy inside the repo itself, so all go away
     # when the test ends (when run-tests is called without -k).
-    def create_a_copy_to_compare(self):
-        self._git(["clone", self.remotedir, "copy"])
+    def create_a_copy_to_compare(self, submodules):
+        if submodules:
+            self._git(["clone", "--recursive", self.remotedir, "copy"])
+        else:
+            self._git(["clone", self.remotedir, "copy"])
         return os.path.join(self.remotedir, "copy")
 
     # Move HEAD of emulated remote away from desired commit to avoid false OK
     # when the reference under test cannot be fetched but HEAD can.
     def move_head_away_from_ref_under_test(self):
         self.git_checkout("master")
+        if self.submodule:
+            self.submodule.move_head_away_from_ref_under_test()
 
     # For debug purposes, dump to the log a nice ascii art of all commits in
     # the repo, including the short sha1, commit title and the refs.
     def save_git_tree_to_log(self):
         self._git(["log", "--all", "--oneline", "--graph", "--decorate"])
+        # don't use 'git submodule foreach', it only works as expected if the
+        # desired sha1 (that contains the submodule) is checked out
+        if self.submodule:
+            self.submodule.save_git_tree_to_log()

2.13.0

I believe you might respin this series soonish, so time to review it :-)

BTW, when you do respin, could you push it to a gitlab clone, trigger the
build, and report the result in your cover letter?

It would be nice though to have an example of its use earlier in the series.

Regards,
Arnout

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF

Hello,

Thank you very much for reviewing the series.
Sorry for the long delay.

Sure. I will do.

[snip]

The only reason I won't keep it is because the rebase is not trivial (automatic) after I add the new patch "call make with empty env" to the beginning of the series.

It will have a use (but not a complete example) when I add the new patch "split runtime test from BRTest"

Regards,
Ricardo

Hello,

This is a new iteration of the series that first adds automated tests for the git download infra and then rewrites the script to use git fetch.

The first 5 patches prepare the test infra to have the git test cases. Patch 6 adds a test case that ensures hash checking is enabled for git packages. The last 3 patches add a test case that checks each type of git ref can be used as version of a git package.

Changes v2 -> v3:
- remove patch not needed "allow to override logfile";
- add support for br2-external to the base test class;
- call make from test infra with empty env;
- split the runtime test from the base test class;
- use static repo to test git download;
- use a single test case for git hash and a single test case for git refs because both do not take long to run and each do test a feature that needs all checks to pass to be considered OK;

Changes v1 -> v2:
- use test infra for the tests;
- split the patch of the download script;
- remove patch "log checked out sha1" as it is not needed when using the test infra (maybe it can be resent later as an improvement);

The detailed changelog is part of each patch.
Here I include an overview of the series history:

v1 had these patches:
support/download/git: log checked out sha1
test/support/download/git: new test
support/download/git: do not use git clone

For the next iterations I split the series in 3:
- s1/3: tests 1/2 (test infra and 2 test cases)
- s2/3: tests 2/2 (rest of the test cases)
- s3/3: changes to the git download infra

s3/3 v2 - the test infra was not merged yet at the time of sending, so I did not include the tests:
support/download/git: do not use git clone
support/download/git: optimized download of sha1
DEVELOPERS: add entry for support/download/git
[RFC] support/download/git: shallow fetch of all branches

s1/3 v2 - rewrite using the test infra:
testing/infra/builder: split configure() from build() testing/infra/builder: build with target and environment testing/infra/builder: allow to override logfile testing/tests/download: add infra for git tests testing/tests/download: add git hash tests testing/tests/download: add test for sha1 as git ref testing/tests/download: add test for git submodule

CURRENT s1/3 v3 - rewrite using static repo:
testing/infra/builder: call make with empty env testing/infra/builder: split configure() from build() testing/infra/builder: build with target and environment testing/infra: split runtime test from BRTest testing/infra/basetest: support br2-external testing/tests/download: add git hash test testing/tests/download: test case for git refs testing/tests/download: test git branch testing/tests/download: test git submodules
You can see a run in this gitlab url:
https://gitlab.com/RicardoMartincoski/buildroot/pipelines/13324257

upcoming s2/3 v3 - rewrite using the test infra and a static repo:
testing/tests/download: test git tag testing/tests/download: test git tag/branch precedence testing/tests/download: test git special ref testing/tests/download: test git branch with slash

upcoming s3/3 v3 - I know this series or 'git cache' will need to rebase in the top of the other:
DEVELOPERS: add entry for support/download/git support/download/git: do not use git clone testing/tests/download: test sha1 of special ref support/download/git: optimized download of sha1 support/download/git: shallow fetch of all branches

Regards,
Ricardo

Ricardo Martincoski (9):
testing/infra/builder: call make with empty env testing/infra/builder: split configure() from build() testing/infra/builder: build with target and environment testing/infra: split runtime test from BRTest testing/infra/basetest: support br2-external testing/tests/download: add git hash test testing/tests/download: test case for git refs testing/tests/download: test git branch testing/tests/download: test git submodules

 .gitlab-ci.yml                                     |   2 +
 support/testing/infra/basetest.py                  |  16 +++---
 support/testing/infra/builder.py                   |  45 +++++++++++++++--
 support/testing/infra/runtimetest.py               |  23 +++++++++
 support/testing/run-tests                          |   1 -
 support/testing/tests/core/test_post_scripts.py    |   3 +-
 support/testing/tests/core/test_rootfs_overlay.py  |   3 +-
 support/testing/tests/core/test_timezone.py        |   7 +--
 support/testing/tests/download/__init__.py         |   0
 .../tests/download/br2-external/git-hash/Config.in |   0
 .../download/br2-external/git-hash/external.desc   |   1 +
 .../download/br2-external/git-hash/external.mk     |   4 ++
 .../br2-external/git-hash/package/bad/bad.hash     |   1 +
 .../br2-external/git-hash/package/bad/bad.mk       |  10 ++++
 .../br2-external/git-hash/package/good/good.hash   |   1 +
 .../br2-external/git-hash/package/good/good.mk     |  10 ++++
 .../br2-external/git-hash/package/nohash/nohash.mk |  10 ++++
 .../tests/download/br2-external/git-refs/Config.in |   0
 .../download/br2-external/git-refs/external.desc   |   1 +
 .../download/br2-external/git-refs/external.mk     |   4 ++
 .../git-refs/package/git-branch/git-branch.hash    |   2 +
 .../git-refs/package/git-branch/git-branch.mk      |  11 +++++
 .../git-partial-sha1-branch-head.hash              |   2 +
 .../git-partial-sha1-branch-head.mk                |  11 +++++
 .../git-partial-sha1-reachable-by-branch.hash      |   2 +
 .../git-partial-sha1-reachable-by-branch.mk        |  11 +++++
 .../git-sha1-branch-head/git-sha1-branch-head.hash |   2 +
 .../git-sha1-branch-head/git-sha1-branch-head.mk   |  11 +++++
 .../git-sha1-reachable-by-branch.hash              |   2 +
 .../git-sha1-reachable-by-branch.mk                |  11 +++++
 .../git-submodule-disabled.hash                    |   2 +
 .../git-submodule-disabled.mk                      |  11 +++++
 .../git-submodule-enabled.hash                     |   3 ++
 .../git-submodule-enabled/git-submodule-enabled.mk |  28 +++++++++++
 .../git-wrong-content/git-wrong-content.hash       |   2 +
 .../package/git-wrong-content/git-wrong-content.mk |  11 +++++
 .../package/git-wrong-sha1/git-wrong-sha1.mk       |  11 +++++
 .../git-remote/refs-sub1.git/.gitattributes        |   1 +
 .../tests/download/git-remote/refs-sub1.git/HEAD   |   1 +
 .../tests/download/git-remote/refs-sub1.git/config |   4 ++
 .../07/cabc655213bdf7087d8dd50fda95124e935570      | Bin 0 -> 22 bytes
 .../1d/f823cb8a6d1866148ae50a8009762a9c4c777f      | Bin 0 -> 180 bytes
 .../7d/52f458bdb0f9f5a4beb46fa82824421b8b988e      | Bin 0 -> 65 bytes
 .../99/f2e3e1cb15f9b52fa29f66d380dda061d917ab      | Bin 0 -> 49 bytes
 .../a1/30af1626bbadd64841b2cbcb6ac4ed0638ba1a      | Bin 0 -> 122 bytes
 .../bc/c81ba6e5bd8bf52c95688ae8d3e697e131fa23      | Bin 0 -> 22 bytes
 .../cb/545facf77bbc5f24f95b6d503c338d10b7b717      | Bin 0 -> 151 bytes
 .../dd/130f6f4629514adaf2e03407f3ed9344eb6cd6      | Bin 0 -> 122 bytes
 .../e7/9c5e8f964493290a409888d5413a737e8e5dd5      | Bin 0 -> 23 bytes
 .../f8/001e5780100962a5e30a25cbc4c9609cfc7bf3      | Bin 0 -> 184 bytes
 .../git-remote/refs-sub1.git/refs/heads/submodule  |   1 +
 .../git-remote/refs-sub2.git/.gitattributes        |   1 +
 .../tests/download/git-remote/refs-sub2.git/HEAD   |   1 +
 .../tests/download/git-remote/refs-sub2.git/config |   4 ++
 .../0a/846af45c3e455789435f49f80d70e86b65b9d7      | Bin 0 -> 22 bytes
 .../0b/32ebd8fc52cec991f18c94be980e85a8341585      | Bin 0 -> 22 bytes
 .../32/d61bae693af7879da63b89a60d3ae67f851e56      | Bin 0 -> 151 bytes
 .../3e/9b0a5198c64cea9c00f820433411e3b4d50c1c      | Bin 0 -> 48 bytes
 .../85/8f666af75b7c0dfba6b8be7eac5f196e7a1221      | Bin 0 -> 49 bytes
 .../99/f2e3e1cb15f9b52fa29f66d380dda061d917ab      | Bin 0 -> 49 bytes
 .../cd/4d62ff218ab7b4a04f5bfdf800ace087af3ceb      | Bin 0 -> 184 bytes
 .../e7/9c5e8f964493290a409888d5413a737e8e5dd5      | Bin 0 -> 23 bytes
 .../e8/3f6f805bd016b90acafc8702c52d778eb57310      | Bin 0 -> 182 bytes
 .../git-remote/refs-sub2.git/refs/heads/submodule  |   1 +
 .../download/git-remote/repo.git/.gitattributes    |   1 +
 .../tests/download/git-remote/repo.git/HEAD        |   1 +
 .../tests/download/git-remote/repo.git/config      |   4 ++
 .../0b/d8ceb961c3b2b210f64a67d57f4b5cd669d343      | Bin 0 -> 22 bytes
 .../11/93ff46343f4f6a0522e2b28b871e905178c1f0      | Bin 0 -> 23 bytes
 .../25/59d83bfe937fc0412d96ed664663c9e8a99055      | Bin 0 -> 22 bytes
 .../2f/a37f6885d7eb746df75eccaddbacf3ac82799d      | Bin 0 -> 180 bytes
 .../31/7406308d9259e2231bd0d6ddad3de3832bce08      | Bin 0 -> 182 bytes
 .../34/d1da713bf7de1c535e1d7d3ca985afd84bc7e5      | Bin 0 -> 23 bytes
 .../68/c197d0879d485f4f6cee85544722b79e68e59f      | Bin 0 -> 184 bytes
 .../8b/8a7e885a041da72b1ee9a47c5b9300b172a9e7      | Bin 0 -> 65 bytes
 .../99/f2e3e1cb15f9b52fa29f66d380dda061d917ab      | Bin 0 -> 49 bytes
 .../a2/38b1dfcd825d47d834af3c5223417c8411d90d      | Bin 0 -> 152 bytes
 .../a9/dbc1e23c45e8e1b88c0448763f54d714eb6f8f      | Bin 0 -> 183 bytes
 .../b2/4b387624edc78d0292a127c43cad9ba97c6232      | Bin 0 -> 49 bytes
 .../d4/e2941d18a63535400476324ddeb7f40164be41      | Bin 0 -> 121 bytes
 .../e2/cfe068f7e5bf4de32ffe1241da53abce9fa89e      | Bin 0 -> 49 bytes
 .../e7/9c5e8f964493290a409888d5413a737e8e5dd5      | Bin 0 -> 23 bytes
 .../fe/74231105841041d5f441e70399d37f0e600aa5      | Bin 0 -> 121 bytes
 .../download/git-remote/repo.git/refs/heads/master |   1 +
 .../git-remote/repo.git/refs/heads/mybranch        |   1 +
 .../git-remote/repo.git/refs/heads/submodule       |   1 +
 support/testing/tests/download/gitbase.py          |  27 +++++++++++
 support/testing/tests/download/gitremote.py        |  52 ++++++++++++++++++++
 support/testing/tests/download/test_git.py         |  54 +++++++++++++++++++++
 support/testing/tests/fs/test_ext.py               |   9 ++--
 support/testing/tests/fs/test_iso9660.py           |   9 ++--
 support/testing/tests/fs/test_jffs2.py             |   3 +-
 support/testing/tests/fs/test_squashfs.py          |   3 +-
 support/testing/tests/fs/test_ubi.py               |   3 +-
 support/testing/tests/fs/test_yaffs2.py            |   3 +-
 support/testing/tests/init/base.py                 |   3 +-
 support/testing/tests/package/test_dropbear.py     |   3 +-
 support/testing/tests/package/test_python.py       |   3 +-
 support/testing/tests/toolchain/test_external.py   |   3 +-
 99 files changed, 436 insertions(+), 37 deletions(-)
 create mode 100644 support/testing/infra/runtimetest.py
 create mode 100644 support/testing/tests/download/__init__.py
 create mode 100644 support/testing/tests/download/br2-external/git-hash/Config.in
 create mode 100644 support/testing/tests/download/br2-external/git-hash/external.desc
 create mode 100644 support/testing/tests/download/br2-external/git-hash/external.mk
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/bad/bad.mk
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/good/good.hash
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/good/good.mk
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/nohash/nohash.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/Config.in
 create mode 100644 support/testing/tests/download/br2-external/git-refs/external.desc
 create mode 100644 support/testing/tests/download/br2-external/git-refs/external.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-branch/git-branch.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-branch/git-branch.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-wrong-sha1/git-wrong-sha1.mk
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/.gitattributes
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/HEAD
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/config
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/07/cabc655213bdf7087d8dd50fda95124e935570
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/1d/f823cb8a6d1866148ae50a8009762a9c4c777f
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/7d/52f458bdb0f9f5a4beb46fa82824421b8b988e
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/a1/30af1626bbadd64841b2cbcb6ac4ed0638ba1a
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/bc/c81ba6e5bd8bf52c95688ae8d3e697e131fa23
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/cb/545facf77bbc5f24f95b6d503c338d10b7b717
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/dd/130f6f4629514adaf2e03407f3ed9344eb6cd6
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/f8/001e5780100962a5e30a25cbc4c9609cfc7bf3
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/refs/heads/submodule
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/.gitattributes
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/HEAD
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/config
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/0a/846af45c3e455789435f49f80d70e86b65b9d7
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/0b/32ebd8fc52cec991f18c94be980e85a8341585
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/32/d61bae693af7879da63b89a60d3ae67f851e56
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/3e/9b0a5198c64cea9c00f820433411e3b4d50c1c
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/85/8f666af75b7c0dfba6b8be7eac5f196e7a1221
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/cd/4d62ff218ab7b4a04f5bfdf800ace087af3ceb
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/e8/3f6f805bd016b90acafc8702c52d778eb57310
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/refs/heads/submodule
 create mode 100644 support/testing/tests/download/git-remote/repo.git/.gitattributes
 create mode 100644 support/testing/tests/download/git-remote/repo.git/HEAD
 create mode 100644 support/testing/tests/download/git-remote/repo.git/config
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/0b/d8ceb961c3b2b210f64a67d57f4b5cd669d343
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/11/93ff46343f4f6a0522e2b28b871e905178c1f0
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/25/59d83bfe937fc0412d96ed664663c9e8a99055
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/2f/a37f6885d7eb746df75eccaddbacf3ac82799d
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/31/7406308d9259e2231bd0d6ddad3de3832bce08
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/34/d1da713bf7de1c535e1d7d3ca985afd84bc7e5
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/68/c197d0879d485f4f6cee85544722b79e68e59f
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/8b/8a7e885a041da72b1ee9a47c5b9300b172a9e7
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/a2/38b1dfcd825d47d834af3c5223417c8411d90d
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/a9/dbc1e23c45e8e1b88c0448763f54d714eb6f8f
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/b2/4b387624edc78d0292a127c43cad9ba97c6232
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/d4/e2941d18a63535400476324ddeb7f40164be41
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/e2/cfe068f7e5bf4de32ffe1241da53abce9fa89e
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/fe/74231105841041d5f441e70399d37f0e600aa5
 create mode 100644 support/testing/tests/download/git-remote/repo.git/refs/heads/master
 create mode 100644 support/testing/tests/download/git-remote/repo.git/refs/heads/mybranch
 create mode 100644 support/testing/tests/download/git-remote/repo.git/refs/heads/submodule
 create mode 100644 support/testing/tests/download/gitbase.py
 create mode 100644 support/testing/tests/download/gitremote.py
 create mode 100644 support/testing/tests/download/test_git.py

2.14.2

From: Ricardo Martincoski <[email protected]>

Use an empty environment when calling make, but import PATH so the buildroot tree under test can find libraries from the host machine.

Since environment variables are now ignored, move the handling of BR2_DL_DIR to the defconfig to keep the current precedence of -d:

    BR2_DL_DIR  | -d DIR   | test downloads   | BR downloads
    ------------+----------+------------------+--------------
    unset       | unset    | [error]          | [error]
    unset       | set      | in $(DIR)        | in $(DIR)
    set         | unset    | in $(BR2_DL_DIR) | in $(BR2_DL_DIR)
    set         | set      | in $(DIR)        | in $(DIR)

---
Changes v2 -> v3:
- new patch
- search for "start with an empty environment" in

    http://patchwork.ozlabs.org/patch/806159/
---
 support/testing/infra/basetest.py | 1 +
 support/testing/infra/builder.py  | 7 +++++--
 support/testing/run-tests         | 1 -
 3 files changed, 6 insertions(+), 3 deletions(-)

index 754922692c..b85e8627fd 100644
@@ -42,6 +42,7 @@ class BRTest(unittest.TestCase):
         self.testname = self.__class__.__name__
         self.builddir = self.outputdir and os.path.join(self.outputdir, self.testname)
         self.emulator = None
+        self.config += '\nBR2_DL_DIR="{}"\n'.format(self.downloaddir)
         self.config += "\nBR2_JLEVEL={}\n".format(self.jlevel)
 
     def show_msg(self, msg):

index 7512339ae1..36f4801a2d 100644
@@ -24,15 +24,18 @@ class Builder(object):
                            "> end defconfig\n")
         self.logfile.flush()
 
+        env = {"PATH": os.environ["PATH"]}
         cmd = ["make",
                "O={}".format(self.builddir),
                "olddefconfig"]
-        ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile)
+        ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile,
+                              env=env)
         if ret != 0:
             raise SystemError("Cannot olddefconfig")
 
         cmd = ["make", "-C", self.builddir]
-        ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile)
+        ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile,
+                              env=env)
         if ret != 0:
             raise SystemError("Build failed")
 

index f8cee09ed1..270e78cff7 100755
@@ -58,7 +58,6 @@ def main():
             return 1
 
     BRTest.downloaddir = os.path.abspath(args.download)
-    os.putenv("BR2_DL_DIR", BRTest.downloaddir)
 
     if args.output is None:
         print "Missing output directory, please use -o/--output"

2.14.2

Hello,

Applied to master, thanks.

Thomas

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

Some test cases don't use a full build as setup, so split the build() method into configure() and build().
It allows a test case to perform configuration at the setup stage and the build inside the test itself.

Call this new method just before build in the BRTest base class, to keep the current behavior for existing test cases.

This change will be needed when adding a common class to test the git download infra.

---
Changes v2 -> v3:
- renumber 1 -> 2;
- rebased after new patch 1 "call make with empty env";
- removed reviewed tag because the rebase over new patch 1 is not

    trivial (automatic);

Changes v1 -> v2:
- new patch to adapt the test infra to test git download

---
 support/testing/infra/basetest.py | 1 +
 support/testing/infra/builder.py  | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

index b85e8627fd..f3f13ad97f 100644
@@ -58,6 +58,7 @@ class BRTest(unittest.TestCase):
 
         if not self.b.is_finished():
             self.show_msg("Building")
+            self.b.configure()
             self.b.build()
             self.show_msg("Building done")
 

index 36f4801a2d..faf1eb1494 100644
@@ -12,7 +12,7 @@ class Builder(object):
         self.builddir = builddir
         self.logfile = infra.open_log_file(builddir, "build", logtofile)
 
-    def build(self):
+    def configure(self):
         if not os.path.isdir(self.builddir):
             os.makedirs(self.builddir)
 

@@ -33,6 +33,8 @@ class Builder(object):
         if ret != 0:
             raise SystemError("Cannot olddefconfig")
 
+    def build(self):
+        env = {"PATH": os.environ["PATH"]}
         cmd = ["make", "-C", self.builddir]
         ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile,
                               env=env)

2.14.2

Hello,

I've applied, but I have a comment, see below.

	self.env = ...

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

Hello,

It is possible to do that.

The next patch on the same series uses .update() so the local "env" is changed.

        env = {"PATH": os.environ["PATH"]}
        env.update(make_extra_env)

Note: I did not tested the code below.

In order to always have a clean environment, we could do in the constructor:

        self.env = {"PATH": os.environ["PATH"]}

And change the methods to:
env = self.env.copy()
env.update(make_extra_env)

Or we assume we will need only PATH from env in the future, and do in the constructor:
self.env_path = os.environ["PATH"]
And change the methods to:
env = self.make_extra_env.copy()
env.update({"PATH": self.env_path})

The access to os.environ should be inexpensive (I did not measured it), so I am not sure it needs to be done. I am not against it either.
At first glance, it seems just more code to me.
Maybe I am missing something.

Regards,
Ricardo

Hello,

Hum, indeed. Let's see what it gives with the next patches, and we can always adjust that kind of details later.

Thanks for your feedback!

Thomas

Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

Make the builder able to call 'VAR1=1 make VAR2=2 target'.

Allow to send extra parameters to be added to the end of make command line. It can be used for these purposes:
- to configure a br2-external, by passing 'BR2_EXTERNAL="dir"';
- to specify a make target, such as 'foo-source'.

Allow to add variables to the environment in which make runs. It can be used to override values from environment, such as 'BR2_DL_DIR="dl"'.

This change will be needed when adding a common class to test the git download infra.

---
Changes v2 -> v3:
- rebase after adding patch 1 to the series, which runs make using an

    empty env;
  - use docstring (Arnout Vandecappelle);
  - use more descriptive parameter names (make_extra_opts,
    make_extra_env) (Arnout Vandecappelle);
  - default make_extra_env to {} and use update() (Arnout
    Vandecappelle);
  - for consistence I did the equivalent to make_extra_opts;
  - for symmetry, use make_extra_env also in the configure() (Arnout
    Vandecappelle);

- remove old example from commit message since using a static repo to test git refs do not need to override _VERSION.

Changes v1 -> v2:
- new patch to adapt the test infra to test git download;

---
 support/testing/infra/builder.py | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

index faf1eb1494..d478c0d212 100644
@@ -12,7 +12,18 @@ class Builder(object):
         self.builddir = builddir
         self.logfile = infra.open_log_file(builddir, "build", logtofile)
 
-    def configure(self):
+    def configure(self, make_extra_opts=[], make_extra_env={}):
+        """
+        Configure the build.
+
+        make_extra_opts: a list of arguments to be passed to the make
+        command.
+        e.g. make_extra_opts=["BR2_EXTERNAL=/path"]
+
+        make_extra_env: a dict of variables to be appended (or replaced)
+        in the environment that calls make.
+        e.g. make_extra_env={"BR2_DL_DIR": "/path"}
+        """
         if not os.path.isdir(self.builddir):
             os.makedirs(self.builddir)
 

@@ -25,17 +36,36 @@ class Builder(object):
         self.logfile.flush()
 
         env = {"PATH": os.environ["PATH"]}
+        env.update(make_extra_env)
+
         cmd = ["make",
-               "O={}".format(self.builddir),
-               "olddefconfig"]
+               "O={}".format(self.builddir)]
+        cmd += make_extra_opts
+        cmd += ["olddefconfig"]
+
         ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile,
                               env=env)
         if ret != 0:
             raise SystemError("Cannot olddefconfig")
 
-    def build(self):
+    def build(self, make_extra_opts=[], make_extra_env={}):
+        """
+        Perform the build.
+
+        make_extra_opts: a list of arguments to be passed to the make
+        command. It can include a make target.
+        e.g. make_extra_opts=["foo-source"]
+
+        make_extra_env: a dict of variables to be appended (or replaced)
+        in the environment that calls make.
+        e.g. make_extra_env={"BR2_DL_DIR": "/path"}
+        """
         env = {"PATH": os.environ["PATH"]}
+        env.update(make_extra_env)
+
         cmd = ["make", "-C", self.builddir]
+        cmd += make_extra_opts
+
         ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile,
                               env=env)
         if ret != 0:

2.14.2

Move the setup of emulator to a new class, RuntimeTestBase, that behaves exactly like BRTest currently does.
It will avoid duplicating code when adding a common class to test the git download infra.

Change all current test cases to use the new class. Do this by first using automatic replace:

$ find support/testing/ -name '*.py' | \
  xargs grep -l BRTest | \
  xargs sed -i \
    -e 's,import infra.basetest,\0\nimport infra.runtimetest,g' \
    -e 's,infra.basetest.BRTest,infra.runtimetest.RuntimeTestBase,g'
and then manually add code to import runtimetest in test_external.py to
avoid this error:
 AttributeError: 'module' object has no attribute 'LoadTestsFailure'
This explicit import was not need before because run-tests imports
BRTest and this is the only test file that do not use the defconfig
fragments from basetest.py in its code.

---
Changes v2 -> v3:
- new patch
- search for "RuntimeTestBase" in

    http://patchwork.ozlabs.org/patch/806161/
---
 support/testing/infra/basetest.py                 | 10 ----------
 support/testing/infra/runtimetest.py              | 23 +++++++++++++++++++++++
 support/testing/tests/core/test_post_scripts.py   |  3 ++-
 support/testing/tests/core/test_rootfs_overlay.py |  3 ++-
 support/testing/tests/core/test_timezone.py       |  7 ++++---
 support/testing/tests/fs/test_ext.py              |  9 +++++----
 support/testing/tests/fs/test_iso9660.py          |  9 +++++----
 support/testing/tests/fs/test_jffs2.py            |  3 ++-
 support/testing/tests/fs/test_squashfs.py         |  3 ++-
 support/testing/tests/fs/test_ubi.py              |  3 ++-
 support/testing/tests/fs/test_yaffs2.py           |  3 ++-
 support/testing/tests/init/base.py                |  3 ++-
 support/testing/tests/package/test_dropbear.py    |  3 ++-
 support/testing/tests/package/test_python.py      |  3 ++-
 support/testing/tests/toolchain/test_external.py  |  3 ++-
 15 files changed, 57 insertions(+), 31 deletions(-)
 create mode 100644 support/testing/infra/runtimetest.py

index f3f13ad97f..4773312585 100644
@@ -3,7 +3,6 @@ import os
 import datetime
 
 from infra.builder import Builder
-from infra.emulator import Emulator
 
 BASIC_TOOLCHAIN_CONFIG = \
     """

@@ -41,7 +40,6 @@ class BRTest(unittest.TestCase):
         super(BRTest, self).__init__(names)
         self.testname = self.__class__.__name__
         self.builddir = self.outputdir and os.path.join(self.outputdir, self.testname)
-        self.emulator = None
         self.config += '\nBR2_DL_DIR="{}"\n'.format(self.downloaddir)
         self.config += "\nBR2_JLEVEL={}\n".format(self.jlevel)
 

@@ -57,17 +55,9 @@ class BRTest(unittest.TestCase):
             self.b.delete()
 
         if not self.b.is_finished():
-            self.show_msg("Building")
             self.b.configure()
-            self.b.build()
-            self.show_msg("Building done")
-
-        self.emulator = Emulator(self.builddir, self.downloaddir,
-                                 self.logtofile, self.timeout_multiplier)
 
     def tearDown(self):
         self.show_msg("Cleaning up")
-        if self.emulator:
-            self.emulator.stop()
         if self.b and not self.keepbuilds:
             self.b.delete()

new file mode 100644
index 0000000000..68bb03d091
@@ -0,0 +1,23 @@
+from infra.basetest import BRTest
+from infra.emulator import Emulator
+
+
+class RuntimeTestBase(BRTest):
+    def __init__(self, names):
+        super(RuntimeTestBase, self).__init__(names)
+        self.emulator = None
+
+    def setUp(self):
+        super(RuntimeTestBase, self).setUp()
+        if not self.b.is_finished():
+            self.show_msg("Building")
+            self.b.build()
+            self.show_msg("Building done")
+
+        self.emulator = Emulator(self.builddir, self.downloaddir,
+                                 self.logtofile, self.timeout_multiplier)
+
+    def tearDown(self):
+        if self.emulator:
+            self.emulator.stop()
+        super(RuntimeTestBase, self).tearDown()

index 1db568b0d6..9b821abb57 100644
@@ -2,9 +2,10 @@ import os
 import csv
 
 import infra.basetest
+import infra.runtimetest
 
 
-class TestPostScripts(infra.basetest.BRTest):
+class TestPostScripts(infra.runtimetest.RuntimeTestBase):
     config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
         """
         BR2_INIT_NONE=y

index fedd40d8ac..66b5531221 100644
@@ -2,13 +2,14 @@ import os
 import subprocess
 
 import infra.basetest
+import infra.runtimetest
 
 
 def compare_file(file1, file2):
     return subprocess.call(["cmp", file1, file2])
 
 
-class TestRootfsOverlay(infra.basetest.BRTest):
+class TestRootfsOverlay(infra.runtimetest.RuntimeTestBase):
 
     rootfs_overlay_path = infra.filepath("tests/core/rootfs-overlay")
 

index 050624e0aa..dca38bebe8 100644
@@ -1,6 +1,7 @@
 import os
 
 import infra.basetest
+import infra.runtimetest
 
 
 def boot_armv5_cpio(emulator, builddir):

@@ -10,7 +11,7 @@ def boot_armv5_cpio(emulator, builddir):
         emulator.login()
 
 
-class TestNoTimezone(infra.basetest.BRTest):
+class TestNoTimezone(infra.runtimetest.RuntimeTestBase):
     config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
         """
         # BR2_TARGET_TZ_INFO is not set

@@ -26,7 +27,7 @@ class TestNoTimezone(infra.basetest.BRTest):
         self.assertEqual(tz[0].strip(), "UTC")
 
 
-class TestGlibcAllTimezone(infra.basetest.BRTest):
+class TestGlibcAllTimezone(infra.runtimetest.RuntimeTestBase):
     config = \
         """
         BR2_arm=y

@@ -48,7 +49,7 @@ class TestGlibcAllTimezone(infra.basetest.BRTest):
         self.assertEqual(tz[0].strip(), "CET")
 
 
-class TestGlibcNonDefaultLimitedTimezone(infra.basetest.BRTest):
+class TestGlibcNonDefaultLimitedTimezone(infra.runtimetest.RuntimeTestBase):
     config = \
         """
         BR2_arm=y

index f5f9e9fdf1..a8f68bc54c 100644
@@ -2,6 +2,7 @@ import os
 import subprocess
 
 import infra.basetest
+import infra.runtimetest
 
 VOLNAME_PROP = "Filesystem volume name"
 REVISION_PROP = "Filesystem revision #"

@@ -41,7 +42,7 @@ def boot_img_and_check_fs_type(emulator, builddir, fs_type):
     return exit_code
 
 
-class TestExt2(infra.basetest.BRTest):
+class TestExt2(infra.runtimetest.RuntimeTestBase):
     config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
         """
         BR2_TARGET_ROOTFS_EXT2=y

@@ -60,7 +61,7 @@ class TestExt2(infra.basetest.BRTest):
         self.assertEqual(exit_code, 0)
 
 
-class TestExt2r1(infra.basetest.BRTest):
+class TestExt2r1(infra.runtimetest.RuntimeTestBase):
     config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
         """
         BR2_TARGET_ROOTFS_EXT2=y

@@ -80,7 +81,7 @@ class TestExt2r1(infra.basetest.BRTest):
         self.assertEqual(exit_code, 0)
 
 
-class TestExt3(infra.basetest.BRTest):
+class TestExt3(infra.runtimetest.RuntimeTestBase):
     config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
         """
         BR2_TARGET_ROOTFS_EXT2=y

@@ -99,7 +100,7 @@ class TestExt3(infra.basetest.BRTest):
         self.assertEqual(exit_code, 0)
 
 
-class TestExt4(infra.basetest.BRTest):
+class TestExt4(infra.runtimetest.RuntimeTestBase):
     config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
         """
         BR2_TARGET_ROOTFS_EXT2=y

index 5d945a347a..36227b438d 100644
@@ -1,6 +1,7 @@
 import os
 
 import infra.basetest
+import infra.runtimetest
 
 BASIC_CONFIG = \
     """

@@ -47,7 +48,7 @@ def test_touch_file(emulator):
 # Grub 2
 
 
-class TestIso9660Grub2External(infra.basetest.BRTest):
+class TestIso9660Grub2External(infra.runtimetest.RuntimeTestBase):
     config = BASIC_CONFIG + \
         """
         BR2_TARGET_ROOTFS_ISO9660=y

@@ -67,7 +68,7 @@ class TestIso9660Grub2External(infra.basetest.BRTest):
         self.assertEqual(exit_code, 1)
 
 
-class TestIso9660Grub2Internal(infra.basetest.BRTest):
+class TestIso9660Grub2Internal(infra.runtimetest.RuntimeTestBase):
     config = BASIC_CONFIG + \
         """
         BR2_TARGET_ROOTFS_ISO9660=y

@@ -90,7 +91,7 @@ class TestIso9660Grub2Internal(infra.basetest.BRTest):
 # Syslinux
 
 
-class TestIso9660SyslinuxExternal(infra.basetest.BRTest):
+class TestIso9660SyslinuxExternal(infra.runtimetest.RuntimeTestBase):
     config = BASIC_CONFIG + \
         """
         BR2_TARGET_ROOTFS_ISO9660=y

@@ -109,7 +110,7 @@ class TestIso9660SyslinuxExternal(infra.basetest.BRTest):
         self.assertEqual(exit_code, 1)
 
 
-class TestIso9660SyslinuxInternal(infra.basetest.BRTest):
+class TestIso9660SyslinuxInternal(infra.runtimetest.RuntimeTestBase):
     config = BASIC_CONFIG + \
         """
         BR2_TARGET_ROOTFS_ISO9660=y

index 2ff5099180..8f73cf1f06 100644
@@ -2,6 +2,7 @@ import os
 import subprocess
 
 import infra.basetest
+import infra.runtimetest
 
 
 def jffs2dump_find_file(files_list, fname):

@@ -12,7 +13,7 @@ def jffs2dump_find_file(files_list, fname):
     return False
 
 
-class TestJffs2(infra.basetest.BRTest):
+class TestJffs2(infra.runtimetest.RuntimeTestBase):
     config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
         """
         BR2_TARGET_ROOTFS_JFFS2=y

index 066c054342..f80149f9d9 100644
@@ -2,9 +2,10 @@ import os
 import subprocess
 
 import infra.basetest
+import infra.runtimetest
 
 
-class TestSquashfs(infra.basetest.BRTest):
+class TestSquashfs(infra.runtimetest.RuntimeTestBase):
     config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
         """
         BR2_TARGET_ROOTFS_SQUASHFS=y

index 015d82f769..c724f4f740 100644
@@ -2,9 +2,10 @@ import subprocess
 import os
 
 import infra.basetest
+import infra.runtimetest
 
 
-class TestUbi(infra.basetest.BRTest):
+class TestUbi(infra.runtimetest.RuntimeTestBase):
     config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
         """
         BR2_TARGET_ROOTFS_UBIFS=y

index b60e90e660..c7c8c1f724 100644
@@ -1,9 +1,10 @@
 import os
 
 import infra.basetest
+import infra.runtimetest
 
 
-class TestYaffs2(infra.basetest.BRTest):
+class TestYaffs2(infra.runtimetest.RuntimeTestBase):
     config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
         infra.basetest.MINIMAL_CONFIG + \
         """

index 75cfbe9c59..1b736af657 100644
@@ -1,9 +1,10 @@
 import os
 import subprocess
 import infra.basetest
+import infra.runtimetest
 
 
-class InitSystemBase(infra.basetest.BRTest):
+class InitSystemBase(infra.runtimetest.RuntimeTestBase):
 
     def start_emulator(self, fs_type, kernel=None, dtb=None, init=None):
         img = os.path.join(self.builddir, "images", "rootfs.{}".format(fs_type))

index 8f7f1fee82..8f7f30e3af 100644
@@ -1,9 +1,10 @@
 import os
 
 import infra.basetest
+import infra.runtimetest
 
 
-class TestDropbear(infra.basetest.BRTest):
+class TestDropbear(infra.runtimetest.RuntimeTestBase):
     config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
         """
         BR2_TARGET_GENERIC_ROOT_PASSWD="testpwd"

index 26cf49947b..787364c719 100644
@@ -1,9 +1,10 @@
 import os
 
 import infra.basetest
+import infra.runtimetest
 
 
-class TestPythonBase(infra.basetest.BRTest):
+class TestPythonBase(infra.runtimetest.RuntimeTestBase):
     config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
         """
         BR2_TARGET_ROOTFS_CPIO=y

index 881d2b00db..b72e19f740 100644
@@ -1,5 +1,6 @@
 import os
 import infra
+import infra.runtimetest
 
 BASIC_CONFIG = \
     """

@@ -17,7 +18,7 @@ def has_broken_links(path):
     return False
 
 
-class TestExternalToolchain(infra.basetest.BRTest):
+class TestExternalToolchain(infra.runtimetest.RuntimeTestBase):
     def common_check(self):
         # Check for broken symlinks
         for d in ["lib", "usr/lib"]:

2.14.2

This change will be needed when adding a common class to test the git download infra.

---
Changes v2 -> v3:
- new patch
- search for "support for BR2_EXTERNAL directly in BRTest" in

    http://patchwork.ozlabs.org/patch/806161/
---
 support/testing/infra/basetest.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

index 4773312585..641f1961f2 100644
@@ -29,6 +29,7 @@ MINIMAL_CONFIG = \
 
 class BRTest(unittest.TestCase):
     config = None
+    br2_external = None
     downloaddir = None
     outputdir = None
     logtofile = True

@@ -55,7 +56,10 @@ class BRTest(unittest.TestCase):
             self.b.delete()
 
         if not self.b.is_finished():
-            self.b.configure()
+            if self.br2_external is None:
+                self.b.configure()
+            else:
+                self.b.configure(["BR2_EXTERNAL={}".format(self.br2_external)])
 
     def tearDown(self):
         self.show_msg("Cleaning up")

2.14.2

Add one test case to ensure the hash is checked for git packages:
- correct hash;
- wrong hash;
- no hash file.

Add required infra:
- a GitRemote class, that can start a git server in the host machine to emulate a remote git server under the control of the test;
- a new base class, called GitTestBase, that inherits from BRTest and must be subclassed by all git test cases.
Its setUp() method takes care of configuring the build with a br2-external, avoiding to hit http://sources.buildroot.net by using an empty BR2_BACKUP_SITE. It also avoids downloading not pre-installed dependencies (i.e. lzip) every time by calling 'make dependencies' using the common dl directory, and it instantiates the GitRemote object.

Besides the Python scripts, add some fixtures used during the tests:
- a br2-external (git-hash) with one package for each part of the test case;
- a static git bare repo (repo.git) to be served using GitRemote class.

Neither the br2-external nor the check hash functionalities are the subject of these tests per se, so for simplicity limit the check to the error codes and don't look for the messages in the log.

Thanks to Arnout for the hint about how to add a bare repo to test.

---
Layout of static repo with the series applied until this patch:

 $ git -C support/testing/tests/download/git-remote/repo.git \
   log --all --decorate --graph --oneline --decorate
 * a238b1d (HEAD -> master) initial

Changes v2 -> v3:
- renumber 5 -> 6;
- rebase after removing patch 3 "allow to override logfile" from the series and adding new patches 4 "split runtime test from BRTest" and 5 "support br2-external";
- merge part of old patch 4 (very minimal GitTestBase) to old patch 5

    (Arnout Vandecappelle);
  - merge and tweak part of commit log from old patch 4;
  - move GITREMOTE_PORT_NUMBER to external.mk (Arnout Vandecappelle);
  - use dosctrings;
  - start git remote from __init__ (Arnout Vandecappelle), but I kept a
    separate method and call start();

- remove dead code (Arnout Vandecappelle);
- use the same git repo for all tests (Arnout Vandecappelle);
- rename the file to test_git and merge the 3 test cases in one, since the feature "check hash for git packages" is only OK if all work well and also because the test does not take too much time;
- update commit log accordingly.

Changes v1 -> v2 (patch 4):
- new patch
Changes v1 -> v2 (patch 5):
- use git daemon + git:// instead of ssh (Arnout);
- remove __main__ handling since the test infra already does that;
- use the logging support from test infra;
- this patch is part of series 1/3 of a new version of

    http://patchwork.ozlabs.org/patch/690097/
---
 .gitlab-ci.yml                                     |   1 +
 support/testing/tests/download/__init__.py         |   0
 .../tests/download/br2-external/git-hash/Config.in |   0
 .../download/br2-external/git-hash/external.desc   |   1 +
 .../download/br2-external/git-hash/external.mk     |   4 ++
 .../br2-external/git-hash/package/bad/bad.hash     |   1 +
 .../br2-external/git-hash/package/bad/bad.mk       |  10 ++++
 .../br2-external/git-hash/package/good/good.hash   |   1 +
 .../br2-external/git-hash/package/good/good.mk     |  10 ++++
 .../br2-external/git-hash/package/nohash/nohash.mk |  10 ++++
 .../download/git-remote/repo.git/.gitattributes    |   1 +
 .../tests/download/git-remote/repo.git/HEAD        |   1 +
 .../tests/download/git-remote/repo.git/config      |   4 ++
 .../99/f2e3e1cb15f9b52fa29f66d380dda061d917ab      | Bin 0 -> 49 bytes
 .../a2/38b1dfcd825d47d834af3c5223417c8411d90d      | Bin 0 -> 152 bytes
 .../e7/9c5e8f964493290a409888d5413a737e8e5dd5      | Bin 0 -> 23 bytes
 .../download/git-remote/repo.git/refs/heads/master |   1 +
 support/testing/tests/download/gitbase.py          |  27 +++++++++++
 support/testing/tests/download/gitremote.py        |  52 +++++++++++++++++++++
 support/testing/tests/download/test_git.py         |  23 +++++++++
 20 files changed, 147 insertions(+)
 create mode 100644 support/testing/tests/download/__init__.py
 create mode 100644 support/testing/tests/download/br2-external/git-hash/Config.in
 create mode 100644 support/testing/tests/download/br2-external/git-hash/external.desc
 create mode 100644 support/testing/tests/download/br2-external/git-hash/external.mk
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/bad/bad.mk
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/good/good.hash
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/good/good.mk
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/nohash/nohash.mk
 create mode 100644 support/testing/tests/download/git-remote/repo.git/.gitattributes
 create mode 100644 support/testing/tests/download/git-remote/repo.git/HEAD
 create mode 100644 support/testing/tests/download/git-remote/repo.git/config
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/a2/38b1dfcd825d47d834af3c5223417c8411d90d
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
 create mode 100644 support/testing/tests/download/git-remote/repo.git/refs/heads/master
 create mode 100644 support/testing/tests/download/gitbase.py
 create mode 100644 support/testing/tests/download/gitremote.py
 create mode 100644 support/testing/tests/download/test_git.py

index ebaac7a3d9..fbbc4c0243 100644
@@ -227,6 +227,7 @@ tests.core.test_rootfs_overlay.TestRootfsOverlay: *runtime_test
 tests.core.test_timezone.TestGlibcAllTimezone: *runtime_test
 tests.core.test_timezone.TestGlibcNonDefaultLimitedTimezone: *runtime_test
 tests.core.test_timezone.TestNoTimezone: *runtime_test
+tests.download.test_git.TestGitHash: *runtime_test
 tests.fs.test_ext.TestExt2: *runtime_test
 tests.fs.test_ext.TestExt2r1: *runtime_test
 tests.fs.test_ext.TestExt3: *runtime_test

new file mode 100644
index 0000000000..e69de29bb2

new file mode 100644
index 0000000000..e69de29bb2

new file mode 100644
index 0000000000..41316c8b25
@@ -0,0 +1 @@
+name: GIT_HASH

new file mode 100644
index 0000000000..4646dfe2b0
@@ -0,0 +1,4 @@
+include $(sort $(wildcard $(BR2_EXTERNAL_GIT_HASH_PATH)/package/*/*.mk))
+
+# Get the git server port number from the test infra
+GITREMOTE_PORT_NUMBER ?= 9418

new file mode 100644
index 0000000000..b9e1baec84
@@ -0,0 +1 @@
+sha256  0000000000000000000000000000000000000000000000000000000000000000  bad-a238b1dfcd825d47d834af3c5223417c8411d90d.tar.gz

new file mode 100644
index 0000000000..5497bd6bfe
@@ -0,0 +1,10 @@
+################################################################################
+#
+# bad
+#
+################################################################################
+
+BAD_VERSION = a238b1dfcd825d47d834af3c5223417c8411d90d
+BAD_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git
+
+$(eval $(generic-package))

new file mode 100644
index 0000000000..9e92ab8ab9
@@ -0,0 +1 @@
+sha256  d00ae598e9e770d607621a86766030b42eaa58156cb8d482b043969da7963c23  good-a238b1dfcd825d47d834af3c5223417c8411d90d.tar.gz

new file mode 100644
index 0000000000..0f0eefd944
@@ -0,0 +1,10 @@
+################################################################################
+#
+# good
+#
+################################################################################
+
+GOOD_VERSION = a238b1dfcd825d47d834af3c5223417c8411d90d
+GOOD_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git
+
+$(eval $(generic-package))

new file mode 100644
index 0000000000..1da19d88c6
@@ -0,0 +1,10 @@
+################################################################################
+#
+# nohash
+#
+################################################################################
+
+NOHASH_VERSION = a238b1dfcd825d47d834af3c5223417c8411d90d
+NOHASH_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git
+
+$(eval $(generic-package))

new file mode 100644
index 0000000000..eb50c64a21
@@ -0,0 +1 @@
+objects/*/* binary

new file mode 100644
index 0000000000..cb089cd89a
@@ -0,0 +1 @@
+ref: refs/heads/master

new file mode 100644
index 0000000000..07d359d07c
@@ -0,0 +1,4 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true

new file mode 100644
index 0000000000000000000000000000000000000000..9db72668cf9374b0b85a25a19f30084fd460072d
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..31b6bcf34de247d14531c70b36e28d895ba20af3
GIT binary patch

zcmV;J0B8Sr0j<tW4#FT1Kw;OMVlL1IsFY%i at d9r21jApQv_OKm@b)%w;oi9Y7BA10 zl&FE!)2JJz?dk*5QMWrMPrqWC}wkKTO<v<fHILXtWHU?OrNe$zk;cE?667R~$& zv3{^mUp&tVY3*G}ClHEjqx7b(D8wDw&^y}!k==CGBvLu^Yf_^!m*+1KHhS@s5O G+F(P1IZe3$

literal 0
HcmV?d00001

new file mode 100644
index 0000000000000000000000000000000000000000..df2037a2d2d30afb20e31cd558c92c2edabe7cf6
GIT binary patch

new file mode 100644
index 0000000000..b6bccc1c17
@@ -0,0 +1 @@
+a238b1dfcd825d47d834af3c5223417c8411d90d

new file mode 100644
index 0000000000..d0a7b95e5e
@@ -0,0 +1,27 @@
+import infra.basetest
+from gitremote import GitRemote
+
+
+class GitTestBase(infra.basetest.BRTest):
+    config = \
+        """
+        BR2_BACKUP_SITE=""
+        """
+    serveddir = infra.filepath("tests/download/git-remote")
+
+    def setUp(self):
+        super(GitTestBase, self).setUp()
+        if not self.b.is_finished():
+            # when running the tests in a local machine, do not download not
+            # pre-installed dependencies (i.e. lzip) every time a test runs
+            self.b.build(["dependencies"])
+
+        self.gitremote = GitRemote(self.builddir, self.serveddir,
+                                   self.logtofile)
+
+    def tearDown(self):
+        self.show_msg("Cleaning up")
+        if self.gitremote:
+            self.gitremote.stop()
+        if self.b and not self.keepbuilds:
+            self.b.delete()

new file mode 100644
index 0000000000..994a8afc52
@@ -0,0 +1,23 @@
+import os
+
+import infra
+from gitbase import GitTestBase
+
+
+class TestGitHash(GitTestBase):
+    br2_external = infra.filepath("tests/download/br2-external/git-hash")
+
+    def check_hash(self, package):
+        # store downloaded tarball inside the output dir so the test infra
+        # cleans it up at the end
+        env = {"BR2_DL_DIR": os.path.join(self.builddir, "dl"),
+               "GITREMOTE_PORT_NUMBER": str(self.gitremote.port)}
+        self.b.build(["{}-dirclean".format(package),
+                      "{}-source".format(package)],
+                     env)
+
+    def test_run(self):
+        with self.assertRaises(SystemError):
+            self.check_hash("bad")
+        self.check_hash("good")
+        self.check_hash("nohash")

2.14.2

All upcoming tests for git refs will rely on the return code of make to determine whether a git ref can be downloaded or not and also to determine whether the downloaded content is correct (all of this taking advantage of the check-hash mechanism already in place for git packages).
So to avoid false results i.e. in the case the check-hash mechanism become broken in the master branch, add some sanity checks before the actual test of download git refs.

Add the minimum test case for git refs containing only sanity checks. Reuse the commit in the static repo.
Add a br2-external with two packages to check that:
- trying to download an invalid sha1 generates an error;
- downloading a valid sha1 that contains unexpected content generates an error.

In order to ease the maintenance and review, each upcoming patch adding checks to this test case will add at same time the commits to the static repo, the equivalent packages to the br2-external and code to the test case.

---
Layout of static repo with the series applied until this patch:

 $ git -C support/testing/tests/download/git-remote/repo.git \
   log --all --decorate --graph --oneline --decorate
 * a238b1d (HEAD -> master) initial

Changes v2 -> v3:
- rewrite from v2, using an static repo;
- separate on this patch the bare minimum static repo (actually reuse from previous commit), the next patches on the series will gradually add new commits to the static repo together to the equivalent packages and call to check_download. This approach allows better maintenance, even during the review of the series, because a patch can be more easily reworked/discarded/reordered;

Changes v1 -> v2:
- rename the main test file to testgit (Arnout). Actually I broke it down to a common gitbase and the two test_git_refs and test_git_hash (this last one is new, in the previous patch);
- remove some weird/wrong TODO I had in v1 code (Arnout);
- use the same structure for test cases as used in the test infra;
- raise an exception when the download fails (Arnout). I did not add

    code for this since I let the builder class to raise it;
  - I reimplemented git_util as gitrepo. Arnout suggested to use it as
    module and I first implemented that way locally, but then I created
    test cases for submodules and I realized now I have a reason to use
    a class (see next patch);
  - move package (now called foo) to a BR2_EXTERNAL (Arnout);
  - override BR2_DL_DIR when calling make (Arnout);
  - the test infra uses O= so I don't need to;
  - instead of removing the files in the dl/ folder, use a different dir
    as dl/ dir since now each repo has a different name;
  - open the tarball to check its contents (Arnout). I create a fresh
    clone of the repo before the test to compare against;
  - this patch is not checking for the actual sha1 anymore, it can be
    done later. But the check for the contents should cover most cases;
  - my old argument to not test only the support/download/dl-wrapper is
    not valid anymore since I mimic the logic from the scripts to know
    the name of the tarball. But I still think calling make ...-source
    has better maintenance. And also the previous patch (test for hash
    of packages with git method) can use the same base class;
  - this patch is part of series 1/3 of a new version of
    http://patchwork.ozlabs.org/patch/690097/
---
 .gitlab-ci.yml                                        |  1 +
 .../tests/download/br2-external/git-refs/Config.in    |  0
 .../download/br2-external/git-refs/external.desc      |  1 +
 .../tests/download/br2-external/git-refs/external.mk  |  4 ++++
 .../package/git-wrong-content/git-wrong-content.hash  |  2 ++
 .../package/git-wrong-content/git-wrong-content.mk    | 11 +++++++++++
 .../git-refs/package/git-wrong-sha1/git-wrong-sha1.mk | 11 +++++++++++
 support/testing/tests/download/test_git.py            | 19 +++++++++++++++++++
 8 files changed, 49 insertions(+)
 create mode 100644 support/testing/tests/download/br2-external/git-refs/Config.in
 create mode 100644 support/testing/tests/download/br2-external/git-refs/external.desc
 create mode 100644 support/testing/tests/download/br2-external/git-refs/external.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-wrong-sha1/git-wrong-sha1.mk

index fbbc4c0243..60d01bdfc8 100644
@@ -228,6 +228,7 @@ tests.core.test_timezone.TestGlibcAllTimezone: *runtime_test
 tests.core.test_timezone.TestGlibcNonDefaultLimitedTimezone: *runtime_test
 tests.core.test_timezone.TestNoTimezone: *runtime_test
 tests.download.test_git.TestGitHash: *runtime_test
+tests.download.test_git.TestGitRefs: *runtime_test
 tests.fs.test_ext.TestExt2: *runtime_test
 tests.fs.test_ext.TestExt2r1: *runtime_test
 tests.fs.test_ext.TestExt3: *runtime_test

new file mode 100644
index 0000000000..e69de29bb2

new file mode 100644
index 0000000000..69f40d46c6
@@ -0,0 +1 @@
+name: GIT_REFS

new file mode 100644
index 0000000000..ab38c27eb7
@@ -0,0 +1,4 @@
+include $(sort $(wildcard $(BR2_EXTERNAL_GIT_REFS_PATH)/package/*/*.mk))
+
+# Get the git server port number from the test infra
+GITREMOTE_PORT_NUMBER ?= 9418

new file mode 100644
index 0000000000..47b2b8b7d7
@@ -0,0 +1,2 @@
+ sha256  04715901977503d1df650e0959f4d31d8e7b105e2ac99a2182e0652b8f13baa1  git-wrong-content-a238b1dfcd825d47d834af3c5223417c8411d90d.tar.gz
+ sha256  0000000000000000000000000000000000000000000000000000000000000000  file

new file mode 100644
index 0000000000..786224dad9
@@ -0,0 +1,11 @@
+################################################################################
+#
+# git-wrong-content
+#
+################################################################################
+
+GIT_WRONG_CONTENT_VERSION = a238b1dfcd825d47d834af3c5223417c8411d90d
+GIT_WRONG_CONTENT_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git
+GIT_WRONG_CONTENT_LICENSE_FILES = file
+
+$(eval $(generic-package))

new file mode 100644
index 0000000000..f9d0d2226c
@@ -0,0 +1,11 @@
+################################################################################
+#
+# git-wrong-sha1
+#
+################################################################################
+
+GIT_WRONG_SHA1_VERSION = 0000000000000000000000000000000000000000
+GIT_WRONG_SHA1_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git
+GIT_WRONG_SHA1_LICENSE_FILES = file
+
+$(eval $(generic-package))

index 994a8afc52..29b5cd4091 100644
@@ -21,3 +21,22 @@ class TestGitHash(GitTestBase):
             self.check_hash("bad")
         self.check_hash("good")
         self.check_hash("nohash")
+
+
+class TestGitRefs(GitTestBase):
+    br2_external = infra.filepath("tests/download/br2-external/git-refs")
+
+    def check_download(self, package):
+        # store downloaded tarball inside the output dir so the test infra
+        # cleans it up at the end
+        env = {"BR2_DL_DIR": os.path.join(self.builddir, "dl"),
+               "GITREMOTE_PORT_NUMBER": str(self.gitremote.port)}
+        self.b.build(["{}-dirclean".format(package),
+                      "{}-legal-info".format(package)],
+                     env)
+
+    def test_run(self):
+        with self.assertRaises(SystemError):
+            self.check_download("git-wrong-content")
+        with self.assertRaises(SystemError):
+            self.check_download("git-wrong-sha1")

2.14.2

Add a branch to the static repo and check on the git refs test case the download of a git package:
- with a sha1 reachable by a branch name, but not pointed by it, as version. This is the most common use case for git refs in the tree;
- with a partial sha1 of a commit reachable by a branch as version;
- with the name of a branch as version;
- with a sha1 of the commit head of a branch as version;
- with a partial sha1 of the commit head of a branch as version;

Enforce the download always occurs by removing the BR2_DL_DIR used for the tarballs generated by the git download infra.

---
Layout of static repo with the series applied until this patch:

 $ git -C support/testing/tests/download/git-remote/repo.git \
   log --all --decorate --graph --oneline --decorate
 * 68c197d (mybranch) branch2
 * 3174063 branch1
 * a238b1d (HEAD -> master) initial

Changes v2 -> v3:
- complete rewrite using a static repo;

---
 .../git-refs/package/git-branch/git-branch.hash           |   2 ++
 .../git-refs/package/git-branch/git-branch.mk             |  11 +++++++++++
 .../git-partial-sha1-branch-head.hash                     |   2 ++
 .../git-partial-sha1-branch-head.mk                       |  11 +++++++++++
 .../git-partial-sha1-reachable-by-branch.hash             |   2 ++
 .../git-partial-sha1-reachable-by-branch.mk               |  11 +++++++++++
 .../git-sha1-branch-head/git-sha1-branch-head.hash        |   2 ++
 .../package/git-sha1-branch-head/git-sha1-branch-head.mk  |  11 +++++++++++
 .../git-sha1-reachable-by-branch.hash                     |   2 ++
 .../git-sha1-reachable-by-branch.mk                       |  11 +++++++++++
 .../objects/11/93ff46343f4f6a0522e2b28b871e905178c1f0     | Bin 0 -> 23 bytes
 .../objects/31/7406308d9259e2231bd0d6ddad3de3832bce08     | Bin 0 -> 182 bytes
 .../objects/34/d1da713bf7de1c535e1d7d3ca985afd84bc7e5     | Bin 0 -> 23 bytes
 .../objects/68/c197d0879d485f4f6cee85544722b79e68e59f     | Bin 0 -> 184 bytes
 .../objects/b2/4b387624edc78d0292a127c43cad9ba97c6232     | Bin 0 -> 49 bytes
 .../objects/e2/cfe068f7e5bf4de32ffe1241da53abce9fa89e     | Bin 0 -> 49 bytes
 .../download/git-remote/repo.git/refs/heads/mybranch      |   1 +
 support/testing/tests/download/test_git.py                |  12 +++++++++++-
 18 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-branch/git-branch.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-branch/git-branch.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.mk
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/11/93ff46343f4f6a0522e2b28b871e905178c1f0
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/31/7406308d9259e2231bd0d6ddad3de3832bce08
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/34/d1da713bf7de1c535e1d7d3ca985afd84bc7e5
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/68/c197d0879d485f4f6cee85544722b79e68e59f
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/b2/4b387624edc78d0292a127c43cad9ba97c6232
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/e2/cfe068f7e5bf4de32ffe1241da53abce9fa89e
 create mode 100644 support/testing/tests/download/git-remote/repo.git/refs/heads/mybranch

new file mode 100644
index 0000000000..0061618b0d
@@ -0,0 +1,2 @@
+sha256  9697b68a51149188922b5df596f0f1f363c2abf9ee8e6feff0ec44b6bca3e69d  git-branch-mybranch.tar.gz
+sha256  2c1126513651b0d346a4e6d1bb75ac1c9999217e18026302d27bea47b06c7fb2  file

new file mode 100644
index 0000000000..624d07aad1
@@ -0,0 +1,11 @@
+################################################################################
+#
+# git-branch
+#
+################################################################################
+
+GIT_BRANCH_VERSION = mybranch
+GIT_BRANCH_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git
+GIT_BRANCH_LICENSE_FILES = file
+
+$(eval $(generic-package))

new file mode 100644
index 0000000000..648bcceca0
@@ -0,0 +1,2 @@
+sha256  70b76187369e47db69dac02c5696e63b35199cd20490fa473d289dd377774613  git-partial-sha1-branch-head-68c197d0879d485f4f6c.tar.gz
+sha256  2c1126513651b0d346a4e6d1bb75ac1c9999217e18026302d27bea47b06c7fb2  file

new file mode 100644
index 0000000000..6d4177c5bf
@@ -0,0 +1,11 @@
+################################################################################
+#
+# git-partial-sha1-branch-head
+#
+################################################################################
+
+GIT_PARTIAL_SHA1_BRANCH_HEAD_VERSION = 68c197d0879d485f4f6c
+GIT_PARTIAL_SHA1_BRANCH_HEAD_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git
+GIT_PARTIAL_SHA1_BRANCH_HEAD_LICENSE_FILES = file
+
+$(eval $(generic-package))

new file mode 100644
index 0000000000..d064362e2c
@@ -0,0 +1,2 @@
+sha256  9db079b9e215799d59975db7b2b26671eff1932ee6cf1075296f2ace3e2cb746  git-partial-sha1-reachable-by-branch-317406308d9259e2231b.tar.gz
+sha256  fabbc65c442bacb5e69b7adfea6d14fbbfc1327134322efd12771dc84387d507  file

new file mode 100644
index 0000000000..2f65b5c9a9
@@ -0,0 +1,11 @@
+################################################################################
+#
+# git-partial-sha1-reachable-by-branch
+#
+################################################################################
+
+GIT_PARTIAL_SHA1_REACHABLE_BY_BRANCH_VERSION = 317406308d9259e2231b
+GIT_PARTIAL_SHA1_REACHABLE_BY_BRANCH_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git
+GIT_PARTIAL_SHA1_REACHABLE_BY_BRANCH_LICENSE_FILES = file
+
+$(eval $(generic-package))

new file mode 100644
index 0000000000..3e8f76d31a
@@ -0,0 +1,2 @@
+sha256  a21a2507b6d94ad484e49e3a9ae698f672a57469aab8e1779da77df7c9d4d337  git-sha1-branch-head-68c197d0879d485f4f6cee85544722b79e68e59f.tar.gz
+sha256  2c1126513651b0d346a4e6d1bb75ac1c9999217e18026302d27bea47b06c7fb2  file

new file mode 100644
index 0000000000..d3ecaa8593
@@ -0,0 +1,11 @@
+################################################################################
+#
+# git-sha1-branch-head
+#
+################################################################################
+
+GIT_SHA1_BRANCH_HEAD_VERSION = 68c197d0879d485f4f6cee85544722b79e68e59f
+GIT_SHA1_BRANCH_HEAD_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git
+GIT_SHA1_BRANCH_HEAD_LICENSE_FILES = file
+
+$(eval $(generic-package))

new file mode 100644
index 0000000000..f8d7b5dc48
@@ -0,0 +1,2 @@
+sha256  8909e76d898e651af0bc23fae4103b87888bfe77448d71aaf1fbec3da97a3ce2  git-sha1-reachable-by-branch-317406308d9259e2231bd0d6ddad3de3832bce08.tar.gz
+sha256  fabbc65c442bacb5e69b7adfea6d14fbbfc1327134322efd12771dc84387d507  file

new file mode 100644
index 0000000000..badf9e13ca
@@ -0,0 +1,11 @@
+################################################################################
+#
+# git-sha1-reachable-by-branch
+#
+################################################################################
+
+GIT_SHA1_REACHABLE_BY_BRANCH_VERSION = 317406308d9259e2231bd0d6ddad3de3832bce08
+GIT_SHA1_REACHABLE_BY_BRANCH_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git
+GIT_SHA1_REACHABLE_BY_BRANCH_LICENSE_FILES = file
+
+$(eval $(generic-package))

new file mode 100644
index 0000000000000000000000000000000000000000..3541cd14f0bf5f3a172f868c7ec730dcc255ebd2
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..c2c986572a7dec5f263e461155a09124d0f05844
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..29f2d4fd004afa03b43e3148207e258e7aa9fc41
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..3e421bb97a40ab93592d94107f3a1258a99b76fa
GIT binary patch

z_vz(UYZ(^7KaH+xGb|Zn at UW<Gh~gjt%@BA&CP|r6U=Il9i at I+6a1M*}=%OT8lLFwJ z#fcXoK~andnbk!@KjYH6{U}Ubnti7}%Es;cTI@@|;i2B~?OdsR9=O$4JFhOJHKIp5 mIdsnKx<?QFr#q87ZF~V^j^(_mOzm`<^6&E_vE~mXVr;h@Dp>;n

literal 0
HcmV?d00001

new file mode 100644
index 0000000000000000000000000000000000000000..20491e3f176096db13c0b0c7857406e1c4119619
GIT binary patch

zcmV-10M7q-0V^p=O;s>9VlXr?Ff%bxNXyJgWiYvTtI+!UJ(=J**;<>Gt?O at iAAbq} H3k46<$LbTr

literal 0
HcmV?d00001

new file mode 100644
index 0000000000000000000000000000000000000000..57be6485778c7f743a82f71ef718103cecfd4f35
GIT binary patch

new file mode 100644
index 0000000000..45cec54673
@@ -0,0 +1 @@
+68c197d0879d485f4f6cee85544722b79e68e59f

index 29b5cd4091..aa95519e74 100644
@@ -1,4 +1,5 @@
 import os
+import shutil
 
 import infra
 from gitbase import GitTestBase

@@ -29,7 +30,11 @@ class TestGitRefs(GitTestBase):
     def check_download(self, package):
         # store downloaded tarball inside the output dir so the test infra
         # cleans it up@the end
-        env = {"BR2_DL_DIR": os.path.join(self.builddir, "dl"),
+        dl_dir = os.path.join(self.builddir, "dl")
+        # enforce we test the download even when using run-tests -k
+        if os.path.exists(dl_dir):
+            shutil.rmtree(dl_dir)
+        env = {"BR2_DL_DIR": dl_dir,
                "GITREMOTE_PORT_NUMBER": str(self.gitremote.port)}
         self.b.build(["{}-dirclean".format(package),
                       "{}-legal-info".format(package)],

@@ -40,3 +45,8 @@ class TestGitRefs(GitTestBase):
             self.check_download("git-wrong-content")
         with self.assertRaises(SystemError):
             self.check_download("git-wrong-sha1")
+        self.check_download("git-branch")
+        self.check_download("git-partial-sha1-branch-head")
+        self.check_download("git-partial-sha1-reachable-by-branch")
+        self.check_download("git-sha1-branch-head")
+        self.check_download("git-sha1-reachable-by-branch")

2.14.2

Add two submodules as static repos, add a branch to the main static repo and check on the git refs test case the download of a git package:
- repo with submodule but without support in the package;
- repo with recursive submodules with support in the package.

For the test case with submodule support enabled, check the hash of files in the checkout instead of the tarball since some versions of git client do not generate reproducible tarballs when there are a second level submodule.

---
Layout of static repos with the series applied until this patch:

 $ git -C support/testing/tests/download/git-remote/repo.git \
   log --all --decorate --graph --oneline --decorate
 * 2fa37f6 (submodule) sub0-2
 * a9dbc1e sub0-1
 | * 68c197d (mybranch) branch2
 | * 3174063 branch1
 |/
 * a238b1d (HEAD -> master) initial

 $ git -C support/testing/tests/download/git-remote/refs-sub1.git \
   log --all --decorate --graph --oneline --decorate
 * 1df823c (submodule) sub1-2
 * f8001e5 sub1-1
 * cb545fa (HEAD) initial

 $ git -C support/testing/tests/download/git-remote/refs-sub2.git \
   log --all --decorate --graph --oneline --decorate
 * e83f6f8 (submodule) sub2-2
 * cd4d62f sub2-1
 * 32d61ba (HEAD) initial

In this layout:
- sub0-1 adds refs-sub1.git as submodule to refs.git pointing to sub1-1 commit;
- sub1-1 adds refs-sub2.git as submodule to refs-sub1.git pointing to sub2-1 commit.

Changes v2 -> v3:
- complete rewrite using a static repo;

Changes v1 -> v2:
- rewrite using new git test infra;
- this patch is part of series 1/3 of a new version of

    http://patchwork.ozlabs.org/patch/690097/
---
 .../git-submodule-disabled.hash                    |   2 ++
 .../git-submodule-disabled.mk                      |  11 ++++++++
 .../git-submodule-enabled.hash                     |   3 +++
 .../git-submodule-enabled/git-submodule-enabled.mk |  28 +++++++++++++++++++++
 .../git-remote/refs-sub1.git/.gitattributes        |   1 +
 .../tests/download/git-remote/refs-sub1.git/HEAD   |   1 +
 .../tests/download/git-remote/refs-sub1.git/config |   4 +++
 .../07/cabc655213bdf7087d8dd50fda95124e935570      | Bin 0 -> 22 bytes
 .../1d/f823cb8a6d1866148ae50a8009762a9c4c777f      | Bin 0 -> 180 bytes
 .../7d/52f458bdb0f9f5a4beb46fa82824421b8b988e      | Bin 0 -> 65 bytes
 .../99/f2e3e1cb15f9b52fa29f66d380dda061d917ab      | Bin 0 -> 49 bytes
 .../a1/30af1626bbadd64841b2cbcb6ac4ed0638ba1a      | Bin 0 -> 122 bytes
 .../bc/c81ba6e5bd8bf52c95688ae8d3e697e131fa23      | Bin 0 -> 22 bytes
 .../cb/545facf77bbc5f24f95b6d503c338d10b7b717      | Bin 0 -> 151 bytes
 .../dd/130f6f4629514adaf2e03407f3ed9344eb6cd6      | Bin 0 -> 122 bytes
 .../e7/9c5e8f964493290a409888d5413a737e8e5dd5      | Bin 0 -> 23 bytes
 .../f8/001e5780100962a5e30a25cbc4c9609cfc7bf3      | Bin 0 -> 184 bytes
 .../git-remote/refs-sub1.git/refs/heads/submodule  |   1 +
 .../git-remote/refs-sub2.git/.gitattributes        |   1 +
 .../tests/download/git-remote/refs-sub2.git/HEAD   |   1 +
 .../tests/download/git-remote/refs-sub2.git/config |   4 +++
 .../0a/846af45c3e455789435f49f80d70e86b65b9d7      | Bin 0 -> 22 bytes
 .../0b/32ebd8fc52cec991f18c94be980e85a8341585      | Bin 0 -> 22 bytes
 .../32/d61bae693af7879da63b89a60d3ae67f851e56      | Bin 0 -> 151 bytes
 .../3e/9b0a5198c64cea9c00f820433411e3b4d50c1c      | Bin 0 -> 48 bytes
 .../85/8f666af75b7c0dfba6b8be7eac5f196e7a1221      | Bin 0 -> 49 bytes
 .../99/f2e3e1cb15f9b52fa29f66d380dda061d917ab      | Bin 0 -> 49 bytes
 .../cd/4d62ff218ab7b4a04f5bfdf800ace087af3ceb      | Bin 0 -> 184 bytes
 .../e7/9c5e8f964493290a409888d5413a737e8e5dd5      | Bin 0 -> 23 bytes
 .../e8/3f6f805bd016b90acafc8702c52d778eb57310      | Bin 0 -> 182 bytes
 .../git-remote/refs-sub2.git/refs/heads/submodule  |   1 +
 .../0b/d8ceb961c3b2b210f64a67d57f4b5cd669d343      | Bin 0 -> 22 bytes
 .../25/59d83bfe937fc0412d96ed664663c9e8a99055      | Bin 0 -> 22 bytes
 .../2f/a37f6885d7eb746df75eccaddbacf3ac82799d      | Bin 0 -> 180 bytes
 .../8b/8a7e885a041da72b1ee9a47c5b9300b172a9e7      | Bin 0 -> 65 bytes
 .../a9/dbc1e23c45e8e1b88c0448763f54d714eb6f8f      | Bin 0 -> 183 bytes
 .../d4/e2941d18a63535400476324ddeb7f40164be41      | Bin 0 -> 121 bytes
 .../fe/74231105841041d5f441e70399d37f0e600aa5      | Bin 0 -> 121 bytes
 .../git-remote/repo.git/refs/heads/submodule       |   1 +
 support/testing/tests/download/test_git.py         |   2 ++
 40 files changed, 61 insertions(+)
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.mk
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/.gitattributes
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/HEAD
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/config
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/07/cabc655213bdf7087d8dd50fda95124e935570
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/1d/f823cb8a6d1866148ae50a8009762a9c4c777f
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/7d/52f458bdb0f9f5a4beb46fa82824421b8b988e
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/a1/30af1626bbadd64841b2cbcb6ac4ed0638ba1a
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/bc/c81ba6e5bd8bf52c95688ae8d3e697e131fa23
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/cb/545facf77bbc5f24f95b6d503c338d10b7b717
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/dd/130f6f4629514adaf2e03407f3ed9344eb6cd6
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/f8/001e5780100962a5e30a25cbc4c9609cfc7bf3
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/refs/heads/submodule
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/.gitattributes
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/HEAD
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/config
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/0a/846af45c3e455789435f49f80d70e86b65b9d7
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/0b/32ebd8fc52cec991f18c94be980e85a8341585
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/32/d61bae693af7879da63b89a60d3ae67f851e56
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/3e/9b0a5198c64cea9c00f820433411e3b4d50c1c
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/85/8f666af75b7c0dfba6b8be7eac5f196e7a1221
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/cd/4d62ff218ab7b4a04f5bfdf800ace087af3ceb
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/e8/3f6f805bd016b90acafc8702c52d778eb57310
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/refs/heads/submodule
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/0b/d8ceb961c3b2b210f64a67d57f4b5cd669d343
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/25/59d83bfe937fc0412d96ed664663c9e8a99055
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/2f/a37f6885d7eb746df75eccaddbacf3ac82799d
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/8b/8a7e885a041da72b1ee9a47c5b9300b172a9e7
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/a9/dbc1e23c45e8e1b88c0448763f54d714eb6f8f
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/d4/e2941d18a63535400476324ddeb7f40164be41
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/fe/74231105841041d5f441e70399d37f0e600aa5
 create mode 100644 support/testing/tests/download/git-remote/repo.git/refs/heads/submodule

new file mode 100644
index 0000000000..3bd0a44693
@@ -0,0 +1,2 @@
+sha256  f9d46ff8a1a344c6c31fa4211220f3085c446abd31626232540703158276f22c  git-submodule-disabled-a9dbc1e23c45e8e1b88c0448763f54d714eb6f8f.tar.gz
+sha256  ba8b6ddc4726bfb6a05045ebfd8c43263c968ad1bc601bd46a25bc055008eddc  file

new file mode 100644
index 0000000000..7a35b3b51a
@@ -0,0 +1,11 @@
+################################################################################
+#
+# git-submodule-disabled
+#
+################################################################################
+
+GIT_SUBMODULE_DISABLED_VERSION = a9dbc1e23c45e8e1b88c0448763f54d714eb6f8f
+GIT_SUBMODULE_DISABLED_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git
+GIT_SUBMODULE_DISABLED_LICENSE_FILES = file
+
+$(eval $(generic-package))

new file mode 100644
index 0000000000..a4ba6947c8
@@ -0,0 +1,3 @@
+sha256  ba8b6ddc4726bfb6a05045ebfd8c43263c968ad1bc601bd46a25bc055008eddc  file
+sha256  5219dcb50c7753bcdd72bc68a7b48af33ac2e42c5c61de78a9dd81589c4d50b6  refs-sub1/file
+sha256  b93c1fa9014d25a17fee36771d26ae023f043da656315ffe8947c30ad1ba141f  refs-sub1/refs-sub2/file

new file mode 100644
index 0000000000..019dd076e3
@@ -0,0 +1,28 @@
+################################################################################
+#
+# git-submodule-enabled
+#
+################################################################################
+
+GIT_SUBMODULE_ENABLED_VERSION = a9dbc1e23c45e8e1b88c0448763f54d714eb6f8f
+GIT_SUBMODULE_ENABLED_SITE = git://localhost:$(GITREMOTE_PORT_NUMBER)/repo.git
+GIT_SUBMODULE_ENABLED_GIT_SUBMODULES = YES
+GIT_SUBMODULE_ENABLED_LICENSE_FILES = \
+	file \
+	refs-sub1/file \
+	refs-sub1/refs-sub2/file
+
+# Some versions of git client fill the .git file for the second level submodule
+# using the absolute path to the main .git directory, which in the case of the
+# buildroot download helper is always different since it uses a temporary
+# directory. This version of git have the issue:
+# - 2.7.4 included in Ubuntu 16.04;
+# The same does not occur using newer versions of git:
+# - 2.11.0 included in Debian 9;
+# - 2.14.2 latest at the time of writing;
+# In order to allow running this test case locally in many systems, do not check
+# for the hash of the tarball, but instead check the hash of each meaningful
+# file included in the tarball.
+BR_NO_CHECK_HASH_FOR += $(GIT_SUBMODULE_ENABLED_SOURCE)
+
+$(eval $(generic-package))

new file mode 100644
index 0000000000..eb50c64a21
@@ -0,0 +1 @@
+objects/*/* binary

new file mode 100644
index 0000000000..4e92c1f200
@@ -0,0 +1 @@
+cb545facf77bbc5f24f95b6d503c338d10b7b717

new file mode 100644
index 0000000000..07d359d07c
@@ -0,0 +1,4 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true

new file mode 100644
index 0000000000000000000000000000000000000000..cbf5085af8cdca19c43017c92369ddc8002f1a3d
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..04055b899ecbdc3bceb2d7936757f360e90544a5
GIT binary patch

iLYL_l{*)8*lT at dLIH$Ld{<)Z=(YXjRlEVZfTHP_gG8-

literal 0
HcmV?d00001

new file mode 100644
index 0000000000000000000000000000000000000000..2b78a01965068cc6f7c89402eea4e7f9a03ba807
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..9db72668cf9374b0b85a25a19f30084fd460072d
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..f49d53326e0b22b95fd16670f0a25e3cd84718ae
GIT binary patch

zq2eUnJ);k*EG;u9m4W@#p41 at Wz27-%d$01}nkwWsIkdpg%m4@!ic-^xb&E at rj2O=P cCjD3J+P-ChfArrU3~L^=ueW&(03qxzkxyhgmjD0&

literal 0
HcmV?d00001

new file mode 100644
index 0000000000000000000000000000000000000000..7d2a9d55c1a92dfa2122308cc05a4a5b96d70d8f
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..dc7de29459f4156b999f14fdeb6cb58b58c21a19
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..37037d3920820ae2dab7e40d0c1df612af6f7a94
GIT binary patch

c-=zPFUE8-T at Q?ocgJI2s_VqTe0l at My>J95W4gdfE

literal 0
HcmV?d00001

new file mode 100644
index 0000000000000000000000000000000000000000..df2037a2d2d30afb20e31cd558c92c2edabe7cf6
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..d824d3c17c1cc1c13a18eb1d2c0a7e59f66ba08b
GIT binary patch

m3s?Yk)7$hc|CCdgE1AV8b*ksR at X|#V`g#7#tNI184{X$IS6W&C

literal 0
HcmV?d00001

new file mode 100644
index 0000000000..bf97dc4185
@@ -0,0 +1 @@
+1df823cb8a6d1866148ae50a8009762a9c4c777f

new file mode 100644
index 0000000000..eb50c64a21
@@ -0,0 +1 @@
+objects/*/* binary

new file mode 100644
index 0000000000..bbf19a4bb4
@@ -0,0 +1 @@
+32d61bae693af7879da63b89a60d3ae67f851e56

new file mode 100644
index 0000000000..07d359d07c
@@ -0,0 +1,4 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true

new file mode 100644
index 0000000000000000000000000000000000000000..aaa29dbd8a5a74a24f51a8522b695a7474349f3c
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..50caf8b6282d2287878d1b3481c14431c2a557af
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..a8887b1e611d8f76d7cfe6ab0bb693fdebc2ef19
GIT binary patch

zL;YZ%zj&H6 at zVQ}k03QpsEr&gbf^%;rrSh|f6577xiKw5TzOt&=t@eRd+mRj6>nh7 FU at NX0KJNek

literal 0
HcmV?d00001

new file mode 100644
index 0000000000000000000000000000000000000000..b1fb722c53d827847c6d13029e601a5434b84ac4
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..10f24a087ff08320b8fc5922db728472bd276e9a
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..9db72668cf9374b0b85a25a19f30084fd460072d
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..35d253f0d15b31ea0bc79ed1a287819deed9987d
GIT binary patch

zeR?YT87lKJ&evQHHQdjRq*5tF$Mz2eg>npQHpgm$pR at 75A3{t50g_7*#(Vx at k>bP zbo2ooB)#*Jy;W?Tz~{KNF5e1aPffmJA7!Ps-HSZ+A3WAyyj&}mk0Z5umdb($>r7bW m1T%oxb&nqWPj_N_#(7dgyqD|BX=*u7@$=;t>O#gcx)*r3s*J(

literal 0
HcmV?d00001

new file mode 100644
index 0000000000000000000000000000000000000000..df2037a2d2d30afb20e31cd558c92c2edabe7cf6
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..05c04d2887e9354ec43ad69cef20ed4e7166013d
GIT binary patch

k2QXK?PEUDI&YUmo7jMj0J#12zuDbB=%RR5=4+?N at DHiEdA^-pY

literal 0
HcmV?d00001

new file mode 100644
index 0000000000..39dc53f019
@@ -0,0 +1 @@
+e83f6f805bd016b90acafc8702c52d778eb57310

new file mode 100644
index 0000000000000000000000000000000000000000..ef7fbd4154aea755d8ee2684e420700467e9245c
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..cbf60fc7298ec12b3d7cd388fecac606ca31536e
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..2dd14580e666d35483727598f006148f3eeb03be
GIT binary patch

zoEleBZ(1ed0ZDFA1Yzu;w9*KG<DevlKyHi(Vn9bI*wa>;8n at fvydbGOYBD68F&+ at j z>O_rU6i9A}CNjIUTdDk<yse?|ldUaHzRdT;_w at t&{DsGBw&~IPk`G*HFrddZ%R7(& iY^CdTqd(=?yg2A2W0!QDD0C&p&b@ZOys|fCz-zg3O;?Bj

literal 0
HcmV?d00001

new file mode 100644
index 0000000000000000000000000000000000000000..70cf1795f3210f81951d0995823bb958867ba710
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..2cbdce1f95493b284df1f8ca3ca953a5fb813072
GIT binary patch

z*+yrKCG>Htpv)kOZ{w$R{aqq=Y5Kr at lr^^Nx#*Anz+HXf*Qs*3>|(2*8XW|19*ox$ l7yz~DHa*fm<<#}Iz=TR2%V|wAwVbErzJKLa{Q<P{YY&#BUEBZw

literal 0
HcmV?d00001

new file mode 100644
index 0000000000000000000000000000000000000000..4d82169300d0d8a2e31ced481501bff6647ef6b7
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..6d0ae484c3333d6b18cf726d5bb468669f9d16c1
GIT binary patch

new file mode 100644
index 0000000000..e9f4f32c30
@@ -0,0 +1 @@
+2fa37f6885d7eb746df75eccaddbacf3ac82799d

index aa95519e74..2b0bd18a2c 100644
@@ -50,3 +50,5 @@ class TestGitRefs(GitTestBase):
         self.check_download("git-partial-sha1-reachable-by-branch")
         self.check_download("git-sha1-branch-head")
         self.check_download("git-sha1-reachable-by-branch")
+        self.check_download("git-submodule-disabled")
+        self.check_download("git-submodule-enabled")

2.14.2

This week I will send a new iteration of this series after refreshing it in current master (with the new download infra) and adding a few patches, so I am marking it as Changes Requested.

Regards,
Ricardo

Hello,

This series adds automated tests for the git download infra.

Changes v3 -> v4:
- the first 2 patches from v3 got applied;
- refresh the series in current master (with new download infra);
- add few patches I was holding back to send later;
- allow the use of multiple br2-external trees, simplifying patch 3;
- many code improvements to patch 4;
The detailed changelog is part of each patch.

This series does not yet test the cache function, all test cases run with an empty git cache, but it is a step towards it.

The first 3 patches prepare the test infra to have the git test cases.

Patch 4 adds a test case that ensures hash checking is enabled for git packages.

Remaining patches, except the last one, add a test case that checks each type of git ref (tag, sha1, ...) that can be used as version for a package with download method git.
I created a single test case because:
- for all ref types it only takes 3 minutes to run;
- the feature under test is OK if all kinds of supported refs work.
But I split it in many patches because a static git repo is used, which is not trivial to review. So each patch adds the needed git objects and the associated .mk and .hash files. This way any rework/drop/rebase/revert is easier. In order to make review easier I also added to the comment area of each patch (after ---) the layout of the static repo with all patches until that one applied (generated by git log --graph).

Last patch is a RFC to detect regressions after the bug found by Luca becomes fixed by Yann's series. See:
http://lists.busybox.net/pipermail/buildroot/2018-April/219627.html
http://lists.busybox.net/pipermail/buildroot/2018-April/219665.html

Here a complete run on Gitlab CI, with the series applied on master (7a801da8e):
https://gitlab.com/RicardoMartincoski/buildroot/pipelines/21247818

Regards,
Ricardo

Ricardo Martincoski (12):
testing/infra/builder: build with target and environment testing/infra: split runtime test from BRTest testing/infra/basetest: support br2-external testing/tests/download: add git hash test testing/tests/download: test case for git refs testing/tests/download: test git branch testing/tests/download: test git submodules testing/tests/download: test git tag testing/tests/download: test git tag/branch precedence testing/tests/download: test git special ref testing/tests/download: test git branch with slash support/testing: test extra download with site method git

 .gitlab-ci.yml                                     |   3 +
 support/testing/infra/basetest.py                  |  13 +--
 support/testing/infra/builder.py                   |  38 +++++++-
 support/testing/infra/runtimetest.py               |  23 +++++
 support/testing/infra/server.py                    |  39 ++++++++
 support/testing/tests/boot/test_atf.py             |   7 +-
 support/testing/tests/core/test_post_scripts.py    |   3 +-
 support/testing/tests/core/test_rootfs_overlay.py  |   3 +-
 support/testing/tests/core/test_timezone.py        |   7 +-
 support/testing/tests/download/__init__.py         |   0
 .../br2-external/git-extra-download/Config.in      |   0
 .../br2-external/git-extra-download/external.desc  |   1 +
 .../br2-external/git-extra-download/external.mk    |   6 ++
 .../package/extra-fails/extra-fails.hash           |   3 +
 .../package/extra-fails/extra-fails.mk             |  12 +++
 .../package/main-fails/main-fails.hash             |   3 +
 .../package/main-fails/main-fails.mk               |  12 +++
 .../git-extra-download/package/ok/ok.hash          |   3 +
 .../git-extra-download/package/ok/ok.mk            |  12 +++
 .../tests/download/br2-external/git-hash/Config.in |   0
 .../download/br2-external/git-hash/external.desc   |   1 +
 .../download/br2-external/git-hash/external.mk     |   4 +
 .../br2-external/git-hash/package/bad/bad.hash     |   1 +
 .../br2-external/git-hash/package/bad/bad.mk       |  10 ++
 .../br2-external/git-hash/package/good/good.hash   |   1 +
 .../br2-external/git-hash/package/good/good.mk     |  10 ++
 .../br2-external/git-hash/package/nohash/nohash.mk |  10 ++
 .../tests/download/br2-external/git-refs/Config.in |   0
 .../download/br2-external/git-refs/external.desc   |   1 +
 .../download/br2-external/git-refs/external.mk     |   4 +
 .../git-branch-takes-precedence-over-tag.hash      |   3 +
 .../git-branch-takes-precedence-over-tag.mk        |  11 +++
 .../git-branch-with-slash.hash                     |   2 +
 .../git-branch-with-slash/git-branch-with-slash.mk |  11 +++
 .../git-refs/package/git-branch/git-branch.hash    |   2 +
 .../git-refs/package/git-branch/git-branch.mk      |  11 +++
 .../git-partial-sha1-branch-head.hash              |   2 +
 .../git-partial-sha1-branch-head.mk                |  11 +++
 .../git-partial-sha1-reachable-by-branch.hash      |   2 +
 .../git-partial-sha1-reachable-by-branch.mk        |  11 +++
 .../git-partial-sha1-reachable-by-tag.hash         |   2 +
 .../git-partial-sha1-reachable-by-tag.mk           |  11 +++
 .../git-partial-sha1-tag-itself.hash               |   2 +
 .../git-partial-sha1-tag-itself.mk                 |  11 +++
 .../git-partial-sha1-tag-points-to.hash            |   2 +
 .../git-partial-sha1-tag-points-to.mk              |  11 +++
 .../git-sha1-branch-head/git-sha1-branch-head.hash |   2 +
 .../git-sha1-branch-head/git-sha1-branch-head.mk   |  11 +++
 .../git-sha1-reachable-by-branch.hash              |   2 +
 .../git-sha1-reachable-by-branch.mk                |  11 +++
 .../git-sha1-reachable-by-tag.hash                 |   2 +
 .../git-sha1-reachable-by-tag.mk                   |  11 +++
 .../git-sha1-tag-itself/git-sha1-tag-itself.hash   |   2 +
 .../git-sha1-tag-itself/git-sha1-tag-itself.mk     |  11 +++
 .../git-sha1-tag-points-to.hash                    |   2 +
 .../git-sha1-tag-points-to.mk                      |  11 +++
 .../package/git-special-ref/git-special-ref.hash   |   2 +
 .../package/git-special-ref/git-special-ref.mk     |  11 +++
 .../git-submodule-disabled.hash                    |   2 +
 .../git-submodule-disabled.mk                      |  11 +++
 .../git-submodule-enabled.hash                     |   4 +
 .../git-submodule-enabled/git-submodule-enabled.mk |  28 ++++++
 .../git-refs/package/git-tag/git-tag.hash          |   2 +
 .../git-refs/package/git-tag/git-tag.mk            |  11 +++
 .../git-wrong-content/git-wrong-content.hash       |   2 +
 .../package/git-wrong-content/git-wrong-content.mk |  11 +++
 .../package/git-wrong-sha1/git-wrong-sha1.mk       |  11 +++
 .../git-remote/refs-sub1.git/.gitattributes        |   1 +
 .../tests/download/git-remote/refs-sub1.git/HEAD   |   1 +
 .../tests/download/git-remote/refs-sub1.git/config |   4 +
 .../07/cabc655213bdf7087d8dd50fda95124e935570      | Bin 0 -> 22 bytes
 .../1d/f823cb8a6d1866148ae50a8009762a9c4c777f      | Bin 0 -> 180 bytes
 .../7d/52f458bdb0f9f5a4beb46fa82824421b8b988e      | Bin 0 -> 65 bytes
 .../99/f2e3e1cb15f9b52fa29f66d380dda061d917ab      | Bin 0 -> 49 bytes
 .../a1/30af1626bbadd64841b2cbcb6ac4ed0638ba1a      | Bin 0 -> 122 bytes
 .../bc/c81ba6e5bd8bf52c95688ae8d3e697e131fa23      | Bin 0 -> 22 bytes
 .../cb/545facf77bbc5f24f95b6d503c338d10b7b717      | Bin 0 -> 151 bytes
 .../dd/130f6f4629514adaf2e03407f3ed9344eb6cd6      | Bin 0 -> 122 bytes
 .../e7/9c5e8f964493290a409888d5413a737e8e5dd5      | Bin 0 -> 23 bytes
 .../f8/001e5780100962a5e30a25cbc4c9609cfc7bf3      | Bin 0 -> 184 bytes
 .../git-remote/refs-sub1.git/refs/heads/submodule  |   1 +
 .../git-remote/refs-sub2.git/.gitattributes        |   1 +
 .../tests/download/git-remote/refs-sub2.git/HEAD   |   1 +
 .../tests/download/git-remote/refs-sub2.git/config |   4 +
 .../0a/846af45c3e455789435f49f80d70e86b65b9d7      | Bin 0 -> 22 bytes
 .../0b/32ebd8fc52cec991f18c94be980e85a8341585      | Bin 0 -> 22 bytes
 .../32/d61bae693af7879da63b89a60d3ae67f851e56      | Bin 0 -> 151 bytes
 .../3e/9b0a5198c64cea9c00f820433411e3b4d50c1c      | Bin 0 -> 48 bytes
 .../85/8f666af75b7c0dfba6b8be7eac5f196e7a1221      | Bin 0 -> 49 bytes
 .../99/f2e3e1cb15f9b52fa29f66d380dda061d917ab      | Bin 0 -> 49 bytes
 .../cd/4d62ff218ab7b4a04f5bfdf800ace087af3ceb      | Bin 0 -> 184 bytes
 .../e7/9c5e8f964493290a409888d5413a737e8e5dd5      | Bin 0 -> 23 bytes
 .../e8/3f6f805bd016b90acafc8702c52d778eb57310      | Bin 0 -> 182 bytes
 .../git-remote/refs-sub2.git/refs/heads/submodule  |   1 +
 .../download/git-remote/repo.git/.gitattributes    |   1 +
 .../tests/download/git-remote/repo.git/HEAD        |   1 +
 .../tests/download/git-remote/repo.git/config      |   4 +
 .../0b/d8ceb961c3b2b210f64a67d57f4b5cd669d343      | Bin 0 -> 22 bytes
 .../11/93ff46343f4f6a0522e2b28b871e905178c1f0      | Bin 0 -> 23 bytes
 .../17/c409592968d17600ff9912e96fdd461bb72e74      | Bin 0 -> 48 bytes
 .../25/59d83bfe937fc0412d96ed664663c9e8a99055      | Bin 0 -> 22 bytes
 .../2b/0e0d98a49c97da6a618ab36337e2058eb733a2      | Bin 0 -> 137 bytes
 .../2f/a37f6885d7eb746df75eccaddbacf3ac82799d      | Bin 0 -> 180 bytes
 .../31/7406308d9259e2231bd0d6ddad3de3832bce08      | Bin 0 -> 182 bytes
 .../34/d1da713bf7de1c535e1d7d3ca985afd84bc7e5      | Bin 0 -> 23 bytes
 .../42/c7c82cc86a07a73cb4499345eff2eccfe668bc      | Bin 0 -> 19 bytes
 .../46/bae5b639e5a18e2cc4dc508f080d566baeff59      | Bin 0 -> 182 bytes
 .../47/3b7c2f803ad64eac57695ff57a5a6a8b34cbdd      | Bin 0 -> 49 bytes
 .../51/6c9c5f64ec66534d4d069c2e408d9ae4dce023      | Bin 0 -> 182 bytes
 .../53/122a7b0454b33c6d9e159c10657173db77899e      | Bin 0 -> 27 bytes
 .../68/c197d0879d485f4f6cee85544722b79e68e59f      | Bin 0 -> 184 bytes
 .../80/858c1ab821392fd59a897dbaedd7d07e1ac403      | Bin 0 -> 22 bytes
 .../83/e0f402891d9de91e7007f8534884ec4b9c7c2c      | Bin 0 -> 183 bytes
 .../8b/8a7e885a041da72b1ee9a47c5b9300b172a9e7      | Bin 0 -> 65 bytes
 .../8e/a6edb6df557ee935de556113bab2b5f9ecbabf      | Bin 0 -> 49 bytes
 .../92/ef85be57d627f280d8ce3724452ac21c9a6452      | Bin 0 -> 20 bytes
 .../99/f2e3e1cb15f9b52fa29f66d380dda061d917ab      | Bin 0 -> 49 bytes
 .../a2/38b1dfcd825d47d834af3c5223417c8411d90d      | Bin 0 -> 152 bytes
 .../a8/f73649910ce50c48626de0329a0174263ebb5b      | Bin 0 -> 183 bytes
 .../a9/dbc1e23c45e8e1b88c0448763f54d714eb6f8f      | Bin 0 -> 183 bytes
 .../b2/4b387624edc78d0292a127c43cad9ba97c6232      | Bin 0 -> 49 bytes
 .../b7/2ff6078f62522a87f5cae5e9f34dedf5ec3885      | Bin 0 -> 186 bytes
 .../b8/5af389ad1ce39dfb897f8403b12f8d830053f2      | Bin 0 -> 49 bytes
 .../ce/5d9d43cc09b37eb0ebe677b18f81933b950b60      | Bin 0 -> 187 bytes
 .../cf/0f4f85d7a1237e377a2d25b996518a877ea001      | Bin 0 -> 49 bytes
 .../d4/e2941d18a63535400476324ddeb7f40164be41      | Bin 0 -> 121 bytes
 .../e0/de76f5d12508fa80efca376f0e2a822fedcfdd      | Bin 0 -> 144 bytes
 .../e2/2695cbf976fed1f543ad7486a531c0af473482      | Bin 0 -> 49 bytes
 .../e2/cfe068f7e5bf4de32ffe1241da53abce9fa89e      | Bin 0 -> 49 bytes
 .../e7/9c5e8f964493290a409888d5413a737e8e5dd5      | Bin 0 -> 23 bytes
 .../ed/aa7c3edd6ff3866f476824babd820ae42f1040      | Bin 0 -> 31 bytes
 .../f6/476b879f65e956d7dedd5b08736369e9a24acc      | Bin 0 -> 20 bytes
 .../fe/74231105841041d5f441e70399d37f0e600aa5      | Bin 0 -> 121 bytes
 .../git-remote/repo.git/refs/changes/01/1/2        |   1 +
 .../download/git-remote/repo.git/refs/heads/master |   1 +
 .../git-remote/repo.git/refs/heads/mybranch        |   1 +
 .../git-remote/repo.git/refs/heads/mybranchandtag  |   1 +
 .../repo.git/refs/heads/myfeature/mybranch         |   1 +
 .../git-remote/repo.git/refs/heads/submodule       |   1 +
 .../git-remote/repo.git/refs/tags/mybranchandtag   |   1 +
 .../download/git-remote/repo.git/refs/tags/mytag   |   1 +
 support/testing/tests/download/gitremote.py        |  15 +++
 support/testing/tests/download/http-server/extra   |   1 +
 support/testing/tests/download/httpserver.py       |  14 +++
 support/testing/tests/download/test_git.py         | 105 +++++++++++++++++++++
 support/testing/tests/fs/test_ext.py               |   9 +-
 support/testing/tests/fs/test_iso9660.py           |  13 +--
 support/testing/tests/fs/test_jffs2.py             |   3 +-
 support/testing/tests/fs/test_squashfs.py          |   3 +-
 support/testing/tests/fs/test_ubi.py               |   3 +-
 support/testing/tests/fs/test_yaffs2.py            |   3 +-
 support/testing/tests/init/base.py                 |   3 +-
 support/testing/tests/package/test_dropbear.py     |   3 +-
 support/testing/tests/package/test_python.py       |   3 +-
 support/testing/tests/package/test_rust.py         |   3 +-
 support/testing/tests/package/test_syslog_ng.py    |   3 +-
 support/testing/tests/toolchain/test_external.py   |   3 +-
 157 files changed, 667 insertions(+), 43 deletions(-)
 create mode 100644 support/testing/infra/runtimetest.py
 create mode 100644 support/testing/infra/server.py
 create mode 100644 support/testing/tests/download/__init__.py
 create mode 100644 support/testing/tests/download/br2-external/git-extra-download/Config.in
 create mode 100644 support/testing/tests/download/br2-external/git-extra-download/external.desc
 create mode 100644 support/testing/tests/download/br2-external/git-extra-download/external.mk
 create mode 100644 support/testing/tests/download/br2-external/git-extra-download/package/extra-fails/extra-fails.hash
 create mode 100644 support/testing/tests/download/br2-external/git-extra-download/package/extra-fails/extra-fails.mk
 create mode 100644 support/testing/tests/download/br2-external/git-extra-download/package/main-fails/main-fails.hash
 create mode 100644 support/testing/tests/download/br2-external/git-extra-download/package/main-fails/main-fails.mk
 create mode 100644 support/testing/tests/download/br2-external/git-extra-download/package/ok/ok.hash
 create mode 100644 support/testing/tests/download/br2-external/git-extra-download/package/ok/ok.mk
 create mode 100644 support/testing/tests/download/br2-external/git-hash/Config.in
 create mode 100644 support/testing/tests/download/br2-external/git-hash/external.desc
 create mode 100644 support/testing/tests/download/br2-external/git-hash/external.mk
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/bad/bad.hash
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/bad/bad.mk
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/good/good.hash
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/good/good.mk
 create mode 100644 support/testing/tests/download/br2-external/git-hash/package/nohash/nohash.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/Config.in
 create mode 100644 support/testing/tests/download/br2-external/git-refs/external.desc
 create mode 100644 support/testing/tests/download/br2-external/git-refs/external.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-branch-takes-precedence-over-tag/git-branch-takes-precedence-over-tag.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-branch-takes-precedence-over-tag/git-branch-takes-precedence-over-tag.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-branch-with-slash/git-branch-with-slash.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-branch-with-slash/git-branch-with-slash.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-branch/git-branch.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-branch/git-branch.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-branch-head/git-partial-sha1-branch-head.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-branch/git-partial-sha1-reachable-by-branch.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-reachable-by-tag/git-partial-sha1-reachable-by-tag.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-itself/git-partial-sha1-tag-itself.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-partial-sha1-tag-points-to/git-partial-sha1-tag-points-to.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-branch-head/git-sha1-branch-head.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-branch/git-sha1-reachable-by-branch.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-reachable-by-tag/git-sha1-reachable-by-tag.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-itself/git-sha1-tag-itself.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-sha1-tag-points-to/git-sha1-tag-points-to.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-special-ref/git-special-ref.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-special-ref/git-special-ref.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-submodule-disabled/git-submodule-disabled.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-submodule-enabled/git-submodule-enabled.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-tag/git-tag.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.hash
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-wrong-content/git-wrong-content.mk
 create mode 100644 support/testing/tests/download/br2-external/git-refs/package/git-wrong-sha1/git-wrong-sha1.mk
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/.gitattributes
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/HEAD
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/config
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/07/cabc655213bdf7087d8dd50fda95124e935570
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/1d/f823cb8a6d1866148ae50a8009762a9c4c777f
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/7d/52f458bdb0f9f5a4beb46fa82824421b8b988e
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/a1/30af1626bbadd64841b2cbcb6ac4ed0638ba1a
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/bc/c81ba6e5bd8bf52c95688ae8d3e697e131fa23
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/cb/545facf77bbc5f24f95b6d503c338d10b7b717
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/dd/130f6f4629514adaf2e03407f3ed9344eb6cd6
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/objects/f8/001e5780100962a5e30a25cbc4c9609cfc7bf3
 create mode 100644 support/testing/tests/download/git-remote/refs-sub1.git/refs/heads/submodule
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/.gitattributes
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/HEAD
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/config
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/0a/846af45c3e455789435f49f80d70e86b65b9d7
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/0b/32ebd8fc52cec991f18c94be980e85a8341585
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/32/d61bae693af7879da63b89a60d3ae67f851e56
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/3e/9b0a5198c64cea9c00f820433411e3b4d50c1c
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/85/8f666af75b7c0dfba6b8be7eac5f196e7a1221
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/cd/4d62ff218ab7b4a04f5bfdf800ace087af3ceb
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/objects/e8/3f6f805bd016b90acafc8702c52d778eb57310
 create mode 100644 support/testing/tests/download/git-remote/refs-sub2.git/refs/heads/submodule
 create mode 100644 support/testing/tests/download/git-remote/repo.git/.gitattributes
 create mode 100644 support/testing/tests/download/git-remote/repo.git/HEAD
 create mode 100644 support/testing/tests/download/git-remote/repo.git/config
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/0b/d8ceb961c3b2b210f64a67d57f4b5cd669d343
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/11/93ff46343f4f6a0522e2b28b871e905178c1f0
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/17/c409592968d17600ff9912e96fdd461bb72e74
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/25/59d83bfe937fc0412d96ed664663c9e8a99055
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/2b/0e0d98a49c97da6a618ab36337e2058eb733a2
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/2f/a37f6885d7eb746df75eccaddbacf3ac82799d
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/31/7406308d9259e2231bd0d6ddad3de3832bce08
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/34/d1da713bf7de1c535e1d7d3ca985afd84bc7e5
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/42/c7c82cc86a07a73cb4499345eff2eccfe668bc
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/46/bae5b639e5a18e2cc4dc508f080d566baeff59
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/47/3b7c2f803ad64eac57695ff57a5a6a8b34cbdd
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/51/6c9c5f64ec66534d4d069c2e408d9ae4dce023
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/53/122a7b0454b33c6d9e159c10657173db77899e
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/68/c197d0879d485f4f6cee85544722b79e68e59f
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/80/858c1ab821392fd59a897dbaedd7d07e1ac403
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/83/e0f402891d9de91e7007f8534884ec4b9c7c2c
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/8b/8a7e885a041da72b1ee9a47c5b9300b172a9e7
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/8e/a6edb6df557ee935de556113bab2b5f9ecbabf
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/92/ef85be57d627f280d8ce3724452ac21c9a6452
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/99/f2e3e1cb15f9b52fa29f66d380dda061d917ab
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/a2/38b1dfcd825d47d834af3c5223417c8411d90d
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/a8/f73649910ce50c48626de0329a0174263ebb5b
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/a9/dbc1e23c45e8e1b88c0448763f54d714eb6f8f
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/b2/4b387624edc78d0292a127c43cad9ba97c6232
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/b7/2ff6078f62522a87f5cae5e9f34dedf5ec3885
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/b8/5af389ad1ce39dfb897f8403b12f8d830053f2
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/ce/5d9d43cc09b37eb0ebe677b18f81933b950b60
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/cf/0f4f85d7a1237e377a2d25b996518a877ea001
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/d4/e2941d18a63535400476324ddeb7f40164be41
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/e0/de76f5d12508fa80efca376f0e2a822fedcfdd
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/e2/2695cbf976fed1f543ad7486a531c0af473482
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/e2/cfe068f7e5bf4de32ffe1241da53abce9fa89e
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/e7/9c5e8f964493290a409888d5413a737e8e5dd5
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/ed/aa7c3edd6ff3866f476824babd820ae42f1040
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/f6/476b879f65e956d7dedd5b08736369e9a24acc
 create mode 100644 support/testing/tests/download/git-remote/repo.git/objects/fe/74231105841041d5f441e70399d37f0e600aa5
 create mode 100644 support/testing/tests/download/git-remote/repo.git/refs/changes/01/1/2
 create mode 100644 support/testing/tests/download/git-remote/repo.git/refs/heads/master
 create mode 100644 support/testing/tests/download/git-remote/repo.git/refs/heads/mybranch
 create mode 100644 support/testing/tests/download/git-remote/repo.git/refs/heads/mybranchandtag
 create mode 100644 support/testing/tests/download/git-remote/repo.git/refs/heads/myfeature/mybranch
 create mode 100644 support/testing/tests/download/git-remote/repo.git/refs/heads/submodule
 create mode 100644 support/testing/tests/download/git-remote/repo.git/refs/tags/mybranchandtag
 create mode 100644 support/testing/tests/download/git-remote/repo.git/refs/tags/mytag
 create mode 100644 support/testing/tests/download/gitremote.py
 create mode 100644 support/testing/tests/download/http-server/extra
 create mode 100644 support/testing/tests/download/httpserver.py
 create mode 100644 support/testing/tests/download/test_git.py

2.14.1

From: Ricardo Martincoski <[email protected]>

Make the builder able to call 'VAR1=1 make VAR2=2 target'.

Allow to send extra parameters to be added to the end of make command line. It can be used for these purposes:
- to configure a br2-external, by passing 'BR2_EXTERNAL="dir"';
- to specify a make target, such as 'foo-source'.

Allow to add variables to the environment in which make runs. It can be used to override values from environment, such as 'BR2_DL_DIR="dl"'.

This change will be needed when adding a common class to test the git download infra.

---
Changes v3 -> v4:
- no changes

Changes v2 -> v3:
- rebase after adding patch 1 to the series, which runs make using an

    empty env;
  - use docstring (Arnout Vandecappelle);
  - use more descriptive parameter names (make_extra_opts,
    make_extra_env) (Arnout Vandecappelle);
  - default make_extra_env to {} and use update() (Arnout
    Vandecappelle);
  - for consistence I did the equivalent to make_extra_opts;
  - for symmetry, use make_extra_env also in the configure() (Arnout
    Vandecappelle);

- remove old example from commit message since using a static repo to test git refs do not need to override _VERSION.

Changes v1 -> v2:
- new patch to adapt the test infra to test git download;

---
 support/testing/infra/builder.py | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

index faf1eb1494..d478c0d212 100644
@@ -12,7 +12,18 @@ class Builder(object):
         self.builddir = builddir
         self.logfile = infra.open_log_file(builddir, "build", logtofile)
 
-    def configure(self):
+    def configure(self, make_extra_opts=[], make_extra_env={}):
+        """
+        Configure the build.
+
+        make_extra_opts: a list of arguments to be passed to the make
+        command.
+        e.g. make_extra_opts=["BR2_EXTERNAL=/path"]
+
+        make_extra_env: a dict of variables to be appended (or replaced)
+        in the environment that calls make.
+        e.g. make_extra_env={"BR2_DL_DIR": "/path"}
+        """
         if not os.path.isdir(self.builddir):
             os.makedirs(self.builddir)
 

@@ -25,17 +36,36 @@ class Builder(object):
         self.logfile.flush()
 
         env = {"PATH": os.environ["PATH"]}
+        env.update(make_extra_env)
+
         cmd = ["make",
-               "O={}".format(self.builddir),
-               "olddefconfig"]
+               "O={}".format(self.builddir)]
+        cmd += make_extra_opts
+        cmd += ["olddefconfig"]
+
         ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile,
                               env=env)
         if ret != 0:
             raise SystemError("Cannot olddefconfig")
 
-    def build(self):
+    def build(self, make_extra_opts=[], make_extra_env={}):
+        """
+        Perform the build.
+
+        make_extra_opts: a list of arguments to be passed to the make
+        command. It can include a make target.
+        e.g. make_extra_opts=["foo-source"]
+
+        make_extra_env: a dict of variables to be appended (or replaced)
+        in the environment that calls make.
+        e.g. make_extra_env={"BR2_DL_DIR": "/path"}
+        """
         env = {"PATH": os.environ["PATH"]}
+        env.update(make_extra_env)
+
         cmd = ["make", "-C", self.builddir]
+        cmd += make_extra_opts
+
         ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile,
                               env=env)
         if ret != 0:

2.14.1

From: Ricardo Martincoski <[email protected]>

Move the setup of emulator to a new class, RuntimeTestBase, that bahaves exactly like BRTest currently does.
It will avoid duplicating code when adding a common class to test the git download infra.

Change all current test cases to use the new class. Do this by first using automatic replace:

$ find support/testing/ -name '*.py' | \
  xargs grep -l BRTest | \
  xargs sed -i \
    -e 's,import infra.basetest,\0\nimport infra.runtimetest,g' \
    -e 's,infra.basetest.BRTest,infra.runtimetest.RuntimeTestBase,g'
and then manually add code to import runtimetest in test_external.py to
avoid this error:
 AttributeError: 'module' object has no attribute 'LoadTestsFailure'
This explicit import was not need before because run-tests imports
BRTest and this is the only test file that do not use the defconfig
fragments from basetest.py in its code.

---
WARNING: this patch changes all current test cases, so if a new test case was applied after this patch was sent, 'git am' will apply this patch cleanly, yet any testcase created in the meantime will be broken.
But I can refresh it if need. It will probably only need the automatic replace from the commit log to be re-run.

Changes v3 -> v4:
- re-run the automatic replace command

Changes v2 -> v3:
- new patch
- search for "RuntimeTestBase" in

    http://patchwork.ozlabs.org/patch/806161/
---
 support/testing/infra/basetest.py                 | 10 ----------
 support/testing/infra/runtimetest.py              | 23 +++++++++++++++++++++++
 support/testing/tests/boot/test_atf.py            |  7 ++++---
 support/testing/tests/core/test_post_scripts.py   |  3 ++-
 support/testing/tests/core/test_rootfs_overlay.py |  3 ++-
 support/testing/tests/core/test_timezone.py       |  7 ++++---
 support/testing/tests/fs/test_ext.py              |  9 +++++----
 support/testing/tests/fs/test_iso9660.py          | 13 +++++++------
 support/testing/tests/fs/test_jffs2.py            |  3 ++-
 support/testing/tests/fs/test_squashfs.py         |  3 ++-
 support/testing/tests/fs/test_ubi.py              |  3 ++-
 support/testing/tests/fs/test_yaffs2.py           |  3 ++-
 support/testing/tests/init/base.py                |  3 ++-
 support/testing/tests/package/test_dropbear.py    |  3 ++-
 support/testing/tests/package/test_python.py      |  3 ++-
 support/testing/tests/package/test_rust.py        |  3 ++-
 support/testing/tests/package/test_syslog_ng.py   |  3 ++-
 support/testing/tests/toolchain/test_external.py  |  3 ++-
 18 files changed, 67 insertions(+), 38 deletions(-)
 create mode 100644 support/testing/infra/runtimetest.py

index f3f13ad97f..4773312585 100644
@@ -3,7 +3,6 @@ import os
 import datetime
 
 from infra.builder import Builder
-from infra.emulator import Emulator
 
 BASIC_TOOLCHAIN_CONFIG = \
     """

@@ -41,7 +40,6 @@ class BRTest(unittest.TestCase):
         super(BRTest, self).__init__(names)
         self.testname = self.__class__.__name__
         self.builddir = self.outputdir and os.path.join(self.outputdir, self.testname)
-        self.emulator = None
         self.config += '\nBR2_DL_DIR="{}"\n'.format(self.downloaddir)
         self.config += "\nBR2_JLEVEL={}\n".format(self.jlevel)
 

@@ -57,17 +55,9 @@ class BRTest(unittest.TestCase):
             self.b.delete()
 
         if not self.b.is_finished():
-            self.show_msg("Building")
             self.b.configure()
-            self.b.build()
-            self.show_msg("Building done")
-
-        self.emulator = Emulator(self.builddir, self.downloaddir,
-                                 self.logtofile, self.timeout_multiplier)
 
     def tearDown(self):
         self.show_msg("Cleaning up")
-        if self.emulator:
-            self.emulator.stop()
         if self.b and not self.keepbuilds:
             self.b.delete()

new file mode 100644
index 0000000000..68bb03d091
@@ -0,0 +1,23 @@
+from infra.basetest import BRTest
+from infra.emulator import Emulator
+
+
+class RuntimeTestBase(BRTest):
+    def __init__(self, names):
+        super(RuntimeTestBase, self).__init__(names)
+        self.emulator = None
+
+    def setUp(self):
+        super(RuntimeTestBase, self).setUp()
+        if not self.b.is_finished():
+            self.show_msg("Building")
+            self.b.build()
+            self.show_msg("Building done")
+
+        self.emulator = Emulator(self.builddir, self.downloaddir,
+                                 self.logtofile, self.timeout_multiplier)
+
+    def tearDown(self):
+        if self.emulator:
+            self.emulator.stop()
+        super(RuntimeTestBase, self).tearDown()

index 75cea01fc8..0ea486fb5b 100644
@@ -1,7 +1,8 @@
 import infra.basetest
+import infra.runtimetest
 
 
-class TestATFVexpress(infra.basetest.BRTest):
+class TestATFVexpress(infra.runtimetest.RuntimeTestBase):
     config = \
         """
         BR2_aarch64=y

@@ -25,7 +26,7 @@ class TestATFVexpress(infra.basetest.BRTest):
         pass
 
 
-class TestATFAllwinner(infra.basetest.BRTest):
+class TestATFAllwinner(infra.runtimetest.RuntimeTestBase):
     config = \
         """
         BR2_aarch64=y

@@ -54,7 +55,7 @@ class TestATFAllwinner(infra.basetest.BRTest):
         pass
 
 
-class TestATFMarvell(infra.basetest.BRTest):
+class TestATFMarvell(infra.runtimetest.RuntimeTestBase):
     config = \
         """
         BR2_aarch64=y

index a0e5b6b454..c4dfb91550 100644
@@ -2,9 +2,10 @@ import os
 import csv
 
 import infra.basetest
+import infra.runtimetest
 
 
-class TestPostScripts(infra.basetest.BRTest):
+class TestPostScripts(infra.runtimetest.RuntimeTestBase):
     config = infra.basetest.BASIC_TOOLCHAIN_CONFIG + \
         """
         BR2_INIT_NONE=y

index fedd40d8ac..66b5531221 100644
@@ -2,13 +2,14 @@ import os
 import subprocess
 
 import infra.basetest
+import infra.runtimetest
 
 
 def compare_file(file1, file2):
     return subprocess.call(["cmp", file1, file2])
 
 
-class TestRootfsOverlay(infra.basetest.BRTest):
+class TestRootfsOverlay(infra.runtimetest.RuntimeTestBase):
 
     rootfs_overlay_path = infra.filepath("tests/core/rootfs-overlay")
 

index 050624e0aa..dca38bebe8 100644
@@ -1,6 +1,7 @@
 import os
 
 import infra.basetest
+import infra.runtimetest
 
 
 def boot_armv5_cpio(emulator, builddir):