From f507cbcc18215cfa049e62647538eb382256c2a5 Mon Sep 17 00:00:00 2001 From: Aaron Ayres Date: Mon, 1 Mar 2021 14:40:39 -0600 Subject: [PATCH 1/3] remove presumably old standalone_mode --- ci/edmtool.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/edmtool.py b/ci/edmtool.py index cea1c0c72..2dd78131f 100644 --- a/ci/edmtool.py +++ b/ci/edmtool.py @@ -386,10 +386,10 @@ def test_clean(runtime, toolkit): '--runtime={}'.format(runtime), ] try: - install(args=args, standalone_mode=False) - test(args=args, standalone_mode=False) + install(args=args) + test(args=args) finally: - cleanup(args=args, standalone_mode=False) + cleanup(args=args) @cli.command() @@ -417,7 +417,7 @@ def test_all(): for toolkit in toolkits: args = ['--toolkit={}'.format(toolkit), '--runtime={}'.format(runtime)] - test_clean(args, standalone_mode=True) + test_clean(args) # ---------------------------------------------------------------------------- From a0a9357d5fdf3304f346d7a42d931f14cfe1cb8d Mon Sep 17 00:00:00 2001 From: Aaron Ayres Date: Mon, 1 Mar 2021 14:57:34 -0600 Subject: [PATCH 2/3] Revert "remove presumably old standalone_mode" This reverts commit f507cbcc18215cfa049e62647538eb382256c2a5. --- ci/edmtool.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/edmtool.py b/ci/edmtool.py index 2dd78131f..cea1c0c72 100644 --- a/ci/edmtool.py +++ b/ci/edmtool.py @@ -386,10 +386,10 @@ def test_clean(runtime, toolkit): '--runtime={}'.format(runtime), ] try: - install(args=args) - test(args=args) + install(args=args, standalone_mode=False) + test(args=args, standalone_mode=False) finally: - cleanup(args=args) + cleanup(args=args, standalone_mode=False) @cli.command() @@ -417,7 +417,7 @@ def test_all(): for toolkit in toolkits: args = ['--toolkit={}'.format(toolkit), '--runtime={}'.format(runtime)] - test_clean(args) + test_clean(args, standalone_mode=True) # ---------------------------------------------------------------------------- From 5c726eba295873430bb9fb3a7ddcde67c01f9044 Mon Sep 17 00:00:00 2001 From: Aaron Ayres Date: Mon, 1 Mar 2021 15:04:32 -0600 Subject: [PATCH 3/3] fix test-all command --- ci/edmtool.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ci/edmtool.py b/ci/edmtool.py index cea1c0c72..9f3afc5ec 100644 --- a/ci/edmtool.py +++ b/ci/edmtool.py @@ -413,11 +413,17 @@ def test_all(): """ Run test_clean across all supported environment combinations. """ + failed_command = False for runtime, toolkits in supported_combinations.items(): for toolkit in toolkits: args = ['--toolkit={}'.format(toolkit), '--runtime={}'.format(runtime)] - test_clean(args, standalone_mode=True) + try: + test_clean(args, standalone_mode=True) + except SystemExit: + failed_command = True + if failed_command: + sys.exit(1) # ----------------------------------------------------------------------------