Allow execute_on_heap to execute concurrently

Signed-off-by: Ludvig Liljenberg <4257730+ludfjig@users.noreply.github.com>

Author: ludfjig

Justfile

@@ -171,9 +171,8 @@ test-isolated target=default-target features="" :
     {{ cargo-cmd }} test {{ if features =="" {''} else if features=="no-default-features" {"--no-default-features" } else {"--no-default-features -F function_call_metrics,init-paging," + features } }} --profile={{ if target == "debug" { "dev" } else { target } }} {{ target-triple-flag }} -p hyperlight-host --lib -- metrics::tests::test_metrics_are_emitted --exact 
 # runs integration tests. Guest can either be "rust" or "c"
 test-integration guest target=default-target features="":
-    @# run execute_on_heap test with feature "executable_heap" on and off
+    @# run execute_on_heap test with feature "executable_heap" on (runs with off during normal tests)
     {{if os() == "windows" { "$env:" } else { "" } }}GUEST="{{guest}}"{{if os() == "windows" { ";" } else { "" } }} {{ cargo-cmd }} test --profile={{ if target == "debug" { "dev" } else { target } }} {{ target-triple-flag }} --test integration_test execute_on_heap {{ if features =="" {" --features executable_heap"} else {"--features executable_heap," + features} }} -- --ignored
-    {{if os() == "windows" { "$env:" } else { "" } }}GUEST="{{guest}}"{{if os() == "windows" { ";" } else { "" } }} {{ cargo-cmd }} test --profile={{ if target == "debug" { "dev" } else { target } }} {{ target-triple-flag }} --test integration_test execute_on_heap {{ if features =="" {""} else {"--features " + features} }} -- --ignored
 
     @# run the rest of the integration tests
     @# skip interrupt_random_kill_stress_test and then run it explicitly so we can see the output more 

src/hyperlight_host/tests/integration_test.rs

@@ -705,22 +705,22 @@ fn execute_on_stack() {
 }
 
 #[test]
-#[ignore] // ran from Justfile because requires feature "executable_heap"
 fn execute_on_heap() {
     let mut sbox1 = new_uninit_rust().unwrap().evolve().unwrap();
     let result = sbox1.call::<String>("ExecuteOnHeap", ());
 
-    println!("{:#?}", result);
     #[cfg(feature = "executable_heap")]
-    assert!(result.is_ok());
+    assert_eq!(
+        result.unwrap(),
+        "Executed on heap successfully",
+        "should execute successfully"
+    );
 
     #[cfg(not(feature = "executable_heap"))]
-    {
-        assert!(result.is_err());
-        let err = result.unwrap_err();
-
-        assert!(err.to_string().contains("PageFault"));
-    }
+    assert!(
+        result.unwrap_err().to_string().contains("PageFault"),
+        "should get page fault"
+    );
 }
 
 // checks that a recursive function with stack allocation eventually fails with stackoverflow

src/tests/rust_guests/simpleguest/src/main.rs

@@ -489,7 +489,7 @@ fn execute_on_heap() -> String {
         black_box(heap_fn); // avoid optimization when running in release mode
     }
     // will only reach this point if heap is executable
-    String::from("fail")
+    String::from("Executed on heap successfully")
 }
 
 #[guest_function("TestMalloc")]