local ret
- "$TESTDIR/../src/bin/lttng/$LTTNG_BIN" add-context -k \
- -s "$session_name" -c "$channel_name" \
- -t "$context_name" 1>"$OUTPUT_DEST" 2>"$ERROR_OUTPUT_DEST"
+ _run_lttng_cmd "$(lttng_client_log_file)" "$(lttng_client_err_file)" add-context -k \
+ -s "$session_name" -c "$channel_name" -t "$context_name"
ret=$?
if [ "$ret" == "4" ]; then
local channel_name=$3
local filter=$4
- "$TESTDIR/../src/bin/lttng/$LTTNG_BIN" enable-event -k \
- -c "$channel_name" -s "$session_name" \
- --syscall "$syscall_name" \
- -f "$filter" \
- 1>"$OUTPUT_DEST" 2>"$ERROR_OUTPUT_DEST"
+ _run_lttng_cmd "$(lttng_client_log_file)" "$(lttng_client_err_file)" enable-event -k \
+ -c "$channel_name" -s "$session_name" \ --syscall "$syscall_name" \
+ -f "$filter"
ok $? "Add syscall with filter"
}
return
fi
- trace_path=$(mktemp -d)
- file_sync_wait_before_unshare=$(mktemp -u)
- file_sync_wait_after_unshare=$(mktemp -u)
- file_sync_signal_after_unshare=$(mktemp -u)
+ trace_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
+ file_sync_wait_before_unshare=$(mktemp -u -t "tmp.${FUNCNAME[0]}_sync_before_unshare.XXXXXX")
+ file_sync_wait_after_unshare=$(mktemp -u -t "tmp.${FUNCNAME[0]}_sync_after_unshare.XXXXXX")
+ file_sync_signal_after_unshare=$(mktemp -u -t "tmp.${FUNCNAME[0]}_sync_signal_after_unshare.XXXXXX")
# Get the current ns inode number
ns_inode=$(stat -c '%i' -L "/proc/$$/ns/$ns")
# Check that the events contain the right namespace inode number
validate_trace_count "${ns}_ns = $app_ns_inode" "$trace_path" 1
validate_trace_count "${ns}_ns = $app_unshare_ns_inode" "$trace_path" 1
+ else
+ touch "$file_sync_wait_before_unshare"
+
+ while [ ! -f "$file_sync_signal_after_unshare" ]; do
+ # Break if the app failed / died
+ if ! kill -0 "$app_pid" ; then
+ break
+ echo "# App failed"
+ fi
+ echo "# Waiting for app..."
+ sleep 0.5
+ done
+ touch "$file_sync_wait_after_unshare"
fi
+
# stop and destroy
destroy_lttng_session_ok "$session_name"
stop_lttng_sessiond
print_test_banner "$TEST_DESC"
-
-isroot=0
-if [ "$(id -u)" == "0" ]; then
- isroot=1
-fi
-
-skip $isroot "Root access is needed. Skipping all tests." "$NUM_TESTS" && exit 0
-
+check_skip_kernel_test "$NUM_TESTS" "Skipping all tests." && exit 0
system_has_ns=0
if [ -d "/proc/$$/ns" ]; then
#test_ns time # time_ns is special, can't be changed that way
test_ns user
test_ns uts
+set +x