Fix: unchecked return value in ctf-writer test

[babeltrace.git] / tests / lib / test_ctf_writer.c

diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c
index 060b68ab61f0ef740a9022ed8c80b88ecfa69f81..fd73d99779a1f4dc28db8d1c1625fce70b247cb5 100644 (file)
--- a/tests/lib/test_ctf_writer.c
+++ b/tests/lib/test_ctf_writer.c
@@ -50,7 +50,7 @@
 #define METADATA_LINE_SIZE 512
 #define SEQUENCE_TEST_LENGTH 10
 #define ARRAY_TEST_LENGTH 5
-#define PACKET_RESIZE_TEST_LENGTH 5
+#define PACKET_RESIZE_TEST_DEF_LENGTH 100000
 
 #define DEFAULT_CLOCK_FREQ 1000000000
 #define DEFAULT_CLOCK_PRECISION 1
@@ -60,9 +60,10 @@
 #define DEFAULT_CLOCK_TIME 0
 #define DEFAULT_CLOCK_VALUE 0
 
-#define NR_TESTS 621
+#define NR_TESTS 622
 
 static int64_t current_time = 42;
+static unsigned int packet_resize_test_length = PACKET_RESIZE_TEST_DEF_LENGTH;
 
 /* Return 1 if uuids match, zero if different. */
 static
@@ -125,7 +126,7 @@ void validate_trace(char *parser_path, char *trace_path)
                        goto result;
                }
 
-               execl(parser_path, "babeltrace", trace_path, NULL);
+               execl(parser_path, parser_path, trace_path, NULL);
                perror("# Could not launch the babeltrace process");
                exit(-1);
        }
@@ -319,8 +320,8 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class,
        ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned,
                "event clock int float", 5, 22) == 0,
                "bt_ctf_field_type_enumeration_add_mapping_unsigned accepts enumeration mapping strings containing reserved keywords");
-       bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, mapping_name_test,
-               42, 42);
+       ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, mapping_name_test,
+               42, 42) == 0, "bt_ctf_field_type_enumeration_add_mapping_unsigned accepts single-value ranges");
        ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, mapping_name_test,
                43, 51) == 0, "bt_ctf_field_type_enumeration_add_mapping_unsigned accepts duplicate mapping names");
        ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, "something",
@@ -1971,7 +1972,7 @@ void packet_resize_test(struct bt_ctf_stream_class *stream_class,
                "bt_ctf_event_get_payload_by_index handles an invalid index correctly");
        bt_put(event);
 
-       for (i = 0; i < PACKET_RESIZE_TEST_LENGTH; i++) {
+       for (i = 0; i < packet_resize_test_length; i++) {
                event = bt_ctf_event_create(event_class);
                struct bt_ctf_field *integer =
                        bt_ctf_field_create(ep_field_1_type);
@@ -2006,7 +2007,7 @@ void packet_resize_test(struct bt_ctf_stream_class *stream_class,
                }
        }
 
-       events_appended = !!(i == PACKET_RESIZE_TEST_LENGTH);
+       events_appended = !!(i == packet_resize_test_length);
        ok(bt_ctf_stream_get_discarded_events_count(NULL, &ret_uint64) < 0,
                "bt_ctf_stream_get_discarded_events_count handles a NULL stream correctly");
        ok(bt_ctf_stream_get_discarded_events_count(stream, NULL) < 0,
@@ -2501,7 +2502,8 @@ void test_create_writer_vs_non_writer_mode(void)
        non_writer_stream = bt_ctf_stream_create(non_writer_sc, NULL);
        assert(non_writer_stream);
        non_writer_clock_class =
-               bt_ctf_clock_class_create("non_writer_clock_class");
+               bt_ctf_clock_class_create("non_writer_clock_class",
+                       1000000000);
        assert(non_writer_clock_class);
        ret = bt_ctf_trace_add_clock_class(non_writer_trace,
                non_writer_clock_class);
@@ -2698,7 +2700,7 @@ void test_static_trace(void)
                "bt_ctf_trace_set_is_static() succeeds");
        ok(bt_ctf_trace_is_static(trace),
                "bt_ctf_trace_is_static() returns the expected value");
-       clock_class = bt_ctf_clock_class_create("yes");
+       clock_class = bt_ctf_clock_class_create("yes", 1000000000);
        assert(clock_class);
        stream_class2 = bt_ctf_stream_class_create(NULL);
        assert(stream_class2);
@@ -2820,6 +2822,7 @@ void test_trace_uuid(void)
 
 int main(int argc, char **argv)
 {
+       const char *env_resize_length;
        char trace_path[] = "/tmp/ctfwriter_XXXXXX";
        char metadata_path[sizeof(trace_path) + 9];
        const char *clock_name = "test_clock";
@@ -2864,6 +2867,12 @@ int main(int argc, char **argv)
                return -1;
        }
 
+       env_resize_length = getenv("PACKET_RESIZE_TEST_LENGTH");
+       if (env_resize_length) {
+               packet_resize_test_length =
+                       (unsigned int) atoi(env_resize_length);
+       }
+
        plan_tests(NR_TESTS);
 
        if (!bt_mkdtemp(trace_path)) {