X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_ctf_writer.c;h=9f76f7b37704bf8ac8d76580eaedb201a0d3c14e;hb=c14181ff063bab672dbcb6d24f586ab10853ed72;hp=d139b4ffba0fbbd4d60ce73928b9eb081da7e8de;hpb=dc3fffef7b84cc4af1a7c99828fd57a106cd2257;p=babeltrace.git

diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c
index d139b4ff..9f76f7b3 100644
--- a/tests/lib/test_ctf_writer.c
+++ b/tests/lib/test_ctf_writer.c
@@ -32,16 +32,16 @@
 #include <babeltrace/ctf/events.h>
 #include <babeltrace/values.h>
 #include <unistd.h>
-#include <babeltrace/compat/stdlib.h>
+#include <babeltrace/compat/stdlib-internal.h>
 #include <stdio.h>
 #include <sys/utsname.h>
-#include <babeltrace/compat/limits.h>
-#include <babeltrace/compat/stdio.h>
+#include <babeltrace/compat/limits-internal.h>
+#include <babeltrace/compat/stdio-internal.h>
 #include <string.h>
 #include <assert.h>
 #include <sys/wait.h>
 #include <fcntl.h>
-#include <babeltrace/compat/dirent.h>
+#include <babeltrace/compat/dirent-internal.h>
 #include "tap/tap.h"
 #include <math.h>
 #include <float.h>
@@ -1800,10 +1800,10 @@ void type_field_tests()
 		"bt_ctf_field_type_get_byte_order handles NULL correctly");
 
 	ok(bt_ctf_field_type_get_type_id(NULL) ==
-		BT_CTF_TYPE_ID_UNKNOWN,
+		BT_CTF_FIELD_TYPE_ID_UNKNOWN,
 		"bt_ctf_field_type_get_type_id handles NULL correctly");
 	ok(bt_ctf_field_type_get_type_id(uint_12_type) ==
-		BT_CTF_TYPE_ID_INTEGER,
+		BT_CTF_FIELD_TYPE_ID_INTEGER,
 		"bt_ctf_field_type_get_type_id returns a correct value with an integer type");
 
 	ok(bt_ctf_field_type_integer_get_base(NULL) ==
@@ -1840,7 +1840,7 @@ void type_field_tests()
 		bt_ctf_field_type_sequence_create(int_16_type, "seq_len");
 	ok(sequence_type, "Create a sequence of int16_t type");
 	ok(bt_ctf_field_type_get_type_id(sequence_type) ==
-		BT_CTF_TYPE_ID_SEQUENCE,
+		BT_CTF_FIELD_TYPE_ID_SEQUENCE,
 		"bt_ctf_field_type_get_type_id returns a correct value with a sequence type");
 
 	ok(bt_ctf_field_type_sequence_get_length_field_name(NULL) == NULL,
@@ -1878,7 +1878,7 @@ void type_field_tests()
 
 	structure_seq_type = bt_ctf_field_type_structure_create();
 	ok(bt_ctf_field_type_get_type_id(structure_seq_type) ==
-		BT_CTF_TYPE_ID_STRUCT,
+		BT_CTF_FIELD_TYPE_ID_STRUCT,
 		"bt_ctf_field_type_get_type_id returns a correct value with a structure type");
 	ok(structure_seq_type, "Create a structure type");
 	ok(bt_ctf_field_type_structure_add_field(structure_seq_type,
@@ -2589,7 +2589,7 @@ void test_create_writer_vs_non_writer_mode(void)
 	/* Create non-writer trace, stream class, stream, and clock */
 	non_writer_trace = bt_ctf_trace_create();
 	assert(non_writer_trace);
-	ret = bt_ctf_trace_set_byte_order(non_writer_trace,
+	ret = bt_ctf_trace_set_native_byte_order(non_writer_trace,
 		BT_CTF_BYTE_ORDER_LITTLE_ENDIAN);
 	assert(!ret);
 	non_writer_sc = bt_ctf_stream_class_create("nonwriter_sc");
@@ -2834,7 +2834,7 @@ int main(int argc, char **argv)
 	trace = bt_ctf_writer_get_trace(writer);
 	ok(trace,
 		"bt_ctf_writer_get_trace returns a bt_ctf_trace object");
-	ok(bt_ctf_trace_set_byte_order(trace, BT_CTF_BYTE_ORDER_BIG_ENDIAN) == 0,
+	ok(bt_ctf_trace_set_native_byte_order(trace, BT_CTF_BYTE_ORDER_BIG_ENDIAN) == 0,
 		"Set a trace's byte order to big endian");
 	ok(bt_ctf_trace_get_byte_order(trace) == BT_CTF_BYTE_ORDER_BIG_ENDIAN,
 		"bt_ctf_trace_get_byte_order returns a correct endianness");
@@ -3166,7 +3166,7 @@ int main(int argc, char **argv)
 		stream_class);
 	ok(ret_field_type,
 		"bt_ctf_stream_class_get_event_header_type returns an event header type");
-	ok(bt_ctf_field_type_get_type_id(ret_field_type) == BT_CTF_TYPE_ID_STRUCT,
+	ok(bt_ctf_field_type_get_type_id(ret_field_type) == BT_CTF_FIELD_TYPE_ID_STRUCT,
 		"Default event header type is a structure");
 	event_header_field_type =
 		bt_ctf_field_type_structure_get_field_type_by_name(
@@ -3174,7 +3174,7 @@ int main(int argc, char **argv)
 	ok(event_header_field_type,
 		"Default event header type contains an \"id\" field");
 	ok(bt_ctf_field_type_get_type_id(
-		event_header_field_type) == BT_CTF_TYPE_ID_INTEGER,
+		event_header_field_type) == BT_CTF_FIELD_TYPE_ID_INTEGER,
 		"Default event header \"id\" field is an integer");
 	bt_put(event_header_field_type);
 	event_header_field_type =
@@ -3183,7 +3183,7 @@ int main(int argc, char **argv)
 	ok(event_header_field_type,
 		"Default event header type contains a \"timestamp\" field");
 	ok(bt_ctf_field_type_get_type_id(
-		event_header_field_type) == BT_CTF_TYPE_ID_INTEGER,
+		event_header_field_type) == BT_CTF_FIELD_TYPE_ID_INTEGER,
 		"Default event header \"timestamp\" field is an integer");
 	bt_put(event_header_field_type);
 	bt_put(ret_field_type);
@@ -3194,7 +3194,7 @@ int main(int argc, char **argv)
 	packet_header_type = bt_ctf_trace_get_packet_header_type(trace);
 	ok(packet_header_type,
 		"bt_ctf_trace_get_packet_header_type returns a packet header");
-	ok(bt_ctf_field_type_get_type_id(packet_header_type) == BT_CTF_TYPE_ID_STRUCT,
+	ok(bt_ctf_field_type_get_type_id(packet_header_type) == BT_CTF_FIELD_TYPE_ID_STRUCT,
 		"bt_ctf_trace_get_packet_header_type returns a packet header of type struct");
 	ret_field_type = bt_ctf_field_type_structure_get_field_type_by_name(
 		packet_header_type, "magic");
@@ -3226,7 +3226,7 @@ int main(int argc, char **argv)
 	packet_context_type = bt_ctf_stream_class_get_packet_context_type(stream_class);
 	ok(packet_context_type,
 		"bt_ctf_stream_class_get_packet_context_type returns a packet context type.");
-	ok(bt_ctf_field_type_get_type_id(packet_context_type) == BT_CTF_TYPE_ID_STRUCT,
+	ok(bt_ctf_field_type_get_type_id(packet_context_type) == BT_CTF_FIELD_TYPE_ID_STRUCT,
 		"Packet context is a structure");
 
 	ok(bt_ctf_stream_class_set_packet_context_type(NULL, packet_context_type),