pass all test

Signed-off-by: Ni, Wenhui <[email protected]>

Author: wenhuiNi

behavior_tests/src/bt-autocomplete/do_test.py

@@ -27,7 +27,7 @@ def migrate_test(single_case_text):
     reference = '-gen-build-script\n'
     res = res and (reference == single_case_text.print_text)
 
-    call_subprocess(test_config.CT_TOOL + " --autocomplete=foo")
+    call_subprocess(test_config.CT_TOOL + " --autocomplete=foo", single_case_text)
     reference = '\n'
     res = res and (reference == single_case_text.print_text)
 

behavior_tests/src/bt-cdb-default-out-folder/do_test.py

@@ -19,7 +19,7 @@ def setup_test(single_case_text):
     return True
 
 def migrate_test(single_case_text):
-    call_subprocess("intercept-build /usr/bin/make")
+    call_subprocess("intercept-build /usr/bin/make", single_case_text)
     in_root = ""
     extra_args = ""
     return call_subprocess(test_config.CT_TOOL + " --cuda-include-path=" + test_config.include_path + " " +

behavior_tests/src/bt-format-range/do_test.py

@@ -22,7 +22,7 @@ def migrate_test(single_case_text):
     os.mkdir("out_migrated")
     os.mkdir("out_all")
     os.mkdir("out_none")
-    call_subprocess(test_config.CT_TOOL + " --format-range=migrated --out-root=./out_migrated vector_add.cu --cuda-include-path=" + test_config.include_path)
+    call_subprocess(test_config.CT_TOOL + " --format-range=migrated --out-root=./out_migrated vector_add.cu --cuda-include-path=" + test_config.include_path, single_case_text)
     call_subprocess(test_config.CT_TOOL + " --format-range=all --out-root=./out_all vector_add.cu  --cuda-include-path=" + test_config.include_path, single_case_text)
     call_subprocess(test_config.CT_TOOL + " -format-range=none --out-root=./out_none vector_add.cu --cuda-include-path=" + test_config.include_path, single_case_text)
 

behavior_tests/src/execute_from_cuda_path/do_test.py

@@ -27,7 +27,7 @@ def migrate_test(single_case_text):
     src =os.path.join("include", "vector_types.h")
     in_root = ""
     extra_args = ""
-    call_subprocess(test_config.CT_TOOL + " --cuda-include-path=./include " + src)
+    call_subprocess(test_config.CT_TOOL + " --cuda-include-path=./include " + src, single_case_text)
     print("hello" + single_case_text.print_text, single_case_text)
     if ('option is in the CUDA_PATH folder' in single_case_text.print_text):
         return True

behavior_tests/src/ngt-invalid-json1/do_test.py

@@ -21,12 +21,12 @@ def setup_test(single_case_text):
 def migrate_test(single_case_text):
     data = []
     ret = []
-    with open("compile_commands.json", 'r') as f:
+    with open(os.path.join(single_case_text.case_workspace, "compile_commands.json"), 'r') as f:
         data = f.readlines()
         for line in data:
             line = line.replace("directory_placeholder", os.getcwd().replace("\\", "\\\\"))
             ret.append(line)
-    with open("compile_commands.json", 'w') as f:
+    with open(os.path.join(single_case_text.case_workspace, "compile_commands.json"), 'w') as f:
         f.writelines(ret[1:])
 
     call_subprocess(test_config.CT_TOOL + ' -p=./ --cuda-include-path=' + test_config.include_path, single_case_text)

behavior_tests/src/ngt-invalid-json6/do_test.py

@@ -21,7 +21,7 @@ def setup_test(single_case_text):
 def migrate_test(single_case_text):
     data = []
     ret = []
-    with open("compile_commands.json", 'r') as f:
+    with open(os.path.join(single_case_text.case_workspace, "compile_commands.json"), 'r') as f:
         data = f.readlines()
         for line in data:
             line = line.replace("directory_placeholder", os.getcwd().replace("\\", "\\\\"))

behavior_tests/src/ngt-invalid-json8/do_test.py

@@ -21,14 +21,14 @@ def setup_test(single_case_text):
 def migrate_test(single_case_text):
     data = []
     ret = []
-    with open("compile_commands.json", 'r') as f:
+    with open(os.path.join(single_case_text.case_workspace, "compile_commands.json"), 'r') as f:
         data = f.readlines()
         for line in data:
             if "directory_placeholder" in line:
                 ret.append("      \"arguments\": [\"nvcc hello_aaa.c\"],\n")
             line = line.replace("directory_placeholder", os.getcwd().replace("\\", "\\\\"))
             ret.append(line)
-    with open("compile_commands.json", 'w') as f:
+    with open(os.path.join(single_case_text.case_workspace, "compile_commands.json"), 'w') as f:
         f.writelines(ret)
 
     call_subprocess(test_config.CT_TOOL + ' -p=./ --cuda-include-path=' + test_config.include_path, single_case_text)

behavior_tests/src/ngt-output-create/do_test.py

@@ -19,7 +19,7 @@ def setup_test(single_case_text):
 
 def migrate_test(single_case_text):
     call_subprocess(test_config.CT_TOOL + " vector_add.cu --out-root=out --cuda-include-path=" + test_config.include_path, single_case_text)
-    return is_sub_string("Unable to save the output to the specified directory", single_case_text.print_text, single_case_text)
+    return is_sub_string("Unable to save the output to the specified directory", single_case_text.print_text)
 
 def build_test(single_case_text):
     return True

run_test.py

@@ -77,6 +77,7 @@ def __init__(self, case_name, command_file = "", command_text = "", log_file = "
         self.test_status = "SKIPPED"
         self.out_root = ""
         self.run_flag = False
+        self.case_workspace = ""
 
 
 def parse_suite_cfg(suite_name, root_path):
@@ -206,7 +207,8 @@ def run_test_driver(module, single_case_text):
     # with open(test_config.command_file, "a+") as f:
     #     f.write("================= " + single_case_text.name + " ==================\n")
     single_case_text.command_text += "================= " + single_case_text.name + " ==================\n"
-    case_workspace = os.path.join(os.path.dirname(single_case_text.result_text), single_case_text.name)
+
+    case_workspace = single_case_text.case_workspace
     single_case_text.test_status = ""
     ret_val = True
     specific_module = ""
@@ -293,7 +295,7 @@ def is_option_supported(option_rule_list):
 
 def test_single_case(current_test, single_case_config, workspace,  suite_root_path):
     single_case_text = case_text(current_test, os.path.join(workspace, "command.tst"),"", 
-                                os.path.join(workspace, current_test, current_test + ".lf"), "",
+                                os.path.join(workspace, current_test + ".lf"), "",
                                 os.path.join(workspace, "result.md"), "", "")
     module = import_test_driver(suite_root_path)
     if single_case_config.platform_rule_list and not is_platform_supported(single_case_config.platform_rule_list):
@@ -309,6 +311,7 @@ def test_single_case(current_test, single_case_config, workspace,  suite_root_pa
         return single_case_text
 
     case_workspace = os.path.join(workspace, current_test)
+    single_case_text.case_workspace = case_workspace
     if not os.path.exists(case_workspace):
         os.makedirs(case_workspace)
     os.chdir(workspace)
@@ -320,7 +323,6 @@ def test_single_case(current_test, single_case_config, workspace,  suite_root_pa
 
 def prepare_test_workspace(root_path, suite_name, opt, case = ""):
     suite_workspace = os.path.join(os.path.abspath(root_path), suite_name, opt)
-    case_workspace = os.path.join(suite_workspace, case)
 
     if os.path.isdir(suite_workspace) and not case:
         shutil.rmtree(suite_workspace)

test_config.py

@@ -26,7 +26,7 @@
 # command_output = ""
 cuda_ver = 0        # CUDA header file version.
 # test_status = ""    # the test case execution status: MIGFAIL, COMPFAIL, RUNFAIL, SKIPPED or PASS.
-# test_option = ""    # Ref the option_mapping.json file table.
+test_option = ""    # Ref the option_mapping.json file table.
 # failed_message = ""
 # test_driver = ""
 # suite_cfg = ""      # Parsed from <suite>.xml.