From: Prarit Bhargava on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1706 Making changes to the Makefiles has been difficult and revealed minor issues with even the simplest of changes. Having a test that compares the Makefile variables to a "known good" set, and being able to compare the kernel spec file to a "known good" spec file will help with testing future changes. I have chosen these 4 ARK commits to test with because they result in different versioning in the variables and the kernel specfile: 78e36f3b0dae := 5.17.0 merge window (5.16 + additional changes before -rc1) result: 5.17.0-0.rc0.78e36f3b0dae.6.test 2585cf9dfaad := 5.16-rc5 result: 5.16.0-0.rc5.6.test df0cc57e057f := 5.16 result: 5.16.0-6.test fce15c45d3fb := 5.16-rc5 + 2 additional commits result: 5.16.0-0.rc5.fce15c45d3fb.6.test This changeset provides a better "dist-dump-variables" test that also compares the resulting spec files. The test code does introduce two new Makefile.variables entries both of which are clearly marked as unstable. The genspec.sh change is minor, and is just a reorganization of the code to speed up the creation of test files. As indicated in the last commit, changelog generation is not yet tested. That will come at a later date. Additional tests beyond these tests will also be added at a later date. Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx> --- redhat/configs/build_configs.sh | 18 +- redhat/configs/generate_all_configs.sh | 20 +- redhat/configs/process_configs.sh | 11 +- redhat/scripts/create-tarball.sh | 6 +- redhat/scripts/rh-dist-git.sh | 62 +- redhat/self-test/data/centos-2585cf9dfaad.el7 | 99 + redhat/self-test/data/centos-2585cf9dfaad.el7.spec | 3031 +++++++++++++++++++ redhat/self-test/data/centos-2585cf9dfaad.fc25 | 99 + redhat/self-test/data/centos-2585cf9dfaad.fc25.spec | 3031 +++++++++++++++++++ redhat/self-test/data/centos-78e36f3b0dae.el7 | 99 + redhat/self-test/data/centos-78e36f3b0dae.el7.spec | 3031 +++++++++++++++++++ redhat/self-test/data/centos-78e36f3b0dae.fc25 | 99 + redhat/self-test/data/centos-78e36f3b0dae.fc25.spec | 3031 +++++++++++++++++++ redhat/self-test/data/centos-df0cc57e057f.el7 | 99 + redhat/self-test/data/centos-df0cc57e057f.el7.spec | 3031 +++++++++++++++++++ redhat/self-test/data/centos-df0cc57e057f.fc25 | 99 + redhat/self-test/data/centos-df0cc57e057f.fc25.spec | 3031 +++++++++++++++++++ redhat/self-test/data/centos-fce15c45d3fb.el7 | 99 + redhat/self-test/data/centos-fce15c45d3fb.el7.spec | 3031 +++++++++++++++++++ redhat/self-test/data/centos-fce15c45d3fb.fc25 | 99 + redhat/self-test/data/centos-fce15c45d3fb.fc25.spec | 3031 +++++++++++++++++++ redhat/self-test/data/create-data.sh | 54 + redhat/self-test/data/fedora-2585cf9dfaad.el7 | 97 + redhat/self-test/data/fedora-2585cf9dfaad.el7.spec | 3031 +++++++++++++++++++ redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 97 + redhat/self-test/data/fedora-2585cf9dfaad.fc25.spec | 3031 +++++++++++++++++++ redhat/self-test/data/fedora-78e36f3b0dae.el7 | 97 + redhat/self-test/data/fedora-78e36f3b0dae.el7.spec | 3031 +++++++++++++++++++ redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 97 + redhat/self-test/data/fedora-78e36f3b0dae.fc25.spec | 3031 +++++++++++++++++++ redhat/self-test/data/fedora-df0cc57e057f.el7 | 97 + redhat/self-test/data/fedora-df0cc57e057f.el7.spec | 3031 +++++++++++++++++++ redhat/self-test/data/fedora-df0cc57e057f.fc25 | 97 + redhat/self-test/data/fedora-df0cc57e057f.fc25.spec | 3031 +++++++++++++++++++ redhat/self-test/data/fedora-fce15c45d3fb.el7 | 97 + redhat/self-test/data/fedora-fce15c45d3fb.el7.spec | 3031 +++++++++++++++++++ redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 97 + redhat/self-test/data/fedora-fce15c45d3fb.fc25.spec | 3031 +++++++++++++++++++ redhat/self-test/data/rhel-2585cf9dfaad.el7 | 97 + redhat/self-test/data/rhel-2585cf9dfaad.el7.spec | 3031 +++++++++++++++++++ redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 97 + redhat/self-test/data/rhel-2585cf9dfaad.fc25.spec | 3031 +++++++++++++++++++ redhat/self-test/data/rhel-78e36f3b0dae.el7 | 97 + redhat/self-test/data/rhel-78e36f3b0dae.el7.spec | 3031 +++++++++++++++++++ redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 97 + redhat/self-test/data/rhel-78e36f3b0dae.fc25.spec | 3031 +++++++++++++++++++ redhat/self-test/data/rhel-df0cc57e057f.el7 | 97 + redhat/self-test/data/rhel-df0cc57e057f.el7.spec | 3031 +++++++++++++++++++ redhat/self-test/data/rhel-df0cc57e057f.fc25 | 97 + redhat/self-test/data/rhel-df0cc57e057f.fc25.spec | 3031 +++++++++++++++++++ redhat/self-test/data/rhel-fce15c45d3fb.el7 | 97 + redhat/self-test/data/rhel-fce15c45d3fb.el7.spec | 3031 +++++++++++++++++++ redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 97 + redhat/self-test/data/rhel-fce15c45d3fb.fc25.spec | 3031 +++++++++++++++++++ redhat/self-test/1005-dist-dump-variables.bats | 59 +- redhat/Makefile | 62 +- redhat/Makefile.rhpkg | 6 +- redhat/Makefile.variables | 10 +- redhat/genspec.sh | 158 +- redhat/kernel.spec.template | 7 +- 60 files changed, 75321 insertions(+), 240 deletions(-) _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx 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/kernel@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure
