From 92c26f71e6ee3ea95b902f9edb803f3e40c372cd Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Mon, 19 May 2025 19:40:50 -0700 Subject: [PATCH] remove dead mull stuff (#2208) * remove dead mull stuff * rm clang * fix --- Dockerfile | 11 +---------- SConstruct | 12 ++---------- setup.sh | 4 ++-- tests/libpanda/SConscript | 21 --------------------- 4 files changed, 5 insertions(+), 43 deletions(-) diff --git a/Dockerfile b/Dockerfile index c2f04bf7..5b91a473 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,16 +14,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ python3-dev \ python3-pip \ && rm -rf /var/lib/apt/lists/* && \ - apt clean && \ - cd /usr/lib/gcc/arm-none-eabi/* && \ - rm -rf arm/ && \ - rm -rf thumb/nofp thumb/v6* thumb/v8* thumb/v7+fp thumb/v7-r+fp.sp && \ - apt-get update && apt-get install -y clang-17 && \ - ln -s $(which clang-17) /usr/bin/clang - -RUN apt-get update && apt-get install -y curl && \ - curl -1sLf 'https://dl.cloudsmith.io/public/mull-project/mull-stable/setup.deb.sh' | bash && \ - apt-get update && apt-get install -y mull-17 + apt clean ENV CPPCHECK_DIR=/tmp/cppcheck COPY tests/misra/install.sh /tmp/ diff --git a/SConstruct b/SConstruct index 11ff2173..f8a089b6 100644 --- a/SConstruct +++ b/SConstruct @@ -8,25 +8,17 @@ AddOption('--ubsan', action='store_true', help='turn on UBSan') -AddOption('--coverage', - action='store_true', - help='build with test coverage options') - AddOption('--compile_db', action='store_true', help='build clang compilation database') -AddOption('--mutation', - action='store_true', - help='generate mutation-ready code') - env = Environment( COMPILATIONDB_USE_ABSPATH=True, tools=["default", "compilation_db"], ) - + if GetOption('compile_db'): - env.CompilationDatabase("compile_commands.json") + env.CompilationDatabase("compile_commands.json") # panda fw & test files SConscript('SConscript') diff --git a/setup.sh b/setup.sh index 940bd5c0..d07502d8 100755 --- a/setup.sh +++ b/setup.sh @@ -9,11 +9,11 @@ PLATFORM=$(uname -s) echo "installing dependencies" if [[ $PLATFORM == "Darwin" ]]; then brew install --cask gcc-arm-embedded - brew install python3 dfu-util gcc@13 + brew install python3 gcc@13 elif [[ $PLATFORM == "Linux" ]]; then sudo apt-get install -y --no-install-recommends \ make g++ git libnewlib-arm-none-eabi \ - dfu-util gcc-arm-none-eabi python3-pip libffi-dev clang-17 python3 + gcc-arm-none-eabi python3-pip else echo "WARNING: unsupported platform. skipping apt/brew install." fi diff --git a/tests/libpanda/SConscript b/tests/libpanda/SConscript index 941db938..fc680723 100644 --- a/tests/libpanda/SConscript +++ b/tests/libpanda/SConscript @@ -26,18 +26,6 @@ env = Environment( if system == "Darwin": env.PrependENVPath('PATH', '/opt/homebrew/bin') -if GetOption('mutation'): - env['CC'] = 'clang-17' - flags = [ - '-fprofile-instr-generate', - '-fcoverage-mapping', - '-fpass-plugin=/usr/lib/mull-ir-frontend-17', - '-g', - '-grecord-command-line', - ] - env['CFLAGS'] += flags - env['LINKFLAGS'] += flags - if GetOption('ubsan'): flags = [ "-fsanitize=undefined", @@ -48,12 +36,3 @@ if GetOption('ubsan'): panda = env.SharedObject("panda.os", "panda.c") libpanda = env.SharedLibrary("libpanda.so", [panda]) - -if GetOption('coverage'): - env.Append( - CFLAGS=["-fprofile-arcs", "-ftest-coverage", "-fprofile-abs-path",], - LIBS=["gcov"], - ) - # GCC note file is generated by compiler, ensure we build it, and allow scons to clean it up - AlwaysBuild(panda) - env.SideEffect("panda.gcno", panda)