From d7c71028c05c627caa6eeeb4f16f1440d7d4d6d2 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Sun, 31 Jul 2022 09:40:39 -0700 Subject: [PATCH] Update xversion test script Don't cross-version with the target branch as that is the one we are trying to change. Signed-off-by: Ralph Castain --- crossversion/xversion.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/crossversion/xversion.py b/crossversion/xversion.py index 93bbbbf..bc5d5c9 100755 --- a/crossversion/xversion.py +++ b/crossversion/xversion.py @@ -15,7 +15,7 @@ import shutil # put this in one place -supported_versions = ["master", "v4.1", "v3.1", "v3.2"] +supported_versions = ["master", "v4.2", "v4.1", "v3.1", "v3.2"] pmix_git_url = "https://github.com/pmix/pmix.git" pmix_release_url = "https://github.com/pmix/pmix/releases/download/" @@ -454,6 +454,21 @@ def run_test(bld_server, bld_client, test_client=False, test_tool=False, test_ch invalid_tool_pairs.append([bld.branch,"v3.0"]) invalid_tool_pairs.append([bld.branch,"v2.2"]) invalid_tool_pairs.append([bld.branch,"v2.0"]) + elif target_branch == "master": + invalid_pairs.append([bld.branch,"master"]) + invalid_tool_pairs.append([bld.branch,"master"]) + invalid_pairs.append(["master", bld.branch]) + invalid_tool_pairs.append(["master", bld.branch]) + elif target_branch == "v4.2": + invalid_pairs.append([bld.branch,"v4.2"]) + invalid_tool_pairs.append([bld.branch,"v4.2"]) + invalid_pairs.append(["v4.2", bld.branch]) + invalid_tool_pairs.append(["v4.2", bld.branch]) + elif target_branch == "v4.1: + invalid_pairs.append([bld.branch,"v4.1"]) + invalid_tool_pairs.append([bld.branch,"v4.1"]) + invalid_pairs.append(["v4.1", bld.branch]) + invalid_tool_pairs.append(["v4.1", bld.branch]) else: invalid_pairs.append(["v2.0",bld.branch]) invalid_tool_pairs.append(["v2.0",bld.branch])