Add tests to verify that short options with attached numeric arguments
work correctly for all rtla commands after the parsing fixes.
Tests verify four formats for each command:
- Short option with space: -p 100
- Short option attached: -p100
- Long option with equals: --period=100
- Long option with space: --period 100
For osnoise and hwnoise commands, the tests also include -r 100 (runtime)
to satisfy the osnoise constraint that runtime <= period.
These tests complement the existing timerlat hist tests added in commit
d489b602c669 ("rtla/timerlat: Add tests for option parsing with attached
arguments").
Assisted-by: Claude:claude-sonnet-4-5
Signed-off-by: John Kacur <[email protected]>
---
tools/tracing/rtla/tests/hwnoise.t | 10 ++++++++++
tools/tracing/rtla/tests/osnoise.t | 18 ++++++++++++++++++
tools/tracing/rtla/tests/timerlat.t | 8 ++++++++
3 files changed, 36 insertions(+)
diff --git a/tools/tracing/rtla/tests/hwnoise.t
b/tools/tracing/rtla/tests/hwnoise.t
index 23ce250a6852..c61f02bc42fe 100644
--- a/tools/tracing/rtla/tests/hwnoise.t
+++ b/tools/tracing/rtla/tests/hwnoise.t
@@ -19,4 +19,14 @@ check "enable a trace event trigger" \
"hwnoise -t -e osnoise:irq_noise
--trigger=\"hist:key=desc,duration:sort=desc,duration:vals=hitcount\" -d 10s" \
0 "Saving event osnoise:irq_noise hist to osnoise_irq_noise_hist.txt"
+# Option parsing tests - verify attached numeric arguments work correctly
+check "verify -p with space" \
+ "hwnoise -p 100 -r 100 -c 0 -d 1s" 0 "" "no-irq and no-thread"
+check "verify -p without space (attached argument)" \
+ "hwnoise -p100 -r 100 -c 0 -d 1s" 0 "" "no-irq and no-thread"
+check "verify --period with equals" \
+ "hwnoise --period=100 -r 100 -c 0 -d 1s" 0 "" "no-irq and no-thread"
+check "verify --period with space" \
+ "hwnoise --period 100 -r 100 -c 0 -d 1s" 0 "" "no-irq and no-thread"
+
test_end
diff --git a/tools/tracing/rtla/tests/osnoise.t
b/tools/tracing/rtla/tests/osnoise.t
index 396334608920..1807236431df 100644
--- a/tools/tracing/rtla/tests/osnoise.t
+++ b/tools/tracing/rtla/tests/osnoise.t
@@ -17,6 +17,24 @@ check "verify the --trace param" \
check "verify the --entries/-E param" \
"osnoise hist -P F:1 -c 0 -r 900000 -d 10s -b 10 -E 25"
+# Option parsing tests - verify attached numeric arguments work correctly
+check "verify -p with space" \
+ "osnoise hist -p 100 -r 100 -c 0 -d 1s" 0 "" "no-irq and no-thread"
+check "verify -p without space (attached argument)" \
+ "osnoise hist -p100 -r 100 -c 0 -d 1s" 0 "" "no-irq and no-thread"
+check "verify --period with equals" \
+ "osnoise hist --period=100 -r 100 -c 0 -d 1s" 0 "" "no-irq and
no-thread"
+check "verify --period with space" \
+ "osnoise hist --period 100 -r 100 -c 0 -d 1s" 0 "" "no-irq and
no-thread"
+check "verify osnoise top -p with space" \
+ "osnoise top -p 100 -r 100 -c 0 -d 1s -q" 0 "" "no-irq and no-thread"
+check "verify osnoise top -p without space (attached argument)" \
+ "osnoise top -p100 -r 100 -c 0 -d 1s -q" 0 "" "no-irq and no-thread"
+check "verify osnoise top --period with equals" \
+ "osnoise top --period=100 -r 100 -c 0 -d 1s -q" 0 "" "no-irq and
no-thread"
+check "verify osnoise top --period with space" \
+ "osnoise top --period 100 -r 100 -c 0 -d 1s -q" 0 "" "no-irq and
no-thread"
+
# Test setting default period by putting an absurdly high period
# and stopping on threshold.
# If default period is not set, this will time out.
diff --git a/tools/tracing/rtla/tests/timerlat.t
b/tools/tracing/rtla/tests/timerlat.t
index 1a63301f5d70..506227412027 100644
--- a/tools/tracing/rtla/tests/timerlat.t
+++ b/tools/tracing/rtla/tests/timerlat.t
@@ -51,6 +51,14 @@ check "verify --period with equals" \
"timerlat hist --period=100 -c 0 -d 1s" 0 "" "no-irq and no-thread"
check "verify --period with space" \
"timerlat hist --period 100 -c 0 -d 1s" 0 "" "no-irq and no-thread"
+check "verify timerlat top -p with space" \
+ "timerlat top -p 100 -c 0 -d 1s -q" 0 "" "no-irq and no-thread"
+check "verify timerlat top -p without space (attached argument)" \
+ "timerlat top -p100 -c 0 -d 1s -q" 0 "" "no-irq and no-thread"
+check "verify timerlat top --period with equals" \
+ "timerlat top --period=100 -c 0 -d 1s -q" 0 "" "no-irq and no-thread"
+check "verify timerlat top --period with space" \
+ "timerlat top --period 100 -c 0 -d 1s -q" 0 "" "no-irq and no-thread"
# Actions tests
check "trace output through -t" \
--
2.54.0
