[modular] Migrate /tests to new build rules
TEST: fx test moodular_integration_tests
Change-Id: Ib5aea782ea66cfeb8e29f163d9ce622f2498a3ab
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/476058
Commit-Queue: Vickie Cheng <vickiecheng@google.com>
Reviewed-by: Yegor Pomortsev <ypomortsev@google.com>
Reviewed-by: Shai Barack <shayba@google.com>
diff --git a/build/BUILD.gn b/build/BUILD.gn
index 3a4d3ab..20b995c 100644
--- a/build/BUILD.gn
+++ b/build/BUILD.gn
@@ -503,7 +503,6 @@
"//src/modular/bin/sessionmgr/storage/*",
"//src/modular/bin/sessionmgr/story_runner/*",
"//src/modular/lib/modular_test_harness/cpp/*",
- "//src/modular/tests/*",
"//src/power/battery-manager/*",
"//src/power/battery-manager/battery-cli/*",
"//src/power/battery-manager/tests/*",
diff --git a/src/modular/tests/BUILD.gn b/src/modular/tests/BUILD.gn
index 31f4f70..6ab3fe9 100644
--- a/src/modular/tests/BUILD.gn
+++ b/src/modular/tests/BUILD.gn
@@ -3,7 +3,7 @@
# found in the LICENSE file.
import("//build/fidl/fidl.gni")
-import("//build/test/test_package.gni")
+import("//src/sys/build/components.gni")
group("tests") {
testonly = true
@@ -46,6 +46,11 @@
]
}
+fuchsia_unittest_component("agent-services-test") {
+ manifest = "meta/agent_services_test.cmx"
+ deps = [ ":agent_services_test" ]
+}
+
executable("agent_session_restart_test") {
testonly = true
@@ -63,6 +68,11 @@
]
}
+fuchsia_unittest_component("agent-session-restart-test") {
+ manifest = "meta/agent_session_restart_test.cmx"
+ deps = [ ":agent_session_restart_test" ]
+}
+
executable("sessionctl_test") {
testonly = true
output_name = "sessionctl_test"
@@ -78,6 +88,11 @@
]
}
+fuchsia_unittest_component("sessionctl-test") {
+ manifest = "meta/sessionctl_test.cmx"
+ deps = [ ":sessionctl_test" ]
+}
+
executable("session_shell_test") {
testonly = true
@@ -95,6 +110,11 @@
]
}
+fuchsia_unittest_component("session-shell-test") {
+ manifest = "meta/session_shell_test.cmx"
+ deps = [ ":session_shell_test" ]
+}
+
executable("basemgr_test") {
testonly = true
@@ -112,6 +132,11 @@
]
}
+fuchsia_unittest_component("basemgr-test") {
+ manifest = "meta/basemgr_test.cmx"
+ deps = [ ":basemgr_test" ]
+}
+
executable("inspect_session_test") {
testonly = true
@@ -132,6 +157,11 @@
]
}
+fuchsia_unittest_component("inspect-session-test") {
+ manifest = "meta/inspect_session_test.cmx"
+ deps = [ ":inspect_session_test" ]
+}
+
executable("intents_test") {
testonly = true
@@ -147,6 +177,11 @@
]
}
+fuchsia_unittest_component("intents-test") {
+ manifest = "meta/intents_test.cmx"
+ deps = [ ":intents_test" ]
+}
+
executable("module_context_test") {
testonly = true
@@ -165,6 +200,11 @@
]
}
+fuchsia_unittest_component("module-context-test") {
+ manifest = "meta/module_context_test.cmx"
+ deps = [ ":module_context_test" ]
+}
+
executable("sessionmgr_integration_test") {
testonly = true
@@ -188,6 +228,11 @@
]
}
+fuchsia_unittest_component("sessionmgr-integration-test") {
+ manifest = "meta/sessionmgr_integration_test.cmx"
+ deps = [ ":sessionmgr_integration_test" ]
+}
+
executable("story_shell_factory_test") {
testonly = true
@@ -205,6 +250,11 @@
]
}
+fuchsia_unittest_component("story-shell-factory-test") {
+ manifest = "meta/story_shell_factory_test.cmx"
+ deps = [ ":story_shell_factory_test" ]
+}
+
executable("story_shell_test") {
testonly = true
@@ -224,6 +274,11 @@
]
}
+fuchsia_unittest_component("story-shell-test") {
+ manifest = "meta/story_shell_test.cmx"
+ deps = [ ":story_shell_test" ]
+}
+
executable("component_context_test") {
testonly = true
@@ -238,6 +293,11 @@
]
}
+fuchsia_unittest_component("component-context-test") {
+ manifest = "meta/component_context_test.cmx"
+ deps = [ ":component_context_test" ]
+}
+
executable("element_manager_test") {
testonly = true
@@ -257,6 +317,11 @@
]
}
+fuchsia_unittest_component("element-manager-test") {
+ manifest = "meta/element_manager_test.cmx"
+ deps = [ ":element_manager_test" ]
+}
+
executable("stories_share_session_runners_test") {
testonly = true
@@ -276,6 +341,11 @@
configs += [ "//build/config:Wno-reorder-init-list" ]
}
+fuchsia_unittest_component("stories-share-session-runners-test") {
+ manifest = "meta/stories_share_session_runners_test.cmx"
+ deps = [ ":stories_share_session_runners_test" ]
+}
+
executable("module_with_fake_runner_bin") {
testonly = true
@@ -293,99 +363,27 @@
]
}
-package("module_with_fake_runner") {
+fuchsia_package_with_single_component("module_with_fake_runner") {
testonly = true
-
+ manifest = "meta/module_with_fake_runner.cmx"
deps = [ ":module_with_fake_runner_bin" ]
-
- binaries = [
- {
- name = "module_with_fake_runner"
- },
- ]
-
- meta = [
- {
- path = "meta/module_with_fake_runner.cmx"
- dest = "module_with_fake_runner.cmx"
- },
- ]
}
-test_package("modular_integration_tests") {
- tests = [
- {
- name = "agent_session_restart_test"
- environments = basic_envs
- },
- {
- name = "agent_services_test"
- environments = basic_envs
- },
- {
- name = "sessionmgr_integration_test"
- environments = basic_envs
- },
- {
- name = "session_shell_test"
- environments = basic_envs
- },
- {
- name = "basemgr_test"
- environments = basic_envs
- },
- {
- name = "intents_test"
- environments = basic_envs
- },
- {
- name = "inspect_session_test"
- environments = basic_envs
- },
- {
- name = "module_context_test"
- environments = basic_envs
- },
- {
- name = "story_shell_factory_test"
- environments = basic_envs
- },
- {
- name = "story_shell_test"
- environments = basic_envs
- },
- {
- name = "sessionctl_test"
- environments = basic_envs
- },
- {
- name = "component_context_test"
- environments = basic_envs
- },
- {
- name = "stories_share_session_runners_test"
- environments = basic_envs
- },
- {
- name = "element_manager_test"
- environments = basic_envs
- },
- ]
-
- deps = [
- ":agent_services_test",
- ":agent_session_restart_test",
- ":basemgr_test",
- ":component_context_test",
- ":element_manager_test",
- ":inspect_session_test",
- ":intents_test",
- ":module_context_test",
- ":session_shell_test",
- ":sessionctl_test",
- ":sessionmgr_integration_test",
- ":stories_share_session_runners_test",
- ":story_shell_factory_test",
- ":story_shell_test",
+fuchsia_test_package("modular_integration_tests") {
+ test_components = [
+ ":agent-services-test",
+ ":agent-session-restart-test",
+ ":basemgr-test",
+ ":component-context-test",
+ ":element-manager-test",
+ ":inspect-session-test",
+ ":intents-test",
+ ":module-context-test",
+ ":session-shell-test",
+ ":sessionctl-test",
+ ":sessionmgr-integration-test",
+ ":stories-share-session-runners-test",
+ ":story-shell-factory-test",
+ ":story-shell-test",
]
}
diff --git a/src/modular/tests/meta/agent_services_test.cmx b/src/modular/tests/meta/agent_services_test.cmx
index 7d033e6..4388eb3 100644
--- a/src/modular/tests/meta/agent_services_test.cmx
+++ b/src/modular/tests/meta/agent_services_test.cmx
@@ -3,7 +3,7 @@
"sdk/lib/diagnostics/syslog/client.shard.cmx"
],
"program": {
- "binary": "test/agent_services_test"
+ "binary": "bin/agent_services_test"
},
"sandbox": {
"services": [
diff --git a/src/modular/tests/meta/agent_session_restart_test.cmx b/src/modular/tests/meta/agent_session_restart_test.cmx
index a3f4769..52b65d4 100644
--- a/src/modular/tests/meta/agent_session_restart_test.cmx
+++ b/src/modular/tests/meta/agent_session_restart_test.cmx
@@ -3,7 +3,7 @@
"sdk/lib/diagnostics/syslog/client.shard.cmx"
],
"program": {
- "binary": "test/agent_session_restart_test"
+ "binary": "bin/agent_session_restart_test"
},
"sandbox": {
"services": [
diff --git a/src/modular/tests/meta/basemgr_test.cmx b/src/modular/tests/meta/basemgr_test.cmx
index f09183ce..adaf08e 100644
--- a/src/modular/tests/meta/basemgr_test.cmx
+++ b/src/modular/tests/meta/basemgr_test.cmx
@@ -3,7 +3,7 @@
"sdk/lib/diagnostics/syslog/client.shard.cmx"
],
"program": {
- "binary": "test/basemgr_test"
+ "binary": "bin/basemgr_test"
},
"sandbox": {
"services": [
diff --git a/src/modular/tests/meta/component_context_test.cmx b/src/modular/tests/meta/component_context_test.cmx
index 8accfc8..f16fa9d 100644
--- a/src/modular/tests/meta/component_context_test.cmx
+++ b/src/modular/tests/meta/component_context_test.cmx
@@ -3,7 +3,7 @@
"sdk/lib/diagnostics/syslog/client.shard.cmx"
],
"program": {
- "binary": "test/component_context_test"
+ "binary": "bin/component_context_test"
},
"sandbox": {
"services": [
diff --git a/src/modular/tests/meta/element_manager_test.cmx b/src/modular/tests/meta/element_manager_test.cmx
index 18d1aca..28dc257 100644
--- a/src/modular/tests/meta/element_manager_test.cmx
+++ b/src/modular/tests/meta/element_manager_test.cmx
@@ -3,7 +3,7 @@
"sdk/lib/diagnostics/syslog/client.shard.cmx"
],
"program": {
- "binary": "test/element_manager_test"
+ "binary": "bin/element_manager_test"
},
"sandbox": {
"services": [
diff --git a/src/modular/tests/meta/inspect_session_test.cmx b/src/modular/tests/meta/inspect_session_test.cmx
index f555f25..5fd72cd 100644
--- a/src/modular/tests/meta/inspect_session_test.cmx
+++ b/src/modular/tests/meta/inspect_session_test.cmx
@@ -10,7 +10,7 @@
"sdk/lib/diagnostics/syslog/client.shard.cmx"
],
"program": {
- "binary": "test/inspect_session_test"
+ "binary": "bin/inspect_session_test"
},
"sandbox": {
"services": [
diff --git a/src/modular/tests/meta/intents_test.cmx b/src/modular/tests/meta/intents_test.cmx
index 30d9121..b2ccc1c 100644
--- a/src/modular/tests/meta/intents_test.cmx
+++ b/src/modular/tests/meta/intents_test.cmx
@@ -3,7 +3,7 @@
"sdk/lib/diagnostics/syslog/client.shard.cmx"
],
"program": {
- "binary": "test/intents_test"
+ "binary": "bin/intents_test"
},
"sandbox": {
"services": [
diff --git a/src/modular/tests/meta/login_override_test.cmx b/src/modular/tests/meta/login_override_test.cmx
index e641385..d4bec3d 100644
--- a/src/modular/tests/meta/login_override_test.cmx
+++ b/src/modular/tests/meta/login_override_test.cmx
@@ -1,6 +1,6 @@
{
"program": {
- "binary": "test/login_override_test"
+ "binary": "bin/login_override_test"
},
"sandbox": {
"services": [
diff --git a/src/modular/tests/meta/module_context_test.cmx b/src/modular/tests/meta/module_context_test.cmx
index c9831db9..093cc72 100644
--- a/src/modular/tests/meta/module_context_test.cmx
+++ b/src/modular/tests/meta/module_context_test.cmx
@@ -3,7 +3,7 @@
"sdk/lib/diagnostics/syslog/client.shard.cmx"
],
"program": {
- "binary": "test/module_context_test"
+ "binary": "bin/module_context_test"
},
"sandbox": {
"services": [
diff --git a/src/modular/tests/meta/session_shell_test.cmx b/src/modular/tests/meta/session_shell_test.cmx
index 2f8dd6f..49b9012 100644
--- a/src/modular/tests/meta/session_shell_test.cmx
+++ b/src/modular/tests/meta/session_shell_test.cmx
@@ -3,7 +3,7 @@
"sdk/lib/diagnostics/syslog/client.shard.cmx"
],
"program": {
- "binary": "test/session_shell_test"
+ "binary": "bin/session_shell_test"
},
"sandbox": {
"services": [
diff --git a/src/modular/tests/meta/sessionctl_test.cmx b/src/modular/tests/meta/sessionctl_test.cmx
index 87c9963..8209dc4 100644
--- a/src/modular/tests/meta/sessionctl_test.cmx
+++ b/src/modular/tests/meta/sessionctl_test.cmx
@@ -3,7 +3,7 @@
"sdk/lib/diagnostics/syslog/client.shard.cmx"
],
"program": {
- "binary": "test/sessionctl_test"
+ "binary": "bin/sessionctl_test"
},
"sandbox": {
"features": [
diff --git a/src/modular/tests/meta/sessionmgr_integration_test.cmx b/src/modular/tests/meta/sessionmgr_integration_test.cmx
index 2462869..032d5fa 100644
--- a/src/modular/tests/meta/sessionmgr_integration_test.cmx
+++ b/src/modular/tests/meta/sessionmgr_integration_test.cmx
@@ -3,7 +3,7 @@
"sdk/lib/diagnostics/syslog/client.shard.cmx"
],
"program": {
- "binary": "test/sessionmgr_integration_test"
+ "binary": "bin/sessionmgr_integration_test"
},
"sandbox": {
"features": [
diff --git a/src/modular/tests/meta/stories_share_session_runners_test.cmx b/src/modular/tests/meta/stories_share_session_runners_test.cmx
index 55c9e82a..26dff23 100644
--- a/src/modular/tests/meta/stories_share_session_runners_test.cmx
+++ b/src/modular/tests/meta/stories_share_session_runners_test.cmx
@@ -3,7 +3,7 @@
"sdk/lib/diagnostics/syslog/client.shard.cmx"
],
"program": {
- "binary": "test/stories_share_session_runners_test"
+ "binary": "bin/stories_share_session_runners_test"
},
"sandbox": {
"services": [
diff --git a/src/modular/tests/meta/story_shell_embedded_mod_test.cmx b/src/modular/tests/meta/story_shell_embedded_mod_test.cmx
index f2eea85..96ab4ad 100644
--- a/src/modular/tests/meta/story_shell_embedded_mod_test.cmx
+++ b/src/modular/tests/meta/story_shell_embedded_mod_test.cmx
@@ -1,6 +1,6 @@
{
"program": {
- "binary": "test/story_shell_embedded_mod_test"
+ "binary": "bin/story_shell_embedded_mod_test"
},
"sandbox": {
"services": [
diff --git a/src/modular/tests/meta/story_shell_factory_test.cmx b/src/modular/tests/meta/story_shell_factory_test.cmx
index a92ea0c..08051dc 100644
--- a/src/modular/tests/meta/story_shell_factory_test.cmx
+++ b/src/modular/tests/meta/story_shell_factory_test.cmx
@@ -3,7 +3,7 @@
"sdk/lib/diagnostics/syslog/client.shard.cmx"
],
"program": {
- "binary": "test/story_shell_factory_test"
+ "binary": "bin/story_shell_factory_test"
},
"sandbox": {
"services": [
diff --git a/src/modular/tests/meta/story_shell_test.cmx b/src/modular/tests/meta/story_shell_test.cmx
index 73ac87a..8b5a157 100644
--- a/src/modular/tests/meta/story_shell_test.cmx
+++ b/src/modular/tests/meta/story_shell_test.cmx
@@ -3,7 +3,7 @@
"sdk/lib/diagnostics/syslog/client.shard.cmx"
],
"program": {
- "binary": "test/story_shell_test"
+ "binary": "bin/story_shell_test"
},
"sandbox": {
"services": [
