X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_syscall;h=57adad905fca6ce4750bb6c59f534747482910e9;hp=fd1593d9d6d1751774d3c32c161f1891a898aedc;hb=67b4c664e2c6c6dc19920555c0abf094ed6cbe00;hpb=e563bbdb8fa6592790e9ac4e9db7d9decf022023

diff --git a/tests/regression/kernel/test_syscall b/tests/regression/kernel/test_syscall
index fd1593d9d..57adad905 100755
--- a/tests/regression/kernel/test_syscall
+++ b/tests/regression/kernel/test_syscall
@@ -67,7 +67,7 @@ function test_syscall_simple_list()
 
 	start_lttng_tracing_ok
 	eval ${TESTCMD}
-	stop_lttng_tracing
+	stop_lttng_tracing_ok
 
 	# ensure each is there.
 	validate_trace_exp "-e syscall_entry_$EVENT_NAME: -e compat_syscall_entry_$EVENT_NAME:" $TRACE_PATH
@@ -76,7 +76,7 @@ function test_syscall_simple_list()
 	# ensure trace only contains those.
 	validate_trace_only_exp "-e syscall_entry_$EVENT_NAME: -e compat_syscall_entry_$EVENT_NAME: -e syscall_exit_$EVENT_NAME: -e compat_syscall_exit_$EVENT_NAME:" $TRACE_PATH
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -100,7 +100,7 @@ function test_syscall_simple_list_two()
 
 	start_lttng_tracing_ok
 	eval ${TESTCMD}
-	stop_lttng_tracing
+	stop_lttng_tracing_ok
 
 	# ensure each is there.
 	validate_trace_exp "-e syscall_entry_$EVENT_NAME: -e compat_syscall_entry_$EVENT_NAME:" $TRACE_PATH
@@ -113,7 +113,7 @@ function test_syscall_simple_list_two()
 	# ensure trace only contains those.
 	validate_trace_only_exp "-e syscall_entry_$EVENT_NAME: -e compat_syscall_entry_$EVENT_NAME: -e syscall_exit_$EVENT_NAME: -e compat_syscall_exit_$EVENT_NAME: -e syscall_entry_$EVENT_NAME2: -e compat_syscall_entry_$EVENT_NAME2: -e syscall_exit_$EVENT_NAME2: -e compat_syscall_exit_$EVENT_NAME2:" $TRACE_PATH
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -131,7 +131,7 @@ function test_syscall_single()
 
 	start_lttng_tracing_ok
 	eval ${TESTCMD}
-	stop_lttng_tracing
+	stop_lttng_tracing_ok
 
 	# ensure each is there.
 	validate_trace_exp "-e syscall_entry_open: -e compat_syscall_entry_open:" $TRACE_PATH
@@ -140,7 +140,7 @@ function test_syscall_single()
 	# ensure trace only contains those.
 	validate_trace_only_exp "-e syscall_entry_open: -e compat_syscall_entry_open: -e syscall_exit_open: -e compat_syscall_exit_open:" $TRACE_PATH
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -159,7 +159,7 @@ function test_syscall_two()
 
 	start_lttng_tracing_ok
 	eval ${TESTCMD}
-	stop_lttng_tracing
+	stop_lttng_tracing_ok
 
 	# ensure each is there.
 	validate_trace_exp "-e syscall_entry_open: -e compat_syscall_entry_open:" $TRACE_PATH
@@ -170,7 +170,7 @@ function test_syscall_two()
 	# ensure trace only contains those.
 	validate_trace_only_exp "-e syscall_entry_open: -e compat_syscall_entry_open: -e syscall_exit_open: -e compat_syscall_exit_open: -e syscall_entry_close: -e compat_syscall_entry_close: -e syscall_exit_close: -e compat_syscall_exit_close:" $TRACE_PATH
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -189,7 +189,7 @@ function test_syscall_all()
 
 	start_lttng_tracing_ok
 	eval ${TESTCMD}
-	stop_lttng_tracing
+	stop_lttng_tracing_ok
 
 	# ensure at least open and close are there.
 	validate_trace_exp "-e syscall_entry_open: -e compat_syscall_entry_open:" $TRACE_PATH
@@ -198,7 +198,7 @@ function test_syscall_all()
 	validate_trace_exp "-e syscall_exit_close: -e compat_syscall_exit_close:" $TRACE_PATH
 	# trace may contain other syscalls.
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -220,7 +220,7 @@ function test_syscall_all_disable_one()
 
 	start_lttng_tracing_ok
 	eval ${TESTCMD}
-	stop_lttng_tracing
+	stop_lttng_tracing_ok
 
 	# ensure "open" syscall is there.
 	validate_trace_exp "-e syscall_entry_open: -e compat_syscall_entry_open: -e syscall_exit_open: -e compat_syscall_exit_open:" $TRACE_PATH
@@ -229,7 +229,7 @@ function test_syscall_all_disable_one()
 	validate_trace_exp "-e syscall_entry_close: -e compat_syscall_entry_close:" $TRACE_PATH
 	validate_trace_exp "-e syscall_exit_close: -e compat_syscall_exit_close:" $TRACE_PATH
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -253,7 +253,7 @@ function test_syscall_all_disable_two()
 	start_lttng_tracing_ok
 	# generates open, close, execve (at least)
 	eval ${TESTCMD}
