X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Ftype-declarations%2Fust_tests_td.h;h=8551b328df106deeb0a982e070fc5b93e11d6dfc;hb=28f23191dcbf047429d51950a337a57d7a3f866a;hp=45bccbfabb07624653275847b94327802a054ea9;hpb=10b56aefc3e1de5cee607994f64c3b8a7d85c391;p=lttng-tools.git

diff --git a/tests/regression/ust/type-declarations/ust_tests_td.h b/tests/regression/ust/type-declarations/ust_tests_td.h
index 45bccbfab..8551b328d 100644
--- a/tests/regression/ust/type-declarations/ust_tests_td.h
+++ b/tests/regression/ust/type-declarations/ust_tests_td.h
@@ -1,74 +1,66 @@
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER ust_tests_td
-
-#if !defined(_TRACEPOINT_UST_TESTS_TD_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
-#define _TRACEPOINT_UST_TESTS_TD_H
-
 /*
  * Copyright (C) 2014 Geneviève Bastien <gbastien@versatic.net>
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * SPDX-License-Identifier: MIT
  *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
+#undef TRACEPOINT_PROVIDER
+#define TRACEPOINT_PROVIDER ust_tests_td
+
+#if !defined(_TRACEPOINT_UST_TESTS_TD_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#define _TRACEPOINT_UST_TESTS_TD_H
+
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_ENUM(ust_tests_td, testenum,
-	TP_ENUM_VALUES(
-		ctf_enum_value("zero", 0)
-		ctf_enum_value("one", 1)
-	)
-)
+TRACEPOINT_ENUM(ust_tests_td,
+		testenum,
+		TP_ENUM_VALUES(ctf_enum_value("zero", 0) ctf_enum_value("one", 1)))
+
+TRACEPOINT_ENUM(ust_tests_td,
+		testenum2,
+		TP_ENUM_VALUES(ctf_enum_value("zero", 0) ctf_enum_value("five", 5)
+				       ctf_enum_range("ten_to_twenty", 10, 20)))
 
-TRACEPOINT_ENUM(ust_tests_td, testenum2,
-	TP_ENUM_VALUES(
-		ctf_enum_value("zero", 0)
-		ctf_enum_value("five", 5)
-		ctf_enum_range("ten_to_twenty", 10, 20)
-	)
-)
+TRACEPOINT_ENUM(ust_tests_td,
+		testenum3,
+		TP_ENUM_VALUES(ctf_enum_auto("zero") ctf_enum_value("two", 2) ctf_enum_auto("three")
+				       ctf_enum_range("ten_to_twenty", 10, 20)
+					       ctf_enum_auto("twenty_one")))
 
 /*
  * Enumeration field is used twice to make sure the global type declaration
  * is entered only once in the metadata file.
  */
-TRACEPOINT_EVENT(ust_tests_td, tptest,
+TRACEPOINT_EVENT(
+	ust_tests_td,
+	tptest,
 	TP_ARGS(int, enumval, int, enumval2, int, enumval3),
 	TP_FIELDS(
-		ctf_enum(ust_tests_td, testenum, int, enumfield, enumval)
-		ctf_enum(ust_tests_td, testenum, long long,
-				enumfield_bis, enumval2)
-		ctf_enum(ust_tests_td, testenum2, unsigned int,
-				enumfield_third, enumval3)
-	)
-)
+		ctf_enum(ust_tests_td, testenum, int, enumfield, enumval) ctf_enum(
+			ust_tests_td, testenum, long long, enumfield_bis, enumval2)
+			ctf_enum(ust_tests_td, testenum2, unsigned int, enumfield_third, enumval3)))
 
 /*
  * Another tracepoint using the global types to make sure each global type is
  * entered only once in the metadata file.
  */
-TRACEPOINT_EVENT(ust_tests_td, tptest_bis,
-	TP_ARGS(int, enumval),
-	TP_FIELDS(
-		ctf_enum(ust_tests_td, testenum, unsigned char,
-				enumfield, enumval)
-	)
-)
+TRACEPOINT_EVENT(ust_tests_td,
+		 tptest_bis,
+		 TP_ARGS(int, enumval),
+		 TP_FIELDS(ctf_enum(ust_tests_td, testenum, unsigned char, enumfield, enumval)))
+
+/*
+ * Test autoincrementing enumeration values.
+ */
+TRACEPOINT_EVENT(ust_tests_td,
+		 test_auto,
+		 TP_ARGS(void),
+		 TP_FIELDS(ctf_enum(ust_tests_td, testenum3, int, zero, 0) ctf_enum(
+			 ust_tests_td, testenum3, int, two, 2)
+				   ctf_enum(ust_tests_td, testenum3, int, three, 3) ctf_enum(
+					   ust_tests_td, testenum3, int, fifteen, 15)
+					   ctf_enum(ust_tests_td, testenum3, int, twenty_one, 21)))
 
 #endif /* _TRACEPOINT_UST_TESTS_TD_H */