Skip to content

Commit 92c26f7

Browse files
remove dead mull stuff (#2208)
* remove dead mull stuff * rm clang * fix
1 parent d7e5f85 commit 92c26f7

4 files changed

Lines changed: 5 additions & 43 deletions

File tree

Dockerfile

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1414
python3-dev \
1515
python3-pip \
1616
&& rm -rf /var/lib/apt/lists/* && \
17-
apt clean && \
18-
cd /usr/lib/gcc/arm-none-eabi/* && \
19-
rm -rf arm/ && \
20-
rm -rf thumb/nofp thumb/v6* thumb/v8* thumb/v7+fp thumb/v7-r+fp.sp && \
21-
apt-get update && apt-get install -y clang-17 && \
22-
ln -s $(which clang-17) /usr/bin/clang
23-
24-
RUN apt-get update && apt-get install -y curl && \
25-
curl -1sLf 'https://dl.cloudsmith.io/public/mull-project/mull-stable/setup.deb.sh' | bash && \
26-
apt-get update && apt-get install -y mull-17
17+
apt clean
2718

2819
ENV CPPCHECK_DIR=/tmp/cppcheck
2920
COPY tests/misra/install.sh /tmp/

SConstruct

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,17 @@ AddOption('--ubsan',
88
action='store_true',
99
help='turn on UBSan')
1010

11-
AddOption('--coverage',
12-
action='store_true',
13-
help='build with test coverage options')
14-
1511
AddOption('--compile_db',
1612
action='store_true',
1713
help='build clang compilation database')
1814

19-
AddOption('--mutation',
20-
action='store_true',
21-
help='generate mutation-ready code')
22-
2315
env = Environment(
2416
COMPILATIONDB_USE_ABSPATH=True,
2517
tools=["default", "compilation_db"],
2618
)
27-
19+
2820
if GetOption('compile_db'):
29-
env.CompilationDatabase("compile_commands.json")
21+
env.CompilationDatabase("compile_commands.json")
3022

3123
# panda fw & test files
3224
SConscript('SConscript')

setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ PLATFORM=$(uname -s)
99
echo "installing dependencies"
1010
if [[ $PLATFORM == "Darwin" ]]; then
1111
brew install --cask gcc-arm-embedded
12-
brew install python3 dfu-util gcc@13
12+
brew install python3 gcc@13
1313
elif [[ $PLATFORM == "Linux" ]]; then
1414
sudo apt-get install -y --no-install-recommends \
1515
make g++ git libnewlib-arm-none-eabi \
16-
dfu-util gcc-arm-none-eabi python3-pip libffi-dev clang-17 python3
16+
gcc-arm-none-eabi python3-pip
1717
else
1818
echo "WARNING: unsupported platform. skipping apt/brew install."
1919
fi

tests/libpanda/SConscript

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,6 @@ env = Environment(
2626
if system == "Darwin":
2727
env.PrependENVPath('PATH', '/opt/homebrew/bin')
2828

29-
if GetOption('mutation'):
30-
env['CC'] = 'clang-17'
31-
flags = [
32-
'-fprofile-instr-generate',
33-
'-fcoverage-mapping',
34-
'-fpass-plugin=/usr/lib/mull-ir-frontend-17',
35-
'-g',
36-
'-grecord-command-line',
37-
]
38-
env['CFLAGS'] += flags
39-
env['LINKFLAGS'] += flags
40-
4129
if GetOption('ubsan'):
4230
flags = [
4331
"-fsanitize=undefined",
@@ -48,12 +36,3 @@ if GetOption('ubsan'):
4836

4937
panda = env.SharedObject("panda.os", "panda.c")
5038
libpanda = env.SharedLibrary("libpanda.so", [panda])
51-
52-
if GetOption('coverage'):
53-
env.Append(
54-
CFLAGS=["-fprofile-arcs", "-ftest-coverage", "-fprofile-abs-path",],
55-
LIBS=["gcov"],
56-
)
57-
# GCC note file is generated by compiler, ensure we build it, and allow scons to clean it up
58-
AlwaysBuild(panda)
59-
env.SideEffect("panda.gcno", panda)

0 commit comments

Comments
 (0)