From d70baedf8714ec03b3e9366f695fa7cf3b4f95a0 Mon Sep 17 00:00:00 2001 From: Sophie Winter Date: Sun, 1 Sep 2024 14:23:27 -0700 Subject: [PATCH] Make tests compatible with new libwayland format --- test/integration-tests/test-set-monitor.c | 2 +- test/run-integration-test.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration-tests/test-set-monitor.c b/test/integration-tests/test-set-monitor.c index 029d526..6b3cb43 100644 --- a/test/integration-tests/test-set-monitor.c +++ b/test/integration-tests/test-set-monitor.c @@ -15,7 +15,7 @@ static GtkWindow* window; static void callback_0() { - EXPECT_MESSAGE(zwlr_layer_shell_v1 .get_layer_surface wl_output@); + EXPECT_MESSAGE(zwlr_layer_shell_v1 .get_layer_surface wl_output); window = create_default_window(); gtk_layer_init_for_window(window); ASSERT_EQ(gdk_display_get_n_monitors(gdk_display_get_default()), 1, "%d"); diff --git a/test/run-integration-test.py b/test/run-integration-test.py index a43ae0b..98cd757 100755 --- a/test/run-integration-test.py +++ b/test/run-integration-test.py @@ -218,7 +218,7 @@ def verify_result(lines: List[str]): for i, line in enumerate(lines): if line.startswith('EXPECT: '): assertions.append(line.split()[1:]) - elif line.startswith('[') and line.endswith(')') and '@' in line: + elif line.startswith('[') and line.endswith(')') and ('@' in line or '#' in line): if assertions and line_contains(line, assertions[0]): assertions = assertions[1:] elif line == 'CHECK EXPECTATIONS COMPLETED' or i == len(lines) - 1: