-
Notifications
You must be signed in to change notification settings - Fork 400
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
test: make dracut directory and package libdir configurable #2484
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I support the spirit of this change, but test/test-functions needs to be fixed before this can land.
28a6876
to
ff633b5
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm, thanks
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing:
pr-2484> grep -r -n --color modules.d test
test/TEST-50-MULTINIC/test.sh:337: inst_hook pre-pivot 85 "$basedir/modules.d/45ifcfg/write-ifcfg.sh"
test/TEST-98-GETARG/test.sh:17: ln -sfnr "$basedir"/modules.d/99base/dracut-lib.sh "$TESTDIR"/dracut-lib.sh
test/TEST-98-GETARG/test.sh:18: ln -sfnr "$basedir"/modules.d/99base/dracut-dev-lib.sh "$TESTDIR"/dracut-dev-lib.sh
I see that this PR is only about configuring dracut.sh
and modules.d
. Isn't it worth adding the other files that use basedir
as well, i.e.: dracut-init.sh
, dracut-install
, dracut-util
and dracut-cpio
for completeness?
Make the directory of the `dracut.sh` script configurable to allow running the test suite out-of-tree. This change is used to run the test suite against the installed dracut in an autopkgtest for the Debian/Ubuntu package. Signed-off-by: Benjamin Drung <[email protected]>
ff633b5
to
db0b019
Compare
Thanks @aafeijoo-suse for pointing it out. I reworked the patches. Now you can set Side note: Good news for running the first four tests on Ubuntu against the installed package: https://autopkgtest.ubuntu.com/packages/dracut. amd64 is working, but the other architectures are failing. Patches will be coming. Brace yourself. ;) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @aafeijoo-suse for pointing it out. I reworked the patches. Now you can set DRACUT and PKGLIBDIR.
No, thanks to you for working on this. It's good to see some interest from Debian :)
You need to fix this shell issue: https://github.com/dracutdevs/dracut/actions/runs/5877491623/job/15938056367?pr=2484#step:4:18
Make the package libdir configurable to allow running the test suite out-of-tree. `PKGLIBDIR` can be pointed to the installed dracut libdir. Use `PKGLIBDIR` for the location of `dracut-init.sh`, `dracut-install`, `dracut-util`, `dracut-cpio`, and `modules.d`. This change is used to run the test suite against the installed dracut in an autopkgtest for the Debian/Ubuntu package. Signed-off-by: Benjamin Drung <[email protected]>
Building `dracut-util` requires the source code to be present and prevents running the test against the installed system. Check that `dracut-util` and rely on the test environment to build `dracut-util` beforehand.
The `skipcpio` binary is installed in `${PKGLIBDIR}/skipcpio`. Signed-off-by: Benjamin Drung <[email protected]>
db0b019
to
53a778b
Compare
The interest is coming from Ubuntu and was caused by using dracut-install in initramfs-tools: https://bugs.launchpad.net/ubuntu/+source/initramfs-tools/+bug/2031185
Done. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need to fix the latest 2 commit messages: https://github.com/dracutdevs/dracut/actions/runs/5878497656/job/15940877816?pr=2484
53a778b
to
35945d1
Compare
Fixed commit message title. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
Changes
Make the directory of the
dracut.sh
script and the package libdir configurable to allow running the test suite out-of-tree.PKGLIBDIR
can be pointed to the installed dracut libdir. UsePKGLIBDIR
for the location ofdracut-init.sh
,dracut-install
,dracut-util
,dracut-cpio
, andmodules.d
.This change is used to run the test suite against the installed dracut in an autopkgtest for the Debian/Ubuntu package.
Checklist