search for: vg_count

...turn 0; } " + +and generate_fish_test_prep_sh () = + pr "#!/bin/bash -\n"; + generate_header HashStyle GPLv2plus; + + let all_disks = sprintf "prep{1..%d}.img" (List.length prepopts) in + + pr "\ +set -e + +rm -f %s + +$VG guestfish \\ +" all_disks; + + let vg_count = ref 0 in + + iteri ( + fun i (name, _, _, _) -> + let params = [name] in + let params = + if find name "lv" <> -1 then ( + incr vg_count; + sprintf "/dev/VG%d/LV" !vg_count :: params + ) else params in + let params =...

Hi, small series with small improvements to the tests. Pino Toscano (3): tests: specify the image format when possible tests: remove remaining relative paths to binaries fish: generate test-prep.sh with generator .gitignore | 1 + align/test-virt-alignment-scan.sh | 2 +- cat/Makefile.am | 2 +- cat/test-virt-cat.sh

...pr " else "; ) events; @@ -1166,7 +1168,7 @@ $VG guestfish \\ fun i (name, _, _, _) -> let params = [name] in let params = - if find name "lv" <> -1 then ( + if String.find name "lv" <> -1 then ( incr vg_count; sprintf "/dev/VG%d/LV" !vg_count :: params ) else params in diff --git a/generator/gobject.ml b/generator/gobject.ml index 7ee73a6..e14ea20 100644 --- a/generator/gobject.ml +++ b/generator/gobject.ml @@ -22,6 +22,7 @@ open Printf +open Common_utils open Actions...