[SYCLomatic #2921] Update tests to merge of all the yamls to MainSourceFiles.yaml (#928)

Signed-off-by: Jiang, Zhiwei <[email protected]>

Author: zhiweij1

behavior_tests/behavior_tests.xml

@@ -70,8 +70,6 @@
         <test testName="ngt-invalid-yaml-for-header1" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="ngt-invalid-yaml-for-header2" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="ngt-invalid-yaml-for-header3" configFile="config/TEMPLATE_behavior_tests.xml" />
-        <test testName="ngt-invalid-yaml-for-header4" configFile="config/TEMPLATE_behavior_tests_lin.xml" />
-        <test testName="ngt-win-invalid-yaml-for-header4" configFile="config/TEMPLATE_behavior_tests_win.xml" />
         <test testName="ngt-invalid-json1" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="ngt-invalid-json2" configFile="config/TEMPLATE_behavior_tests.xml" />
         <test testName="ngt-invalid-json3" configFile="config/TEMPLATE_behavior_tests.xml" />

behavior_tests/src/bt-modified-yaml/do_test.py

@@ -18,7 +18,7 @@ def setup_test():
     return True
 
 def migrate_test():
-    yml_file = os.path.join("out", "test.h.yaml")
+    yml_file = os.path.join("out", "MainSourceFiles.yaml")
     test_file = os.path.join("out", "test.h")
     ret_str = ""
     ret = []

behavior_tests/src/bt-yaml-with-different-options1/do_test.py

@@ -21,7 +21,7 @@ def migrate_test():
     call_subprocess(test_config.CT_TOOL + " test.cu --in-root . --out-root out --always-use-async-handler --assume-nd-range-dim=1 --comments --enable-ctad --no-dpcpp-extensions=enqueued_barriers --no-dry-pattern --process-all -p . --sycl-named-lambda --use-experimental-features=free-function-queries,nd_range_barrier --use-explicit-namespace=sycl,dpct --usm-level=none --cuda-include-path=" + test_config.include_path)
     call_subprocess(test_config.CT_TOOL + " test.cu --out-root out --cuda-include-path=" + test_config.include_path)
     return is_sub_string("\"--analysis-scope-path=\"", test_config.command_output) and \
-           is_sub_string("--always-use-async-handler --comments --compilation-database=\"", test_config.command_output) and \
+           is_sub_string("--always-use-async-handler --comments", test_config.command_output) and \
            is_sub_string("--enable-ctad --use-experimental-features=free-function-queries,nd_range_barrier --use-explicit-namespace=sycl,dpct --no-dpcpp-extensions=enqueued_barriers --assume-nd-range-dim=1 --no-dry-pattern --process-all --sycl-named-lambda --usm-level=none\".", test_config.command_output)
 
 def build_test():

behavior_tests/src/bt-yaml-without-ct-version/do_test.py

@@ -20,8 +20,7 @@ def setup_test():
 def migrate_test():
 
     call_subprocess(test_config.CT_TOOL + " test.cu --out-root=out --cuda-include-path=" + test_config.include_path)
-    return is_sub_string("Failed to load", test_config.command_output) and \
-            is_sub_string("Migration continues with incremental migration disabled", test_config.command_output)
+    return is_sub_string("Migration continues with incremental migration disabled", test_config.command_output)
 
 def build_test():
     return True

behavior_tests/src/ngt-invalid-yaml-for-header1/do_test.py

@@ -21,11 +21,11 @@ def migrate_test():
     call_subprocess(test_config.CT_TOOL + ' hello.h --out-root=out --cuda-include-path=' + \
                    os.environ['CUDA_INCLUDE_PATH'])
 
-    with open('out/hello.h.yaml', 'r') as f:
+    with open('out/MainSourceFiles.yaml', 'r') as f:
         file_data = f.read()
 
     file_data=file_data.replace('ConstantFlag', 'ConstantFla',1)
-    with open('out/hello.h.yaml', 'w') as f:
+    with open('out/MainSourceFiles.yaml', 'w') as f:
         f.write(file_data)
 
     call_subprocess(test_config.CT_TOOL + ' hello.h --out-root=./out --cuda-include-path=' + \

behavior_tests/src/ngt-invalid-yaml-for-header2/do_test.py

@@ -21,11 +21,11 @@ def migrate_test():
     call_subprocess(test_config.CT_TOOL + ' hello.h --out-root=out --cuda-include-path=' + \
                    os.environ['CUDA_INCLUDE_PATH'])
 
-    with open('out/hello.h.yaml', 'r') as f:
+    with open('out/MainSourceFiles.yaml', 'r') as f:
         file_data = f.read()
 
     file_data=file_data.replace('Offset', '  Offset',1)
-    with open('out/hello.h.yaml', 'w') as f:
+    with open('out/MainSourceFiles.yaml', 'w') as f:
         f.write(file_data)
 
     call_subprocess(test_config.CT_TOOL + ' hello.h --out-root=./out --cuda-include-path=' + \

behavior_tests/src/ngt-invalid-yaml-for-header3/do_test.py

@@ -22,12 +22,12 @@ def migrate_test():
     call_subprocess(test_config.CT_TOOL + ' hello.h --out-root=out --cuda-include-path=' + \
                    os.environ['CUDA_INCLUDE_PATH'])
     file_data=""
-    with open('out/hello.h.yaml', 'r') as f:
+    with open('out/MainSourceFiles.yaml', 'r') as f:
         file_data = f.read()
 
     file_data = file_data.replace("- FilePath", "FilePath",1)
     print(file_data)
-    with open('out/hello.h.yaml', 'w') as f:
+    with open('out/MainSourceFiles.yaml', 'w') as f:
         f.write(file_data)
 
     call_subprocess(test_config.CT_TOOL + ' hello.h --out-root=./out --cuda-include-path=' + \