From 8387d1765238812953534bc9ff2d860f13d63cc9 Mon Sep 17 00:00:00 2001 From: avgor 46 Date: Thu, 21 Mar 2024 00:41:47 +0300 Subject: [PATCH 1/4] Enable LD_PRELOAD tests --- casr/tests/tests.rs | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/casr/tests/tests.rs b/casr/tests/tests.rs index b43c975b..b29d9a20 100644 --- a/casr/tests/tests.rs +++ b/casr/tests/tests.rs @@ -4049,10 +4049,6 @@ fn test_casr_libfuzzer() { #[test] #[cfg(target_arch = "x86_64")] fn test_casr_libfuzzer_atheris() { - if lsb_release::info().unwrap().version == "22.04" { - // LD_PRELOAD hangs, see #208 - return; - } use std::collections::HashMap; let paths = [ @@ -4239,10 +4235,6 @@ fn test_casr_java() { #[test] #[cfg(target_arch = "x86_64")] fn test_casr_java_native_lib() { - if lsb_release::info().unwrap().version == "22.04" { - // LD_PRELOAD hangs, see #208 - return; - } let paths = [ abs_path("tests/casr_tests/java/Test2.java"), abs_path("tests/casr_tests/java/Test2.cpp"), @@ -4378,10 +4370,6 @@ fn test_casr_python_atheris() { #[test] #[cfg(target_arch = "x86_64")] fn test_casr_san_python_df() { - if lsb_release::info().unwrap().version == "22.04" { - // LD_PRELOAD hangs, see #208 - return; - } // Double free python C extension test // Copy files to tmp dir let work_dir = abs_path("tests/casr_tests/python"); @@ -4489,10 +4477,6 @@ fn test_casr_san_python_df() { #[test] #[cfg(target_arch = "x86_64")] fn test_casr_san_atheris_df() { - if lsb_release::info().unwrap().version == "22.04" { - // LD_PRELOAD hangs, see #208 - return; - } // Double free python C extension test // Copy files to tmp dir let work_dir = abs_path("tests/casr_tests/python"); @@ -4604,10 +4588,6 @@ fn test_casr_san_atheris_df() { #[test] #[cfg(target_arch = "x86_64")] fn test_casr_python_call_san_df() { - if lsb_release::info().unwrap().version == "22.04" { - // LD_PRELOAD hangs, see #208 - return; - } // Double free python C extension test // Copy files to tmp dir let work_dir = abs_path("tests/casr_tests/python"); @@ -4977,10 +4957,6 @@ fn test_casr_js_jazzer() { #[test] #[cfg(target_arch = "x86_64")] fn test_casr_js_native() { - if lsb_release::info().unwrap().version == "22.04" { - // LD_PRELOAD hangs, see #208 - return; - } // JS C extension test // Copy files to tmp dir let work_dir = abs_path("tests/casr_tests/js"); @@ -5116,10 +5092,6 @@ fn test_casr_js_native() { #[test] #[cfg(target_arch = "x86_64")] fn test_casr_js_native_jsfuzz() { - if lsb_release::info().unwrap().version == "22.04" { - // LD_PRELOAD hangs, see #208 - return; - } // JS jsfuzz C extension test // Copy files to tmp dir let work_dir = abs_path("tests/casr_tests/js"); @@ -5255,10 +5227,6 @@ fn test_casr_js_native_jsfuzz() { #[test] #[cfg(target_arch = "x86_64")] fn test_casr_js_native_jazzer() { - if lsb_release::info().unwrap().version == "22.04" { - // LD_PRELOAD hangs, see #208 - return; - } // JS jsfuzz C extension test // Copy files to tmp dir let work_dir = abs_path("tests/casr_tests/js"); From 6f08de508b2dd070fff211c2343cf53f30ad5da7 Mon Sep 17 00:00:00 2001 From: avgor 46 Date: Thu, 21 Mar 2024 00:43:49 +0300 Subject: [PATCH 2/4] Change coverage workflow runner to ubuntu22.04 --- .github/workflows/coverage.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index 837ce4e9..d4dcf4e6 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -11,8 +11,7 @@ env: jobs: ubuntu-latest: - # Tests that use LD_PRELOAD are run only on Ubuntu 20.04, see #208 - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From 9ee18843f569f9ee918cbf1c57e6ae54d349eb00 Mon Sep 17 00:00:00 2001 From: avgor 46 Date: Thu, 21 Mar 2024 00:53:01 +0300 Subject: [PATCH 3/4] Python3.10 --- .github/workflows/coverage.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/coverage.yaml b/.github/workflows/coverage.yaml index d4dcf4e6..9d806814 100644 --- a/.github/workflows/coverage.yaml +++ b/.github/workflows/coverage.yaml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Dependences run: | - sudo apt update && sudo apt install -y gdb pip curl python3.9-dev llvm \ + sudo apt update && sudo apt install -y gdb pip curl python3.10-dev llvm \ openjdk-17-jdk ca-certificates gnupg pip3 install atheris sudo mkdir -p /etc/apt/keyrings From 8c4a624e55810b5cd1acd28ed2703a9c47fea65e Mon Sep 17 00:00:00 2001 From: avgor 46 Date: Thu, 21 Mar 2024 10:54:57 +0300 Subject: [PATCH 4/4] Remove lsb_release from toml --- casr/Cargo.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/casr/Cargo.toml b/casr/Cargo.toml index 54606812..ab09d2bf 100644 --- a/casr/Cargo.toml +++ b/casr/Cargo.toml @@ -52,4 +52,3 @@ required-features = ["dojo"] [dev-dependencies] lazy_static = "1.4" -lsb_release = "0.1"