Skip to contentSkip to conversation

lttng-tools: accommodate stricter mktemp implementations in tests

PATCH Jérémie Galarneau 1 participant 1 message Nov 8, 2016 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Merged in master and stable-2.9.

Thanks!
Jérémie

Quoted 47 lines · Nathan Lynch

Busybox's mktemp command uses mkstemp(3) which requires the last six characters of the template to be X's. Extend the mktemp templates used in the test scripts.

---
 tests/regression/kernel/test_clock_override             | 4 ++--
 tests/regression/ust/clock-override/test_clock_override | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
tests/regression/kernel/test_clock_override +2 -2
index c52ddf100b25..2f64bd92943b 100755
@@ -76,8 +76,8 @@ function extract_clock_metadata_token()
 
 function test_clock_override_metadata()
 {
-       local ctf_metadata_file=$(mktemp -p $TRACE_PATH ctf-metadata.XXXXX)
-       local clock_metadata_file=$(mktemp -p $TRACE_PATH clock-metadata.XXXXX)
+       local ctf_metadata_file=$(mktemp -p $TRACE_PATH ctf-metadata.XXXXXX)
+       local clock_metadata_file=$(mktemp -p $TRACE_PATH clock-metadata.XXXXXX)
        local result=""
 
        diag "Clock override plugin metadata test"
tests/regression/ust/clock-override/test_clock_override +2 -3
index 722e7315849f..77fa91216fa3 100755
@@ -76,8 +76,8 @@ function extract_clock_metadata_token()
 
 function test_getcpu_override_metadata()
 {
-       local ctf_metadata_file=$(mktemp -p $TRACE_PATH ctf-metadata.XXXXX)
-       local clock_metadata_file=$(mktemp -p $TRACE_PATH clock-metadata.XXXXX)
+       local ctf_metadata_file=$(mktemp -p $TRACE_PATH ctf-metadata.XXXXXX)
+       local clock_metadata_file=$(mktemp -p $TRACE_PATH clock-metadata.XXXXXX)
        local result=""
 
        diag "Clock override plugin metadata test"
--

2.7.4

_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Signature · 7 lines
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com
_______________________________________________
lttng-dev mailing list
[email protected]
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev