Message ID | 20170917092028.5236-1-yann.morin.1998@free.fr |
---|---|
State | Accepted |
Headers | show |
Series | support/run-tests: export download dir | expand |
Hello, On Sun, 17 Sep 2017 11:20:28 +0200, Yann E. MORIN wrote: > Currently, the download directory, when specified with the -d option, is > only used to store the files downloaded by the testing infra, not those > downloaded by Buildroot. > > So, we end up with this situation: > > BR2_DL_DIR | -d DIR | test downloads | BR downloads > ------------+----------+------------------+-------------- > unset | unset | [error] | [error] > unset | set | in $(DIR) | in $(TOP_DIR)/dl > set | unset | in $(BR2_DL_DIR) | in $(BR2_DL_DIR) > set | set | in $(DIR) | in $(BR2_DL_DIR) > > This is not very consistent. > > We change the behaviour so that the value of -d always takes precedence, > and is used by Buildroot as well, giving this new behaviour: > > 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) > > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Cc: Ricardo Martincoski <ricardo.martincoski@gmail.com> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > --- > support/testing/run-tests | 1 + > 1 file changed, 1 insertion(+) Indeed, makes sense. Applied, thanks! Thomas
diff --git a/support/testing/run-tests b/support/testing/run-tests index ae0bd336b5..5c9897e0f5 100755 --- a/support/testing/run-tests +++ b/support/testing/run-tests @@ -57,6 +57,7 @@ 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"
Currently, the download directory, when specified with the -d option, is only used to store the files downloaded by the testing infra, not those downloaded by Buildroot. So, we end up with this situation: BR2_DL_DIR | -d DIR | test downloads | BR downloads ------------+----------+------------------+-------------- unset | unset | [error] | [error] unset | set | in $(DIR) | in $(TOP_DIR)/dl set | unset | in $(BR2_DL_DIR) | in $(BR2_DL_DIR) set | set | in $(DIR) | in $(BR2_DL_DIR) This is not very consistent. We change the behaviour so that the value of -d always takes precedence, and is used by Buildroot as well, giving this new behaviour: 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) Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Ricardo Martincoski <ricardo.martincoski@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- support/testing/run-tests | 1 + 1 file changed, 1 insertion(+)