end-to-end tests: use ["test", "matrix"]

... instead of manually configuring and staging the various test branches.

2 files changed, 35 insertions, 65 deletions

diff --git a/test/end-to-end/TARGETS b/test/end-to-end/TARGETS
index 9247d145..bf5d6f64 100644
--- a/test/end-to-end/TARGETS
+++ b/test/end-to-end/TARGETS
@@ -15,22 +15,14 @@
   , "files": {"bin/lock-tool-under-test": ["@", "src", "", "bin/just-lock.py"]}
   }
 , "remote tests (unconfigured)":
-  { "type": ["@", "rules", "test", "suite"]
+  { "type": ["@", "rules", "test", "matrix"]
   , "arguments_config": ["TEST_COMPATIBLE_REMOTE", "TEST_BOOTSTRAP_JUST_MR"]
-  , "stage":
-    [ { "type": "if"
-      , "cond": {"type": "var", "name": "TEST_COMPATIBLE_REMOTE"}
-      , "then": "compatible"
-      , "else": "native"
-      }
-    ]
   , "deps":
     { "type": "++"
     , "$1":
       [ [["./", "remote-execution", "TESTS"], ["./", "just-mr", "TESTS"]]
       , { "type": "if"
         , "cond": {"type": "var", "name": "TEST_BOOTSTRAP_JUST_MR"}
-        , "then": []
         , "else":
           [ ["./", "serve-service", "TESTS"]
           , ["./", "computed-roots", "TESTS"]
@@ -41,35 +33,23 @@
       ]
     }
   }
-, "remote tests, compatible":
-  { "type": "configure"
-  , "tainted": ["test"]
-  , "target": "remote tests (unconfigured)"
-  , "config":
-    {"type": "singleton_map", "key": "TEST_COMPATIBLE_REMOTE", "value": true}
-  }
-, "remote tests, native":
+, "remote tests":
   { "type": "configure"
   , "tainted": ["test"]
   , "target": "remote tests (unconfigured)"
   , "config":
-    {"type": "singleton_map", "key": "TEST_COMPATIBLE_REMOTE", "value": false}
-  }
-, "remote tests":
-  { "type": ["@", "rules", "test", "suite"]
-  , "stage": ["using-remote"]
-  , "deps": ["remote tests, compatible", "remote tests, native"]
+    { "type": "'"
+    , "$1":
+      { "TEST_MATRIX":
+        { "TEST_COMAPTIBLE_REMOTE":
+          {"remote-compat": true, "remote-native": "false"}
+        }
+      }
+    }
   }
 , "just-mr tests (unconfigured)":
   { "type": ["@", "rules", "test", "suite"]
   , "arguments_config": ["TEST_BOOTSTRAP_JUST_MR"]
-  , "stage":
-    [ { "type": "if"
-      , "cond": {"type": "var", "name": "TEST_BOOTSTRAP_JUST_MR"}
-      , "then": "bootstrap-script"
-      , "else": "native"
-      }
-    ]
   , "deps":
     { "type": "`"
     , "$1":
@@ -90,22 +70,23 @@
       ]
     }
   }
-, "just-mr tests, bootstrap-script":
-  { "type": "configure"
-  , "tainted": ["test"]
-  , "target": "just-mr tests (unconfigured)"
-  , "config": {"type": "'", "$1": {"TEST_BOOTSTRAP_JUST_MR": true}}
+, "just-mr tests (matrix)":
+  { "type": ["@", "rules", "test", "matrix"]
+  , "deps": ["just-mr tests (unconfigured)"]
   }
-, "just-mr tests, native":
+, "just-mr tests":
   { "type": "configure"
   , "tainted": ["test"]
-  , "target": "just-mr tests (unconfigured)"
-  , "config": {"type": "'", "$1": {"TEST_BOOTSTRAP_JUST_MR": false}}
-  }
-, "just-mr tests":
-  { "type": ["@", "rules", "test", "suite"]
-  , "stage": ["with-just-mr"]
-  , "deps": ["just-mr tests, bootstrap-script", "just-mr tests, native"]
+  , "target": "just-mr tests (matrix)"
+  , "config":
+    { "type": "'"
+    , "$1":
+      { "TEST_MATRIX":
+        { "TEST_BOOTSTRAP_JUST_MR":
+          {"just-mr-bootstrap": true, "just-mr-native": false}
+        }
+      }
+    }
   }
 , "TESTS":
   { "type": ["@", "rules", "test", "suite"]
diff --git a/test/end-to-end/serve-service/TARGETS b/test/end-to-end/serve-service/TARGETS
index f91cbd8e..8a98ebd1 100644
--- a/test/end-to-end/serve-service/TARGETS
+++ b/test/end-to-end/serve-service/TARGETS
@@ -172,15 +172,9 @@
   , "repos": ["serve-many-targets (data)"]
   }
 , "TESTS (unconfigured)":
-  { "type": ["@", "rules", "test", "suite"]
+  { "type": ["@", "rules", "test", "matrix"]
   , "arguments_config": ["TEST_STANDALONE_SERVE"]
-  , "stage":
-    [ { "type": "if"
-      , "cond": {"type": "var", "name": "TEST_STANDALONE_SERVE"}
-      , "then": "standalone-serve"
-      , "else": "separate-remote"
-      }
-    ]
+  , "stage": ["serve-service"]
   , "deps":
     { "type": "++"
     , "$1":
@@ -207,23 +201,18 @@
       ]
     }
   }
-, "TESTS (separate remote)":
-  { "type": "configure"
-  , "tainted": ["test"]
-  , "target": "TESTS (unconfigured)"
-  , "config":
-    {"type": "singleton_map", "key": "TEST_STANDALONE_SERVE", "value": false}
-  }
-, "TESTS (standalone serve)":
+, "TESTS":
   { "type": "configure"
   , "tainted": ["test"]
   , "target": "TESTS (unconfigured)"
   , "config":
-    {"type": "singleton_map", "key": "TEST_STANDALONE_SERVE", "value": true}
-  }
-, "TESTS":
-  { "type": ["@", "rules", "test", "suite"]
-  , "stage": ["serve-service"]
-  , "deps": ["TESTS (separate remote)", "TESTS (standalone serve)"]
+    { "type": "'"
+    , "$1":
+      { "TEST_MATRIX":
+        { "TEST_STANDALONE_SERVE":
+          {"standalone-serve": true, "separate-remote": false}
+        }
+      }
+    }
   }
 }