From: Yannick Brosseau <yannick.brosseau@gmail.com>
Date: Wed, 23 Feb 2011 17:46:22 +0000 (+0100)
Subject: Fix libustctl_function_tests
X-Git-Tag: v1.9.1~443
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=6678d7dd072caf7fc2b9aec8998c565a6326d359;p=lttng-ust.git

Fix libustctl_function_tests

After discussions, we concluded that the enable a non existing marker is a valid case, so we
move it to the working case section.
While being there, check that the re-enable a marker set the right errno

Signed-off-by: Yannick Brosseau <yannick.brosseau@gmail.com>
Signed-off-by: Nils Carlson <nils.carlson@ericsson.com>
---

diff --git a/tests/libustctl_function_tests/libustctl_function_tests.c b/tests/libustctl_function_tests/libustctl_function_tests.c
index 947028f9..7c12695a 100644
--- a/tests/libustctl_function_tests/libustctl_function_tests.c
+++ b/tests/libustctl_function_tests/libustctl_function_tests.c
@@ -21,6 +21,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <errno.h>
 
 #include <ust/marker.h>
 #include <ust/ustctl.h>
@@ -136,15 +137,16 @@ static void ustctl_function_tests(pid_t pid)
 
 	tap_ok(!ustctl_destroy_trace(trace, pid), "ustctl_destroy_trace - without ever starting");
 
+	tap_ok(ustctl_set_marker_state(trace, "ustl", "blar", 1, pid) == 0,
+	       "Enable non-existent marker ustl blar");
 
 	printf("##### Tests that definetly should work are completed #####\n");
 	printf("############## Start expected failure cases ##############\n");
 
 	tap_ok(ustctl_set_marker_state(trace, "ust","bar", 1, pid),
 	       "Enable already enabled marker ust/bar");
-
-	tap_ok(ustctl_set_marker_state(trace, "ustl", "blar", 1, pid),
-	       "Enable non-existent marker ustl blar");
+	tap_ok(EEXIST == errno, 
+	       "Right error code for enabling an already enabled marker");
 
 	tap_ok(ustctl_start_trace(trace, pid),
 	       "Start a non-existent trace");
@@ -161,7 +163,7 @@ int main(int argc, char **argv)
 	int i, status;
 	pid_t parent_pid, child_pid;
 
-	tap_plan(27);
+	tap_plan(28);
 
 	printf("Function tests for ustctl\n");