From ba4dd1bf540a611ddc577b9f185c7920ad2bc848 Mon Sep 17 00:00:00 2001 From: John Kacur Date: Thu, 24 Mar 2016 15:40:03 +0100 Subject: cyclictest: Make the tracemark option imply notrace The new --tracemark option can be used to run cyclictest under trace-cmd. This means we don't want cyclictest's built-in tracing to be used, so this option is only compatible with --notrace. Therefore turn --notrace on if --tracemark is invoked even if the user doesn't explicitly request this. Signed-off-by: John Kacur --- src/cyclictest/cyclictest.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c index 4844dfa..158bced 100644 --- a/src/cyclictest/cyclictest.c +++ b/src/cyclictest/cyclictest.c @@ -1765,6 +1765,7 @@ static void process_options (int argc, char *argv[], int max_cpus) #endif break; case OPT_TRACEMARK: + notrace = 1; /* using --tracemark implies --notrace */ trace_marker = 1; break; } } -- cgit 1.2.3-korg