Merge pull request #1412 from ejoerns/tap

Use meson TAP protocol parser
rauc · May 10, 2024 · 66988cd · 66988cd
2 parents fcfe28d + 7539cf6
commit 66988cd
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 8 deletions.
diff --git a/qemu-test-init b/qemu-test-init
@@ -185,7 +185,7 @@ if [ -n "$SERVICE" ]; then
   rauc status mark-good
 fi
 
-if meson test -C $BUILD_DIR "$MESON_TEST"; then
+if meson test -C $BUILD_DIR "$MESON_TEST" -v; then
   touch qemu-test-ok
   echo "RESULT: PASSED"
 else

diff --git a/test/bundle.c b/test/bundle.c
@@ -29,7 +29,7 @@ static void bundle_fixture_set_up(BundleFixture *fixture,
 {
 	fixture->tmpdir = g_dir_make_tmp("rauc-XXXXXX", NULL);
 	g_assert_nonnull(fixture->tmpdir);
-	g_print("bundle tmpdir: %s\n", fixture->tmpdir);
+	g_test_message("bundle tmpdir: %s\n", fixture->tmpdir);
 }
 
 static void prepare_bundle(BundleFixture *fixture, gconstpointer user_data)

diff --git a/test/dm.c b/test/dm.c
@@ -30,7 +30,7 @@ static void dm_fixture_set_up(DMFixture *fixture,
 {
 	fixture->tmpdir = g_dir_make_tmp("rauc-XXXXXX", NULL);
 	g_assert_nonnull(fixture->tmpdir);
-	g_print("dm tmpdir: %s\n", fixture->tmpdir);
+	g_test_message("dm tmpdir: %s\n", fixture->tmpdir);
 }
 
 static void dm_fixture_tear_down(DMFixture *fixture,

diff --git a/test/hash_index.c b/test/hash_index.c
@@ -20,7 +20,7 @@ static void fixture_set_up(Fixture *fixture,
 {
 	fixture->tmpdir = g_dir_make_tmp("rauc-XXXXXX", NULL);
 	g_assert_nonnull(fixture->tmpdir);
-	g_print("hash_index tmpdir: %s\n", fixture->tmpdir);
+	g_test_message("hash_index tmpdir: %s\n", fixture->tmpdir);
 }
 
 static void fixture_tear_down(Fixture *fixture,

diff --git a/test/install.c b/test/install.c
@@ -258,7 +258,7 @@ device=/path/to/prebootloader";
 
 	fixture->tmpdir = g_dir_make_tmp("rauc-XXXXXX", NULL);
 	g_assert_nonnull(fixture->tmpdir);
-	g_print("system conf tmpdir: %s\n", fixture->tmpdir);
+	g_test_message("system conf tmpdir: %s\n", fixture->tmpdir);
 
 	pathname = write_tmp_file(fixture->tmpdir, "system.conf", cfg_file, NULL);
 	g_assert_nonnull(pathname);

diff --git a/test/install_fixtures.c b/test/install_fixtures.c
@@ -15,7 +15,7 @@ void fixture_helper_fixture_set_up_system_user(gchar *tmpdir,
 	g_autofree gchar *capath = NULL;
 
 	g_assert_nonnull(tmpdir);
-	g_print("bundle tmpdir: %s\n", tmpdir);
+	g_test_message("bundle tmpdir: %s", tmpdir);
 
 	g_assert(test_mkdir_relative(tmpdir, "bin", 0777) == 0);
 	g_assert(test_mkdir_relative(tmpdir, "content", 0777) == 0);

diff --git a/test/meson.build b/test/meson.build
@@ -56,6 +56,7 @@ foreach test_name : tests
     exe,
     is_parallel : false,
     timeout : 240,
+    protocol: 'tap',
     workdir : meson.source_root())
 endforeach
 

diff --git a/test/nbd.c b/test/nbd.c
@@ -42,7 +42,7 @@ static void nbd_fixture_set_up(NBDFixture *fixture, gconstpointer user_data)
 {
 	fixture->tmpdir = g_dir_make_tmp("rauc-XXXXXX", NULL);
 	g_assert_nonnull(fixture->tmpdir);
-	g_print("tmpdir: %s\n", fixture->tmpdir);
+	g_test_message("tmpdir: %s\n", fixture->tmpdir);
 }
 
 static void nbd_fixture_tear_down(NBDFixture *fixture, gconstpointer user_data)

diff --git a/test/network.c b/test/network.c
@@ -16,7 +16,7 @@ static void network_fixture_set_up(NetworkFixture *fixture,
 {
 	fixture->tmpdir = g_dir_make_tmp("rauc-XXXXXX", NULL);
 	g_assert_nonnull(fixture->tmpdir);
-	g_print("network tmpdir: %s\n", fixture->tmpdir);
+	g_test_message("network tmpdir: %s\n", fixture->tmpdir);
 }
 
 static void network_fixture_tear_down(NetworkFixture *fixture,