Merge pull request #33 from jmquigs/ci-update

Ci update
jmquigs · Mar 21, 2023 · bbcdc2d · bbcdc2d
2 parents 396976d + 8333910
commit bbcdc2d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/Native/hook_core/src/hook_device_d3d11.rs b/Native/hook_core/src/hook_device_d3d11.rs
@@ -1085,9 +1085,17 @@ mod tests {
             assert_eq!(res, 0);
         }
 
+        let assert_log = |expected_count:usize,msg:&str| {
+            let logtext = std::fs::read_to_string(testlog).unwrap();
+            let count = logtext.matches(msg).count();
+            if count != expected_count {
+                eprintln!("logtext: {}", logtext);
+            }
+            assert_eq!(count, expected_count);
+        };
+
         // log file should contain stuff
-        let logtext = std::fs::read_to_string(testlog).unwrap();
-        assert_eq!(1, logtext.matches("hook_device_QueryInterface: hr 0").count());
+        assert_log(1, "hook_device_QueryInterface: hr 0");
 
         unsafe {
             (*device).Release();
@@ -1097,8 +1105,7 @@ mod tests {
         }
 
         // context should release
-        let logtext = std::fs::read_to_string(testlog).unwrap();
-        assert_eq!(1, logtext.matches("context hook release: rc now 0").count());
+        assert_log(1, "context hook release: rc now 0");
 
         // if a new device is created things should not explode or go into
         // weird infinite loops or otherwise be bad.
@@ -1115,8 +1122,7 @@ mod tests {
             &mut context);
 
         // log should note that we already did this
-        let logtext = std::fs::read_to_string(testlog).unwrap();
-        assert_eq!(1, logtext.matches("WARNING: device state was already initialized").count());
+        assert_log(1, "WARNING: device state was already initialized");
 
         // query interface on device should succeed
         let mut pdev:*mut ID3D11Device = null_mut();
@@ -1132,8 +1138,7 @@ mod tests {
         }
 
         // context should release. 2 because we did it twice
-        let logtext = std::fs::read_to_string(testlog).unwrap();
-        assert_eq!(2, logtext.matches("context hook release: rc now 0").count());
+        assert_log(2, "context hook release: rc now 0");
 
         unsafe {
             let _unbox = Box::from_raw(DEVICE_STATE);

diff --git a/build.fsx b/build.fsx
@@ -475,6 +475,14 @@ let doCISetup() =
                 printfn "fsharp targets: %A" fsharpFiles
             | None -> failwithf "no vs path found, searched %A" VSSearchPaths
 
+    // put the current directory into the registry as the MMRoot
+    // let cu = Microsoft.Win32.RegistryHive.CurrentUser
+    // let mmRoot = "SOFTWARE\\ModelMod"
+    printfn "set registry key HKEY_CURRENT_USER\\SOFTWARE\\ModelMod\\MMRoot to %s" (System.IO.Directory.GetCurrentDirectory())
+    Microsoft.Win32.Registry.SetValue("HKEY_CURRENT_USER\\SOFTWARE\\ModelMod", "MMRoot", System.IO.Directory.GetCurrentDirectory())
+    // if not (Directory.Exists("Logs")) then
+    //     Directory.CreateDirectory("Logs") |> ignore
+
     printfn "action setup complete"
 
 let getVSPath() =