Compare commits
2 Commits
jane400/ve
...
1.1.1
Author | SHA1 | Date | |
---|---|---|---|
|
d62180f9d6 | ||
|
b7f02ff970 |
11
main.go
11
main.go
@@ -657,15 +657,8 @@ func getModuleDeps(modName string, modulesDep io.Reader) ([]string, error) {
|
||||
|
||||
// split the module name on - and/or _, build a regex for matching
|
||||
splitRe := regexp.MustCompile("[-_]+")
|
||||
var modNameReStr string
|
||||
for _, s := range splitRe.Split(modName, -1) {
|
||||
if modNameReStr != "" {
|
||||
modNameReStr += "[-_]+" + s
|
||||
} else {
|
||||
modNameReStr = s
|
||||
}
|
||||
}
|
||||
re := regexp.MustCompile(modNameReStr)
|
||||
modNameReStr := splitRe.ReplaceAllString(modName, "[-_]+")
|
||||
re := regexp.MustCompile("^" + modNameReStr + "$")
|
||||
|
||||
s := bufio.NewScanner(modulesDep)
|
||||
for s.Scan() {
|
||||
|
@@ -40,6 +40,7 @@ func stringSlicesEqual(a []string, b []string) bool {
|
||||
}
|
||||
|
||||
var testModuleDep string = `
|
||||
kernel/sound/soc/codecs/snd-soc-msm8916-digital.ko:
|
||||
kernel/net/sched/act_ipt.ko.xz: kernel/net/netfilter/x_tables.ko.xz
|
||||
kernel/drivers/watchdog/watchdog.ko.xz:
|
||||
kernel/drivers/usb/serial/ir-usb.ko.xz: kernel/drivers/usb/serial/usbserial.ko.xz
|
||||
@@ -53,6 +54,7 @@ kernel/net/bluetooth/hidp/hidp.ko.xz: kernel/net/bluetooth/bluetooth.ko.xz kerne
|
||||
kernel/fs/nls/nls_iso8859-1.ko.xz:
|
||||
kernel/net/vmw_vsock/vmw_vsock_virtio_transport.ko.xz: kernel/net/vmw_vsock/vmw_vsock_virtio_transport_common.ko.xz kernel/drivers/virtio/virtio.ko.xz kernel/drivers/virtio/virtio_ring.ko.xz kernel/net/vmw_vsock/vsock.ko.xz
|
||||
kernel/drivers/gpu/drm/panfrost/panfrost.ko.xz: kernel/drivers/gpu/drm/scheduler/gpu-sched.ko.xz
|
||||
kernel/drivers/gpu/drm/msm/msm.ko: kernel/drivers/gpu/drm/drm_kms_helper.ko
|
||||
`
|
||||
|
||||
func TestGetModuleDeps(t *testing.T) {
|
||||
@@ -65,6 +67,8 @@ func TestGetModuleDeps(t *testing.T) {
|
||||
{"dw-wdt", []string{"kernel/drivers/watchdog/dw_wdt.ko.xz",
|
||||
"kernel/drivers/watchdog/watchdog.ko.xz"}},
|
||||
{"gl518sm", []string{"kernel/drivers/hwmon/gl518sm.ko.xz"}},
|
||||
{"msm", []string{"kernel/drivers/gpu/drm/msm/msm.ko",
|
||||
"kernel/drivers/gpu/drm/drm_kms_helper.ko"}},
|
||||
}
|
||||
for _, table := range tables {
|
||||
out, err := getModuleDeps(table.in, strings.NewReader(testModuleDep))
|
||||
|
Reference in New Issue
Block a user