fix: Add no-san to the skipped targets in the msan build.

TokTok · Jan 20, 2024 · 5e03acb · 5e03acb
1 parent 6980e85
commit 5e03acb
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 21 deletions.
diff --git a/c-toxcore b/c-toxcore
diff --git a/ci-tools b/ci-tools
diff --git a/hs-cimple b/hs-cimple
diff --git a/hs-happy-arbitrary b/hs-happy-arbitrary
diff --git a/hs-toxcore-c b/hs-toxcore-c
diff --git a/tools/built/src/Dockerfile.dev b/tools/built/src/Dockerfile.dev
@@ -12,9 +12,12 @@ FROM toxchat/toktok-stack:latest-fastbuild
 
 ENV USER=builder
 
+# We're using a specific home-manager version that is compatible with the 23.11 nixpkgs tag.
+# https://github.com/nix-community/home-manager/pull/4884 broke it.
+# See https://discourse.nixos.org/t/is-nix-lib-nmd-missing-from-23-11/38268
 RUN sudo nix-daemon --daemon & sleep 1 \
  && nix-channel --add https://github.com/NixOS/nixpkgs/archive/refs/tags/23.11.tar.gz nixpkgs \
- && nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz home-manager \
+ && nix-channel --add https://github.com/nix-community/home-manager/archive/f2942f3385f1b35cc8a1abb03a45e29c9cb4d3c8.tar.gz home-manager \
  && nix-channel --update \
  && nix-shell '<home-manager>' -A install
 

diff --git a/tools/built/src/Dockerfile.msan b/tools/built/src/Dockerfile.msan
@@ -5,6 +5,6 @@ RUN echo 'build --config=msan' >> .bazelrc.local
 
 # Don't build any Go code. It needs sanitizer/msan_interface.h.
 RUN sudo nix-daemon --daemon \
-  & bazel build -k --build_tag_filters='-go,-no-cross' //third_party/...
+  & bazel build -k --build_tag_filters='-go,-no-cross,-no-san' //third_party/...
 
 # vim:ft=dockerfile
diff --git a/tools/debug/symbolize b/tools/debug/symbolize
@@ -7,26 +7,22 @@ SYMBOLIZER = (
     "/nix/store/d0r6r274cpcr6gslqx16gn0m38qpy5p3-llvm-16.0.6/bin/llvm-symbolizer"
 )
 
+REGEX = r"\b0x[0-9a-f]{8,}  \(([^ +]*)\+(0x[0-9a-f]+)\)"
+
 for line in sys.stdin:
-    m = re.fullmatch(
-        "#(\d+) (0x[0-9a-f]+)  \((.*)\+(0x[0-9a-f]+)\)( \(BuildId: [0-9a-f]+\))?",
-        line.strip(),
-    )
+    m = re.search(REGEX, line.strip())
     if m:
-        num = m.group(1)
-        addr = m.group(2)
-        prog = m.group(3)
-        off = m.group(4)
-        buildid = m.group(5) or ""
+        prog = m.group(1)
+        off = m.group(2)
 
         try:
             fun = (subprocess.run(
                 [SYMBOLIZER, "--pretty-print", f"--exe={prog}", off],
                 check=True,
                 capture_output=True,
             ).stdout.decode("utf-8").split("\n")[0])
-            print(f"    #{num} {fun}")
+            print(re.sub(REGEX, fun, line), end="")
         except subprocess.CalledProcessError:
-            print(f"    #{num} {addr}  ({prog}+{off}){buildid}")
+            print(line, end="")
     else:
         print(line, end="")
