From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1800
The merge window exposed a bug in the redhat/self-test/data/create-data.sh script where the local variables were being reported instead of the test variables. Fix the create-data.sh script by moving the reporting of the Makefile.variables into the dist-dump-variables target. This has the minor annoyance that dist-dump-variables will report Makefile.variables twice when executed on the command line, however, it's something I think we can live with. In addition, the "Makefile contents" test needs to be adjusted because a "?=" now appears in the redhat/Makefile. Signed-off-by: Prarit Bhargava <[email protected]> --- redhat/self-test/data/centos-2585cf9dfaad.el7 | 36 ++++++++---------------- redhat/self-test/data/centos-2585cf9dfaad.fc25 | 36 ++++++++---------------- redhat/self-test/data/centos-78e36f3b0dae.el7 | 34 +++++++---------------- redhat/self-test/data/centos-78e36f3b0dae.fc25 | 34 +++++++---------------- redhat/self-test/data/centos-df0cc57e057f.el7 | 36 ++++++++---------------- redhat/self-test/data/centos-df0cc57e057f.fc25 | 36 ++++++++---------------- redhat/self-test/data/centos-fce15c45d3fb.el7 | 34 +++++++---------------- redhat/self-test/data/centos-fce15c45d3fb.fc25 | 34 +++++++---------------- redhat/self-test/data/create-data.sh | 35 +++++++++++------------- redhat/self-test/data/fedora-2585cf9dfaad.el7 | 37 +++++++++---------------- redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 37 +++++++++---------------- redhat/self-test/data/fedora-78e36f3b0dae.el7 | 35 ++++++++---------------- redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 35 ++++++++---------------- redhat/self-test/data/fedora-df0cc57e057f.el7 | 37 +++++++++---------------- redhat/self-test/data/fedora-df0cc57e057f.fc25 | 37 +++++++++---------------- redhat/self-test/data/fedora-fce15c45d3fb.el7 | 35 ++++++++---------------- redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 35 ++++++++---------------- redhat/self-test/data/rhel-2585cf9dfaad.el7 | 37 +++++++++---------------- redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 37 +++++++++---------------- redhat/self-test/data/rhel-78e36f3b0dae.el7 | 35 ++++++++---------------- redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 35 ++++++++---------------- redhat/self-test/data/rhel-df0cc57e057f.el7 | 37 +++++++++---------------- redhat/self-test/data/rhel-df0cc57e057f.fc25 | 37 +++++++++---------------- redhat/self-test/data/rhel-fce15c45d3fb.el7 | 35 ++++++++---------------- redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 35 ++++++++---------------- redhat/self-test/2001-dist-release.bats | 2 +- redhat/self-test/3001-Makefile-contents.bats | 2 +- redhat/Makefile | 3 +- 28 files changed, 312 insertions(+), 586 deletions(-) _______________________________________________ kernel mailing list -- [email protected] To unsubscribe send an email to [email protected] Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/[email protected] Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
