Merge "jiri-test: add mojo discovery test"
diff --git a/data/config.v1.xml b/data/config.v1.xml
index df7939d..50ace3b 100644
--- a/data/config.v1.xml
+++ b/data/config.v1.xml
@@ -232,6 +232,7 @@
<test>vanadium-js-vom</test>
</group>
<group name="mojo">
+ <test>vanadium-mojo-discovery-test</test>
<test>vanadium-mojo-syncbase-test</test>
<test>vanadium-mojo-v23proxy-unit-test</test>
<!-- NOTE(caprita): this is flaky. See v.io/i/1226
diff --git a/jiri-test/internal/test/mojo.go b/jiri-test/internal/test/mojo.go
index 28c60b2..dc8db62 100644
--- a/jiri-test/internal/test/mojo.go
+++ b/jiri-test/internal/test/mojo.go
@@ -16,8 +16,17 @@
defaultMojoTestTimeout = 10 * time.Minute
)
-// vanadiumMojoSyncbaseTest runs the tests for the Vanadium Mojo Syncbase
-// service.
+// vanadiumMojoDiscoveryTest runs the tests for the Vanadium Mojo Discovery service.
+func vanadiumMojoDiscoveryTest(jirix *jiri.X, testName string, _ ...Opt) (*test.Result, error) {
+ testDir := filepath.Join(jirix.Root, "release", "mojo", "discovery")
+ if r, err := runMakefileTest(jirix, testName, testDir, "test", nil, []string{"v23:mojo", "v23:dart"}, defaultMojoTestTimeout); err != nil {
+ return r, err
+ }
+ // For android, just make sure that everything builds.
+ return runMakefileTest(jirix, testName, testDir, "build", map[string]string{"ANDROID": "1"}, []string{"v23:mojo", "v23:android"}, defaultMojoTestTimeout)
+}
+
+// vanadiumMojoSyncbaseTest runs the tests for the Vanadium Mojo Syncbase service.
func vanadiumMojoSyncbaseTest(jirix *jiri.X, testName string, _ ...Opt) (*test.Result, error) {
testDir := filepath.Join(jirix.Root, "release", "mojo", "syncbase")
return runMakefileTest(jirix, testName, testDir, "test", nil, []string{"v23:dart", "v23:mojo"}, defaultMojoTestTimeout)
diff --git a/jiri-test/internal/test/run.go b/jiri-test/internal/test/run.go
index b670b69..d855c88 100644
--- a/jiri-test/internal/test/run.go
+++ b/jiri-test/internal/test/run.go
@@ -119,6 +119,7 @@
"vanadium-js-vdl": vanadiumJSVdl,
"vanadium-js-vdl-audit": vanadiumJSVdlAudit,
"vanadium-js-vom": vanadiumJSVom,
+ "vanadium-mojo-discovery-test": vanadiumMojoDiscoveryTest,
"vanadium-mojo-syncbase-test": vanadiumMojoSyncbaseTest,
"vanadium-mojo-v23proxy-unit-test": vanadiumMojoV23ProxyUnitTest,
"vanadium-mojo-v23proxy-integration-test": vanadiumMojoV23ProxyIntegrationTest,
