diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 24a37b7..3a71299 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,8 @@ jobs: strategy: matrix: include: - - os: ubuntu-22.04 + # // TEST + # - os: ubuntu-22.04 - os: windows-2022 steps: - name: checkout diff --git a/host/src/unloading/module.rs b/host/src/unloading/module.rs index 46f69f1..5ce54f3 100644 --- a/host/src/unloading/module.rs +++ b/host/src/unloading/module.rs @@ -61,8 +61,7 @@ impl Module { let library = self.library.take(); let handle = WindowsLibrary::from(library).into_raw(); - dbghelp::remove_module(handle, &library_path); - + // TODO: is it needed if dbg help remove module will be moved? // re-initializing self.library because windows_dealloc::set // takes module instance by value // (shouldn't be expensive, just looks weird) @@ -79,6 +78,8 @@ impl Module { windows_dealloc::successfully_called(), "windows dealloc callback must be called in library.close()" ); + + dbghelp::remove_module(handle, &library_path); } // final unload check diff --git a/host/src/windows/dbghelp.rs b/host/src/windows/dbghelp.rs index 9c33fff..d487f1e 100644 --- a/host/src/windows/dbghelp.rs +++ b/host/src/windows/dbghelp.rs @@ -284,6 +284,10 @@ fn refresh_modules_and_search_path(instance: &mut Dbghelp) { let mut search_path = instance.search_path_entries.join(";"); search_path += ";"; + + // TEST + println!("[host] search_path: {search_path}"); + let search_path = str_to_wide_cstring(&search_path); let result = unsafe { (instance.set_search_path)(process, search_path.as_ptr()) }; diff --git a/testing/runner/src/code_change.rs b/testing/runner/src/code_change.rs index 44f4a19..2f59b92 100644 --- a/testing/runner/src/code_change.rs +++ b/testing/runner/src/code_change.rs @@ -14,10 +14,10 @@ pub fn main() { build_debug(); run_host("debug"); - reset_iteration(); + // reset_iteration(); - build_release(); - run_host("release"); + // build_release(); + // run_host("release"); } fn run_host(directory: &str) { diff --git a/testing/runner/src/main.rs b/testing/runner/src/main.rs index 17a7a1c..300f34f 100644 --- a/testing/runner/src/main.rs +++ b/testing/runner/src/main.rs @@ -26,14 +26,14 @@ const TEST_FEATURES: &[&str] = &[ ]; fn main() { - test_features("debug"); - test_features("release"); + // test_features("debug"); + // test_features("release"); - multiple_modules::main(); + // multiple_modules::main(); code_change::main(); - panic_in_interface_host::main(); + // panic_in_interface_host::main(); - backtrace_unloading_host_as_dylib::main(); + // backtrace_unloading_host_as_dylib::main(); println!(); println!();