From: Jonathan Rajotte Date: Thu, 26 May 2022 14:11:54 +0000 (-0400) Subject: VERSION SPOOFING: tests: spoof the version for the live unit test. X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=commitdiff_plain;h=60a597fe800fefe3ef582c2dc5047b625e0fe481 VERSION SPOOFING: tests: spoof the version for the live unit test. Otherwise since that the default trace format is now CTF2 the attach session fail and lead to an abort since the code expect success only in continuation. Signed-off-by: Jonathan Rajotte Change-Id: I2ccb302300117f5dc900c0072f1a48ba490b1110 --- diff --git a/tests/regression/tools/live/live_test.cpp b/tests/regression/tools/live/live_test.cpp index 559b9a7b1..f6554231c 100644 --- a/tests/regression/tools/live/live_test.cpp +++ b/tests/regression/tools/live/live_test.cpp @@ -158,7 +158,8 @@ int establish_connection(void) memset(&connect, 0, sizeof(connect)); connect.major = htobe32(VERSION_MAJOR); - connect.minor = htobe32(VERSION_MINOR); + /* JORAJ: TODO: remove when minor version is updated */ + connect.minor = htobe32(15); connect.type = htobe32(LTTNG_VIEWER_CLIENT_COMMAND); ret_len = lttng_live_send(control_sock, &cmd, sizeof(cmd)); @@ -688,9 +689,9 @@ int main(void) ret = connect_viewer("localhost"); ok(ret == 0, "Connect viewer to relayd"); + /* JORAJ: TODO: Remove when minor version is updated */ ret = establish_connection(); - ok(ret == 0, "Established connection and version check with %d.%d", - VERSION_MAJOR, VERSION_MINOR); + ok(ret == 0, "Established connection and version check with %d.%d", VERSION_MAJOR, 15); ret = list_sessions(&session_id); ok(ret > 0, "List sessions : %d session(s)", ret);