diff --git a/tools/toktok-fuzzer b/tools/toktok-fuzzer
diff --git a/toxic b/toxic
diff --git a/zig-toxcore-c b/zig-toxcore-c
+8 −2		BUILD.bazel
+7 −3		cimple.cabal
+1 −0		src/Language/Cimple/Ast.hs
+24 −1		src/Language/Cimple/CommentParser.y
+138 −2		src/Language/Cimple/DescribeAst.hs
+1 −0		src/Language/Cimple/Flatten.hs
+8 −6		src/Language/Cimple/Lexer.x
+2 −0		src/Language/Cimple/MapAst.hs
+24 −17		src/Language/Cimple/Parser.y
+33 −5		src/Language/Cimple/Pretty.hs
+0 −1		src/Language/Cimple/Tokens.hs
+5 −0		src/Language/Cimple/TraverseAst.hs
+57 −0		test/Language/Cimple/DescribeAstSpec.hs
+0 −5		test/Language/Cimple/ParserSpec.hs
+4 −4		test/Language/Cimple/PrettySpec.hs
+144 −0		test/Language/CimpleSpec.hs
+1 −1		BUILD.bazel
+1 −1		happy-arbitrary.cabal
+9 −0		src/Language/Happy.hs
+56 −30		src/Language/Happy/Arbitrary.hs
+1 −0		src/Language/Happy/Lexer.x
+13 −10		src/Language/Happy/Parser.y
+1 −0		src/Language/Happy/Tokens.hs
+3 −2		test/Language/Happy/ArbitrarySpec.hs
+1 −1		Makefile
+2 −2		doc/toxic.1
+39 −6		doc/toxic.conf.5
+28 −4		doc/toxic.conf.5.asc
+44 −5		misc/toxic.conf.example
+1 −1		src/api.c
+1 −1		src/api.h
+24 −24		src/audio_call.c
+1 −1		src/audio_call.h
+1 −1		src/audio_device.c
+1 −1		src/audio_device.h
+6 −6		src/autocomplete.c
+2 −2		src/autocomplete.h
+20 −20		src/avatars.c
+7 −7		src/avatars.h
+6 −6		src/bootstrap.c
+2 −2		src/bootstrap.h
+91 −85		src/chat.c
+4 −4		src/chat.h
+43 −43		src/chat_commands.c
+5 −5		src/chat_commands.h
+54 −53		src/conference.c
+7 −5		src/conference.h
+16 −16		src/conference_commands.c
+6 −6		src/conference_commands.h
+1 −1		src/configdir.c
+1 −1		src/configdir.h
+1 −1		src/curl_util.c
+1 −1		src/curl_util.h
+10 −9		src/execute.c
+2 −2		src/execute.h
+12 −12		src/file_transfers.c
+7 −6		src/file_transfers.h
+179 −59		src/friendlist.c
+35 −3		src/friendlist.h
+17 −17		src/game_base.c
+2 −2		src/game_base.h
+18 −21		src/game_centipede.c
+1 −1		src/game_centipede.h
+14 −14		src/game_chess.c
+1 −1		src/game_chess.h
+16 −16		src/game_life.c
+1 −1		src/game_life.h
+20 −20		src/game_snake.c
+1 −1		src/game_snake.h
+1 −3		src/game_util.c
+3 −1		src/game_util.h
+102 −77		src/global_commands.c
+9 −8		src/global_commands.h
+63 −63		src/groupchat_commands.c
+21 −21		src/groupchat_commands.h
+245 −107		src/groupchats.c
+29 −8		src/groupchats.h
+3 −2		src/help.c
+1 −1		src/help.h
+1 −1		src/input.c
+1 −1		src/input.h
+1 −1		src/line_info.c
+3 −1		src/line_info.h
+1 −1		src/log.c
+1 −1		src/log.h
+6 −6		src/message_queue.c
+3 −3		src/message_queue.h
+66 −13		src/misc_tools.c
+17 −5		src/misc_tools.h
+6 −6		src/name_lookup.c
+2 −2		src/name_lookup.h
+1 −1		src/notify.c
+1 −1		src/notify.h
+1 −1		src/osx_video.h
+1 −1		src/osx_video.m
+28 −27		src/prompt.c
+4 −4		src/prompt.h
+2 −2		src/python_api.c
+1 −1		src/python_api.h
+1 −1		src/qr_code.c
+1 −1		src/qr_code.h
+213 −23		src/settings.c
+31 −2		src/settings.h
+11 −11		src/term_mplex.c
+2 −2		src/term_mplex.h
+348 −244		src/toxic.c
+41 −39		src/toxic.h
+1 −1		src/toxic_strings.c
+1 −1		src/toxic_strings.h
+11 −11		src/video_call.c
+1 −1		src/video_call.h
+1 −1		src/video_device.c
+1 −1		src/video_device.h
+105 −94		src/windows.c
+32 −11		src/windows.h
+1 −1		src/x11focus.c
+1 −1		src/x11focus.h
+2 −1		.github/workflows/ci.yaml
+11 −11		build.zig
+6 −6		build.zig.zon
+1 −7		src/tox.zig