-	stop_lttng_tracing
+	stop_lttng_tracing_ok
 
 	# ensure "open" syscall is there.
 	validate_trace_exp "-e syscall_entry_open: -e compat_syscall_entry_open: -e syscall_exit_open: -e compat_syscall_exit_open:" $TRACE_PATH
@@ -266,7 +266,7 @@ function test_syscall_all_disable_two()
 	validate_trace_exp "-e syscall_entry_execve: -e compat_syscall_entry_execve:" $TRACE_PATH
 	validate_trace_exp "-e syscall_exit_execve: -e compat_syscall_exit_execve:" $TRACE_PATH
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -288,12 +288,12 @@ function test_syscall_enable_all_disable_all()
 	start_lttng_tracing_ok
 	# generates open, close, execve (at least)
 	eval ${TESTCMD}
-	stop_lttng_tracing
+	stop_lttng_tracing_ok
 
 	# ensure nothing has been traced.
 	validate_trace_empty $TRACE_PATH
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -317,7 +317,7 @@ function test_syscall_enable_all_disable_all_enable_all()
 	start_lttng_tracing_ok
 	# generates open, close, execve (at least)
 	eval ${TESTCMD}
-	stop_lttng_tracing
+	stop_lttng_tracing_ok
 
 	# ensure at least open and close are there.
 	validate_trace_exp "-e syscall_entry_open: -e compat_syscall_entry_open:" $TRACE_PATH
@@ -326,7 +326,7 @@ function test_syscall_enable_all_disable_all_enable_all()
 	validate_trace_exp "-e syscall_exit_close: -e compat_syscall_exit_close:" $TRACE_PATH
 	# trace may contain other syscalls.
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -352,12 +352,12 @@ function test_syscall_enable_all_disable_all_twice()
 	start_lttng_tracing_ok
 	# generates open, close, execve (at least)
 	eval ${TESTCMD}
-	stop_lttng_tracing
+	stop_lttng_tracing_ok
 
 	# ensure nothing has been traced.
 	validate_trace_empty $TRACE_PATH
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -379,12 +379,12 @@ function test_syscall_enable_one_disable_one()
 	start_lttng_tracing_ok
 	# generates open, close, execve (at least)
 	eval ${TESTCMD}
-	stop_lttng_tracing
+	stop_lttng_tracing_ok
 
 	# ensure nothing has been traced.
 	validate_trace_empty $TRACE_PATH
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -408,12 +408,12 @@ function test_syscall_enable_two_disable_two()
 	start_lttng_tracing_ok
 	# generates open, close, execve (at least)
 	eval ${TESTCMD}
-	stop_lttng_tracing
+	stop_lttng_tracing_ok
 
 	# ensure nothing has been traced.
 	validate_trace_empty $TRACE_PATH
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -436,7 +436,7 @@ function test_syscall_enable_two_disable_one()
 	start_lttng_tracing_ok
 	# generates open, close, execve (at least)
 	eval ${TESTCMD}
-	stop_lttng_tracing
+	stop_lttng_tracing_ok
 
 	# ensure open is there.
 	validate_trace_exp "-e syscall_entry_open: -e compat_syscall_entry_open:" $TRACE_PATH
@@ -445,7 +445,7 @@ function test_syscall_enable_two_disable_one()
 	# ensure trace only contains those.
 	validate_trace_only_exp "-e syscall_entry_open: -e compat_syscall_entry_open: -e syscall_exit_open: -e compat_syscall_exit_open:" $TRACE_PATH
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -465,7 +465,7 @@ function test_syscall_disable_twice()
 	# Second disable succeeds too, due to enabler semantic.
 	lttng_disable_kernel_syscall_ok $SESSION_NAME "open"
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -485,7 +485,7 @@ function test_syscall_disable_all_twice()
 	# Second disable succeeds too, due to enabler semantic.
 	lttng_disable_kernel_syscall_ok $SESSION_NAME
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -504,7 +504,7 @@ function test_syscall_enable_unknown()
 	# semantic.
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "thissyscallcannotexist"
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -522,7 +522,7 @@ function test_syscall_enable_all_enable_one()
 	# Enabling an event already enabled succeeds, due to enabler semantic.
 	lttng_enable_kernel_syscall_ok $SESSION_NAME "open"
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -541,7 +541,7 @@ function test_syscall_disable_all_disable_one()
 	# Disabling an event already disabled fails.
 	lttng_disable_kernel_syscall_fail $SESSION_NAME "open"
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -561,7 +561,7 @@ function test_syscall_enable_channel_disable_all()
 	# it knowns about. Disable all succeeds if it finds no match.
 	lttng_disable_kernel_syscall_ok $SESSION_NAME "-a" $CHANNEL_NAME
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }
@@ -579,7 +579,7 @@ function test_syscall_enable_channel_disable_one()
 	lttng_enable_kernel_channel_ok $SESSION_NAME $CHANNEL_NAME
 	lttng_disable_kernel_syscall_fail $SESSION_NAME "open" $CHANNEL_NAME
 
-	destroy_lttng_session $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	rm -rf $TRACE_PATH
 }