Skip to content

Commit

Permalink
nix: Temporarily disable LLDB support
Browse files Browse the repository at this point in the history
LLDB package is broken in upstream nix. Appimages and local builds are
broken. We're still waiting for the proper fix to land, so disable for
now.

Also fix cases where code implicltly depends on LLDB to function and
feature gate appropriately.
  • Loading branch information
danobi committed Jun 11, 2024
1 parent cbc0896 commit 5f696cb
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 1 deletion.
6 changes: 5 additions & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,11 @@
libopcodes
libpcap
libsystemtap
lldb
# Temporarily disable LLDB support in CI. We're waiting on upstream
# nixpkgs fixes:
# https://github.com/NixOS/nixpkgs/issues/315214
# https://github.com/NixOS/nixpkgs/pull/316045
#lldb
llvm
pahole
xxd
Expand Down
2 changes: 2 additions & 0 deletions tests/runtime/call
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,8 @@ ENV BPFTRACE_CACHE_USER_SYMBOLS=PER_PROGRAM
PROG uprobe:./testprogs/uprobe_symres_exited_process:test { print(ustack); exit(); }
EXPECT_REGEX ^\s+test\+[0-9]+\s+test2\+[0-9]+\s+main\+[0-9]+
AFTER ./testprogs/disable_aslr ./testprogs/uprobe_symres_exited_process
# Required to skip function prologue
REQUIRES_FEATURE dwarf
TIMEOUT 5

NAME cat
Expand Down
2 changes: 2 additions & 0 deletions tests/runtime/other
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,8 @@ NAME positional ustack
RUN {{BPFTRACE}} -e 'u:./testprogs/uprobe_loop:uprobeFunction1 { printf("%s\n%s\n", ustack(), ustack($1)); exit(); }' 1
EXPECT_REGEX .*uprobeFunction1\+[0-9]+\n\s+spin\+[0-9]+\n\s+main\+[0-9]+\n.*\n\n\n\s+uprobeFunction1\+[0-9]+
TIMEOUT 5
# Required to skip function prologue
REQUIRES_FEATURE dwarf
AFTER ./testprogs/uprobe_loop

NAME lhist can be cleared
Expand Down
2 changes: 2 additions & 0 deletions tests/semantic_analyser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@ kprobe:f { fake }
test(feature, "k:f { jiffies }", 1);
}

#ifdef HAVE_LIBLLDB
TEST(semantic_analyser, builtin_variables_inline)
{
auto bpftrace = get_mock_bpftrace();
Expand All @@ -288,6 +289,7 @@ uprobe:/bin/sh:f { args }
~~~~
)");
}
#endif // HAVE_LIBLLDB

TEST(semantic_analyser, builtin_cpid)
{
Expand Down

0 comments on commit 5f696cb

Please sign in to comment.