Skip to content

Commit 55fe2dc

Browse files
authored
Run atheris tests on ubuntu-latest (#269)
1 parent 011913c commit 55fe2dc

File tree

3 files changed

+4
-26
lines changed

3 files changed

+4
-26
lines changed

.github/workflows/amd64.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ jobs:
2323
run: |
2424
sudo apt update && sudo apt install -y gdb pip curl python3-dev llvm \
2525
openjdk-17-jdk ca-certificates gnupg lua5.4
26-
# Atheris fails to install on Ubuntu 24.04, see https://github.com/google/atheris/issues/82
27-
# pip3 install atheris
26+
pip3 install atheris
2827
pip3 install python-afl
2928
sudo mkdir -p /etc/apt/keyrings
3029
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg

.github/workflows/coverage.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ env:
1111
jobs:
1212
ubuntu-latest:
1313

14-
# Atheris fails to install on Ubuntu 24.04, thus, this pipeline can test Atheris on 22.04
15-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-latest
1615

1716
steps:
1817
- uses: actions/checkout@v4

casr/tests/tests.rs

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4248,10 +4248,6 @@ fn test_casr_libfuzzer() {
42484248
#[test]
42494249
#[cfg(target_arch = "x86_64")]
42504250
fn test_casr_libfuzzer_atheris() {
4251-
if lsb_release::info().unwrap().version == "24.04" {
4252-
// Atheris fails to install, see https://github.com/google/atheris/issues/82
4253-
return;
4254-
}
42554251
use std::collections::HashMap;
42564252

42574253
let paths = [
@@ -4641,10 +4637,6 @@ fn test_casr_java_native_lib() {
46414637
#[test]
46424638
#[cfg(target_arch = "x86_64")]
46434639
fn test_casr_python_atheris() {
4644-
if lsb_release::info().unwrap().version == "24.04" {
4645-
// Atheris fails to install, see https://github.com/google/atheris/issues/82
4646-
return;
4647-
}
46484640
// Division by zero atheris test
46494641
let paths = [
46504642
abs_path("tests/casr_tests/python/test_casr_python_atheris.py"),
@@ -4688,10 +4680,6 @@ fn test_casr_python_atheris() {
46884680
#[test]
46894681
#[cfg(target_arch = "x86_64")]
46904682
fn test_casr_san_python_df() {
4691-
if lsb_release::info().unwrap().version == "24.04" {
4692-
// Atheris fails to install, see https://github.com/google/atheris/issues/82
4693-
return;
4694-
}
46954683
// Double free python C extension test
46964684
// Copy files to tmp dir
46974685
let work_dir = abs_path("tests/casr_tests/python");
@@ -4774,7 +4762,7 @@ fn test_casr_san_python_df() {
47744762
.unwrap()
47754763
.to_string();
47764764

4777-
assert!(report["Stacktrace"].as_array().unwrap().iter().count() >= 19);
4765+
assert!(report["Stacktrace"].as_array().unwrap().iter().count() >= 15);
47784766
assert_eq!(severity_type, "NOT_EXPLOITABLE");
47794767
assert_eq!(severity_desc, "double-free");
47804768
assert!(
@@ -4792,10 +4780,6 @@ fn test_casr_san_python_df() {
47924780
#[test]
47934781
#[cfg(target_arch = "x86_64")]
47944782
fn test_casr_san_atheris_df() {
4795-
if lsb_release::info().unwrap().version == "24.04" {
4796-
// Atheris fails to install, see https://github.com/google/atheris/issues/82
4797-
return;
4798-
}
47994783
// Double free python C extension test
48004784
// Copy files to tmp dir
48014785
let work_dir = abs_path("tests/casr_tests/python");
@@ -4900,10 +4884,6 @@ fn test_casr_san_atheris_df() {
49004884
#[test]
49014885
#[cfg(target_arch = "x86_64")]
49024886
fn test_casr_python_call_san_df() {
4903-
if lsb_release::info().unwrap().version == "24.04" {
4904-
// Atheris fails to install, see https://github.com/google/atheris/issues/82
4905-
return;
4906-
}
49074887
// Double free python C extension test
49084888
// Copy files to tmp dir
49094889
let work_dir = abs_path("tests/casr_tests/python");
@@ -4991,7 +4971,7 @@ fn test_casr_python_call_san_df() {
49914971
.unwrap()
49924972
.to_string();
49934973

4994-
assert!(report["Stacktrace"].as_array().unwrap().iter().count() >= 19);
4974+
assert!(report["Stacktrace"].as_array().unwrap().iter().count() >= 15);
49954975
assert_eq!(severity_type, "NOT_EXPLOITABLE");
49964976
assert_eq!(severity_desc, "double-free");
49974977
assert!(

0 commit comments

Comments
 (0)