TRACE_PATH=$(mktemp -d)
-NUM_TESTS=150
+NUM_TESTS=136
source $TESTDIR/utils/utils.sh
source $CURDIR/rotate_utils.sh
destroy_lttng_session_ok $SESSION_NAME
- # The tests on the chunk folder rely on the date staying the same during
- # the duration of the test, if this fail we will now why the other checks
- # fail afterwards. There is a short window of time where an automated test
- # could fail because of that.
- now=$(date +%Y%m%d)
- test $today = $now
- ok $? "Date did not change during the test"
-
validate_test_chunks "${local_path}" $today $app_path ust $per_pid
}
create_lttng_session_uri $SESSION_NAME net://localhost
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
- rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" "ust/uid/*/*/" 0
+ rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" "ust/uid/*/*/" 0
}
function test_ust_local_uid ()
create_lttng_session_ok $SESSION_NAME $TRACE_PATH
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
- rotate_ust_test "${TRACE_PATH}" "ust/uid/*/*/" 0
+ rotate_ust_test "${TRACE_PATH}/archives" "ust/uid/*/*/" 0
}
function test_ust_streaming_pid ()
enable_channel_per_pid $SESSION_NAME "channel0"
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
- rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" "ust/pid/*/" 1
+ rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" "ust/pid/*/" 1
}
function test_ust_local_pid ()
enable_channel_per_pid $SESSION_NAME "channel0"
enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
- rotate_ust_test "${TRACE_PATH}" "ust/pid/*/" 1
+ rotate_ust_test "${TRACE_PATH}/archives" "ust/pid/*/" 1
}
function test_ust_local_timer_uid ()
# We just want the app to register, no event generated
$TESTAPP_BIN 0 0 /dev/null 2>&1
- rotate_timer_test "${TRACE_PATH}" 0
+ rotate_timer_test "${TRACE_PATH}/archives" 0
}
function test_ust_streaming_timer_uid ()
# We just want the app to register, no event generated
$TESTAPP_BIN 0 0 /dev/null 2>&1
- rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 0
+ rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" 0
}
function test_ust_local_timer_pid ()
# We just want the app to register, no event generated
$TESTAPP_BIN 0 0 /dev/null 2>&1
- rotate_timer_test "${TRACE_PATH}" 1
+ rotate_timer_test "${TRACE_PATH}/archives" 1
}
function test_ust_streaming_timer_pid ()
# We just want the app to register, no event generated
$TESTAPP_BIN 0 0 /dev/null 2>&1
- rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 1
+ rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" 1
}
function test_incompatible_sessions ()