Skip to content

move and fix native custom labels test #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
umanwizard wants to merge 2 commits into
base: main
Choose a base branch
from
Open

move and fix native custom labels test #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a8a8ca
move and fix native custom labels test
umanwizard Aug 15, 2025
e041fbc
move the files
umanwizard Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
166 changes: 166 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
members = [
"rust-crates/symblib",
"rust-crates/symblib-capi",
"rust-crates/custom-labels-example",
]
resolver = "2"

Expand Down
10 changes: 5 additions & 5 deletions customlabelstest/customlabels_test.go → ...egrationtests/native/customlabels_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,14 @@ func TestNativeCustomLabels(t *testing.T) {
defer cancel()

traceCh, _ := testutils.StartTracer(ctx, t, enabledTracers, r, false)
// TODO - change this to `cargo build --release --bin custom-labels-example`
// once we have the Rust workspace from upstream.
cmd := exec.Command("cargo", "build", "--release",
"--manifest-path", "./rust-crates/custom-labels-example/Cargo.toml")
cmd := exec.Command("cargo", "build", "--release", "--bin", "custom-labels-example")
out, err := cmd.CombinedOutput()
require.NoError(t, err, string(out))

errCh := make(chan error, 1)

cmd = exec.CommandContext(ctx,
"./rust-crates/custom-labels-example/target/release/custom-labels-example")
"./target/release/custom-labels-example")
err = cmd.Start()
require.NoError(t, err)

Expand All @@ -53,6 +50,9 @@ Loop:
if !ok {
break Loop
}
if trace == nil {
continue
}
t.Logf("got a trace %s", trace.Comm)
if len(trace.CustomLabels) > 0 {
var gotL1, gotL2 bool
Expand Down
0 ...ustomlabels/integrationtests/node_test.go → ...labels/integrationtests/node/node_test.go
View file
Open in desktop
File renamed without changes.
0 ...ntests/testdata/node-md-render/.gitignore → ...s/node/testdata/node-md-render/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...ntests/testdata/node-md-render/Dockerfile → ...s/node/testdata/node-md-render/Dockerfile
View file
Open in desktop
File renamed without changes.
0 ...iontests/testdata/node-md-render/index.js → ...sts/node/testdata/node-md-render/index.js
View file
Open in desktop
File renamed without changes.
0 ...ests/testdata/node-md-render/package.json → ...node/testdata/node-md-render/package.json
View file
Open in desktop
File renamed without changes.
0 ...ontests/testdata/node-md-render/worker.js → ...ts/node/testdata/node-md-render/worker.js
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions rust-crates/custom-labels-example/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name = "custom-labels-example"
edition = "2021"
# Once we have the Rust workspace stuff from upstream, set these to true.
#
# version.workspace = true
# rust-version.workspace = true
# license.workspace = true
version.workspace = true
rust-version.workspace = true
license.workspace = true

[dependencies]
custom-labels = "0.4.0"
Expand Down