Fix aarch64 CI (#221)

ispras · May 23, 2024 · 552636c · 552636c
1 parent 48ee3ff
commit 552636c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/aarch64.yml b/.github/workflows/aarch64.yml
@@ -25,7 +25,7 @@ jobs:
         install: |
           export CARGO_TERM_COLOR=always
           export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
-          apt-get update && apt-get install -y gdb pip curl python3.10-dev clang llvm build-essential
+          apt-get update && apt-get install -y gdb pip curl python3.12-dev clang llvm build-essential
           curl https://sh.rustup.rs -o rustup.sh && chmod +x rustup.sh && \
           ./rustup.sh -y && rm rustup.sh
         run: |

diff --git a/casr/src/bin/casr-afl.rs b/casr/src/bin/casr-afl.rs
@@ -165,7 +165,9 @@ fn main() -> Result<()> {
                 match util::symbols_list(Path::new(target)) {
                     Ok(list) => {
                         if list.contains("__asan") {
-                            crash_info.casr_tool = util::get_path("casr-san")?.clone()
+                            crash_info
+                                .casr_tool
+                                .clone_from(&(util::get_path("casr-san")?))
                         }
                     }
                     Err(e) => {

diff --git a/casr/src/bin/casr-core.rs b/casr/src/bin/casr-core.rs
@@ -431,7 +431,7 @@ fn analyze_coredump(
             };
 
             if report.proc_cmdline.is_empty() {
-                report.proc_cmdline = run_line.clone();
+                report.proc_cmdline.clone_from(&run_line);
             }
         }
     }

diff --git a/casr/tests/tests.rs b/casr/tests/tests.rs
@@ -4748,7 +4748,7 @@ fn test_casr_js() {
     };
 
     let output = Command::new(*EXE_CASR_JS.read().unwrap())
-        .args(["--stdout", "--", &node_path.to_str().unwrap(), &test_path])
+        .args(["--stdout", "--", (node_path.to_str().unwrap()), &test_path])
         .output()
         .expect("failed to start casr-js");
 
@@ -4813,7 +4813,7 @@ fn test_casr_js_jsfuzz() {
         .args([
             "--stdout",
             "--",
-            &jsfuzz_path.to_str().unwrap(),
+            (jsfuzz_path.to_str().unwrap()),
             &paths[0],
             &paths[1],
         ])
@@ -4881,7 +4881,7 @@ fn test_casr_js_jazzer() {
         .args([
             "--stdout",
             "--",
-            &npx_path.to_str().unwrap(),
+            (npx_path.to_str().unwrap()),
             "jazzer",
             &paths[0],
             &paths[1],
@@ -5689,7 +5689,7 @@ fn test_casr_csharp() {
         .args([
             "--stdout",
             "--",
-            &dotnet_path.to_str().unwrap(),
+            (dotnet_path.to_str().unwrap()),
             "run",
             "--project",
             &paths[4],
@@ -5864,7 +5864,7 @@ fn test_casr_afl_csharp_ignore_cmd() {
             "-o",
             &paths[1],
             "--",
-            &dotnet_path.to_str().unwrap(),
+            (dotnet_path.to_str().unwrap()),
             "run",
             "--no-build",
             "--project",