wip

.github/workflows/vmtests.yml

@@ -24,11 +24,5 @@ jobs:
         export DEBIAN_FRONTEND=noninteractive
         sudo apt-get -y install --no-install-recommends qemu-system-x86 qemu-guest-agent
 
-    - name: Set up nix dev env
-      run: nix develop --command echo 0
-
-    - name: Build `lightswitch`
-      run: nix develop --ignore-environment --command bash -c 'cargo build'
-
     - name: Run kernel tests
-      run: nix develop --command 'vmtest'
+      run: nix run .#vmtest

flake.nix

@@ -40,7 +40,7 @@
           nativeBuildInputs = with pkgs; [
             pkg-config
           ];
-          craneLib = crane.lib.${system};
+          craneLib = (crane.mkLib nixpkgs.legacyPackages.${system});
           lightswitch = craneLib.buildPackage {
             src = ./.;
             doCheck = false;
@@ -65,6 +65,7 @@
                 ];
               };
             };
+            vmtest = (import ./vm.nix { inherit pkgs; }).run-vmtest lightswitch;
           };
           devShells.default = mkShell {
             nativeBuildInputs = nativeBuildInputs;
@@ -79,13 +80,6 @@
               # snapshot testing plugin binary
               cargo-insta
               # ocamlPackages.magic-trace
-              (import ./vm.nix { inherit pkgs; }).vmtest
-              (import ./vm.nix { inherit pkgs; }).kernel_5_15
-              (import ./vm.nix { inherit pkgs; }).kernel_6_0
-              (import ./vm.nix { inherit pkgs; }).kernel_6_2
-              (import ./vm.nix { inherit pkgs; }).kernel_6_6
-              (import ./vm.nix { inherit pkgs; }).kernel_6_8_7
-              (import ./vm.nix { inherit pkgs; }).kernel_6_9_rc5
             ];
 
             LIBCLANG_PATH = lib.makeLibraryPath [ llvmPackages_16.libclang ];

src/main.rs

@@ -233,15 +233,15 @@ fn main() -> Result<(), Box<dyn Error>> {
     let mut options: flamegraph::Options<'_> = flamegraph::Options::default();
     let data = folded.as_bytes();
     let flame_path = args.flamegraph_file;
-    let f = File::create(flame_path).unwrap();
+    /*     let f = File::create(flame_path).unwrap();
     match flamegraph::from_reader(&mut options, data, f) {
         Ok(_) => {
             eprintln!("Profile successfully written to disk");
         }
         Err(e) => {
             error!("Failed generate profile: {:?}", e);
         }
-    }
+    } */
 
     Ok(())
 }

vm.nix

@@ -1,5 +1,6 @@
 { pkgs }:
-{
+let
+
   kernel_5_15 = pkgs.stdenv.mkDerivation {
     name = "download-kernel-5.15";
     src = pkgs.fetchurl {
@@ -78,6 +79,48 @@
     '';
   };
 
+  vmtest-create-config = lightswitch: pkgs.stdenv.mkDerivation {
+    name = "vmtest-dump-config";
+    dontUnpack = true;
+
+    src = pkgs.writeText "vmtest.toml" ''
+      [[target]]
+      name = "Fedora 5.15"
+      kernel = "${kernel_5_15}/bzImage"
+      command = "${lightswitch}/bin/lightswitch --duration 0"
+
+      [[target]]
+      name = "Fedora 6.0"
+      kernel = "${kernel_6_0}/bzImage"
+      command = "${lightswitch}/bin/lightswitch --duration 0"
+
+      [[target]]
+      name = "Fedora 6.2"
+      kernel = "${kernel_6_2}/bzImage"
+      command = "${lightswitch}/bin/lightswitch --duration 0"
+
+      [[target]]
+      name = "Fedora 6.6"
+      kernel = "${kernel_6_6}/bzImage"
+      command = "${lightswitch}/bin/lightswitch --duration 0"
+
+      [[target]]
+      name = "Upstream 6.8.7"
+      kernel = "${kernel_6_8_7}/bzImage"
+      command = "${lightswitch}/bin/lightswitch --duration 0"
+
+      [[target]]
+      name = "Upstream v6.9-rc5"
+      kernel = "${kernel_6_9_rc5}/bzImage"
+      command = "${lightswitch}/bin/lightswitch --duration 0"
+    '';
+    nativeBuildInputs = [ ];
+    installPhase = ''
+      mkdir -p $out
+      cp -r $src $out/vmtest.toml
+    '';
+  };
+
   vmtest = pkgs.rustPlatform.buildRustPackage {
     name = "vmtest";
     src = pkgs.fetchFromGitHub {
@@ -101,4 +144,24 @@
       platforms = platforms.linux;
     };
   };
+in
+{
+
+
+  run-vmtest = lightswitch:
+    pkgs.stdenv.mkDerivation {
+      name = "run-vmtests";
+      dontUnpack = true;
+
+      src = pkgs.writeText "run-vmtests" ''
+        ${vmtest}/bin/vmtest --config ${vmtest-create-config lightswitch}/vmtest.toml
+      '';
+      nativeBuildInputs = [ ];
+      installPhase = ''
+        mkdir -p $out/bin
+        cp -r $src $out/bin/run-vmtests
+        chmod +x $out/bin/run-vmtests
+      '';
+    };
+
 }