merge with development

Signed-off-by: evanchia <evanchia@amazon.com>
2021-10-21 14:56:16 -07:00
parent 6168528964 6c1b2fa84c
commit 670e9a1fa1
1026 changed files with 27037 additions and 655292 deletions
@@ -46,10 +46,11 @@ class TestEditorTest:
    @classmethod
    def setup_class(cls):
        TestEditorTest.args = sys.argv.copy()
-        build_dir_arg_index = TestEditorTest.args.index("--build-directory")
-        if build_dir_arg_index < 0:
-            print("Error: Must pass --build-directory argument in order to run this test")
-            sys.exit(-2)
+        build_dir_arg_index = -1
+        try:
+            build_dir_arg_index = TestEditorTest.args.index("--build-directory")
+        except ValueError as ex:
+            raise ValueError("Must pass --build-directory argument in order to run this test")

        TestEditorTest.args[build_dir_arg_index+1] = os.path.abspath(TestEditorTest.args[build_dir_arg_index+1])
        TestEditorTest.args.append("-s")