tests: migrate ivi-shell-app

Moving to the new test harness.

Carrying the test ini file still just to keep it the same even though I
accidentally noticed the test succeeds also with --no-config.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>

tests/ivi-shell-app-test.c

@@ -30,6 +30,21 @@
 
 #include "weston-test-client-helper.h"
 #include "ivi-application-client-protocol.h"
+#include "weston-test-fixture-compositor.h"
+#include "test-config.h"
+
+static enum test_result_code
+fixture_setup(struct weston_test_harness *harness)
+{
+	struct compositor_setup setup;
+
+	compositor_setup_defaults(&setup);
+	setup.shell = SHELL_IVI;
+	setup.config_file = TESTSUITE_IVI_CONFIG_PATH;
+
+	return weston_test_harness_execute_as_client(harness, &setup);
+}
+DECLARE_FIXTURE_SETUP(fixture_setup);
 
 static struct ivi_application *
 get_ivi_application(struct client *client)

tests/meson.build

@@ -209,16 +209,6 @@ tests_weston_plugin = [
 ]
 
 if get_option('shell-ivi')
-	tests_weston += [
-		[
-			'ivi-shell-app',
-			[
-				ivi_application_client_protocol_h,
-				ivi_application_protocol_c,
-			]
-		]
-	]
-
 	ivi_layout_test_plugin = shared_library(
 		'test-ivi-layout',
 		[
@@ -244,6 +234,14 @@ if get_option('shell-ivi')
 			'test_deps': [ ivi_layout_test_plugin ],
 		},
 		{	'name': 'ivi-layout-internal', },
+		{
+			'name': 'ivi-shell-app',
+			'sources': [
+				'ivi-shell-app-test.c',
+				ivi_application_client_protocol_h,
+				ivi_application_protocol_c,
+			],
+		},
 	]
 endif
 
@@ -258,6 +256,7 @@ test_config_h.set_quoted('WESTON_TEST_REFERENCE_PATH', meson.current_source_dir(
 test_config_h.set_quoted('WESTON_MODULE_MAP', env_modmap)
 test_config_h.set_quoted('WESTON_DATA_DIR', join_paths(meson.current_source_dir(), '..', 'data'))
 test_config_h.set_quoted('TESTSUITE_PLUGIN_PATH', exe_plugin_test.full_path())
+test_config_h.set_quoted('TESTSUITE_IVI_CONFIG_PATH', join_paths(meson.current_build_dir(), '../ivi-shell/weston-ivi-test.ini'))
 configure_file(output: 'test-config.h', configuration: test_config_h)
 
 foreach t : tests