Skip to content

Commit 552636c

Browse files
authored
Fix aarch64 CI (#221)
1 parent 48ee3ff commit 552636c

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

.github/workflows/aarch64.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
install: |
2626
export CARGO_TERM_COLOR=always
2727
export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
28-
apt-get update && apt-get install -y gdb pip curl python3.10-dev clang llvm build-essential
28+
apt-get update && apt-get install -y gdb pip curl python3.12-dev clang llvm build-essential
2929
curl https://sh.rustup.rs -o rustup.sh && chmod +x rustup.sh && \
3030
./rustup.sh -y && rm rustup.sh
3131
run: |

casr/src/bin/casr-afl.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,9 @@ fn main() -> Result<()> {
165165
match util::symbols_list(Path::new(target)) {
166166
Ok(list) => {
167167
if list.contains("__asan") {
168-
crash_info.casr_tool = util::get_path("casr-san")?.clone()
168+
crash_info
169+
.casr_tool
170+
.clone_from(&(util::get_path("casr-san")?))
169171
}
170172
}
171173
Err(e) => {

casr/src/bin/casr-core.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ fn analyze_coredump(
431431
};
432432

433433
if report.proc_cmdline.is_empty() {
434-
report.proc_cmdline = run_line.clone();
434+
report.proc_cmdline.clone_from(&run_line);
435435
}
436436
}
437437
}

casr/tests/tests.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4748,7 +4748,7 @@ fn test_casr_js() {
47484748
};
47494749

47504750
let output = Command::new(*EXE_CASR_JS.read().unwrap())
4751-
.args(["--stdout", "--", &node_path.to_str().unwrap(), &test_path])
4751+
.args(["--stdout", "--", (node_path.to_str().unwrap()), &test_path])
47524752
.output()
47534753
.expect("failed to start casr-js");
47544754

@@ -4813,7 +4813,7 @@ fn test_casr_js_jsfuzz() {
48134813
.args([
48144814
"--stdout",
48154815
"--",
4816-
&jsfuzz_path.to_str().unwrap(),
4816+
(jsfuzz_path.to_str().unwrap()),
48174817
&paths[0],
48184818
&paths[1],
48194819
])
@@ -4881,7 +4881,7 @@ fn test_casr_js_jazzer() {
48814881
.args([
48824882
"--stdout",
48834883
"--",
4884-
&npx_path.to_str().unwrap(),
4884+
(npx_path.to_str().unwrap()),
48854885
"jazzer",
48864886
&paths[0],
48874887
&paths[1],
@@ -5689,7 +5689,7 @@ fn test_casr_csharp() {
56895689
.args([
56905690
"--stdout",
56915691
"--",
5692-
&dotnet_path.to_str().unwrap(),
5692+
(dotnet_path.to_str().unwrap()),
56935693
"run",
56945694
"--project",
56955695
&paths[4],
@@ -5864,7 +5864,7 @@ fn test_casr_afl_csharp_ignore_cmd() {
58645864
"-o",
58655865
&paths[1],
58665866
"--",
5867-
&dotnet_path.to_str().unwrap(),
5867+
(dotnet_path.to_str().unwrap()),
58685868
"run",
58695869
"--no-build",
58705870
"--project",

0 commit comments

Comments
 (0)