From 35469f53cd1a9eaa3d178a209d71094c0ecf39ae Mon Sep 17 00:00:00 2001 From: huangyu Date: Tue, 28 Mar 2023 16:40:13 +0800 Subject: [PATCH] Remove path dependency of es2abc compiler project tests Issue: https://gitee.com/openharmony/arkcompiler_ets_frontend/issues/I6R0OM Signed-off-by: huangyu Change-Id: Ib1502872dd750580ddae6b12ccebae0c90359aa2 --- .../ts_abstract_class_project_1/filesInfo.txt | 2 -- .../ts_import_type_project_1/filesInfo.txt | 2 -- .../ts_import_type_project_2/filesInfo.txt | 2 -- .../ts_test_compiler_project/filesInfo.txt | 3 --- .../ts/projects/ts_test_decorators/filesInfo.txt | 1 - es2panda/test/runner.py | 14 ++++++++++++++ 6 files changed, 14 insertions(+), 10 deletions(-) delete mode 100644 es2panda/test/compiler/ts/projects/ts_abstract_class_project_1/filesInfo.txt delete mode 100644 es2panda/test/compiler/ts/projects/ts_import_type_project_1/filesInfo.txt delete mode 100644 es2panda/test/compiler/ts/projects/ts_import_type_project_2/filesInfo.txt delete mode 100644 es2panda/test/compiler/ts/projects/ts_test_compiler_project/filesInfo.txt delete mode 100644 es2panda/test/compiler/ts/projects/ts_test_decorators/filesInfo.txt diff --git a/es2panda/test/compiler/ts/projects/ts_abstract_class_project_1/filesInfo.txt b/es2panda/test/compiler/ts/projects/ts_abstract_class_project_1/filesInfo.txt deleted file mode 100644 index 9c3eb80b02..0000000000 --- a/es2panda/test/compiler/ts/projects/ts_abstract_class_project_1/filesInfo.txt +++ /dev/null @@ -1,2 +0,0 @@ -test/compiler/ts/projects/ts_abstract_class_project_1/ts-test-export-abstract-class.ts;ts-test-export-abstract-class;esm;test/compiler/ts/projects/ts_abstract_class_project_1/ts-test-export-abstract-class.ts;ts-test-export-abstract-class -test/compiler/ts/projects/ts_abstract_class_project_1/ts-test-import-abstract-class-exec.ts;ts-test-import-abstract-class-exec;esm;test/compiler/ts/projects/ts_abstract_class_project_1/ts-test-import-abstract-class-exec.ts;ts-test-import-abstract-class-exec diff --git a/es2panda/test/compiler/ts/projects/ts_import_type_project_1/filesInfo.txt b/es2panda/test/compiler/ts/projects/ts_import_type_project_1/filesInfo.txt deleted file mode 100644 index fa1a977f08..0000000000 --- a/es2panda/test/compiler/ts/projects/ts_import_type_project_1/filesInfo.txt +++ /dev/null @@ -1,2 +0,0 @@ -test/compiler/ts/projects/ts_import_type_project_1/test-ts-export-type.ts;test-ts-export-type;esm;test/compiler/ts/projects/ts_import_type_project_1/test-ts-export-type.ts;test-ts-export-type -test/compiler/ts/projects/ts_import_type_project_1/test-ts-import-type-exec.ts;test-ts-import-type-exec;esm;test/compiler/ts/projects/ts_import_type_project_1/test-ts-import-type-exec.ts;test-ts-import-type-exec diff --git a/es2panda/test/compiler/ts/projects/ts_import_type_project_2/filesInfo.txt b/es2panda/test/compiler/ts/projects/ts_import_type_project_2/filesInfo.txt deleted file mode 100644 index c818b75f4a..0000000000 --- a/es2panda/test/compiler/ts/projects/ts_import_type_project_2/filesInfo.txt +++ /dev/null @@ -1,2 +0,0 @@ -test/compiler/ts/projects/ts_import_type_project_2/test-ts-export-type.ts;test-ts-export-type;esm;test/compiler/ts/projects/ts_import_type_project_2/test-ts-export-type.ts;test-ts-export-type -test/compiler/ts/projects/ts_import_type_project_2/test-ts-import-type-exec.ts;test-ts-import-type-exec;esm;test/compiler/ts/projects/ts_import_type_project_2/test-ts-import-type-exec.ts;test-ts-import-type-exec diff --git a/es2panda/test/compiler/ts/projects/ts_test_compiler_project/filesInfo.txt b/es2panda/test/compiler/ts/projects/ts_test_compiler_project/filesInfo.txt deleted file mode 100644 index 08df4b8ad9..0000000000 --- a/es2panda/test/compiler/ts/projects/ts_test_compiler_project/filesInfo.txt +++ /dev/null @@ -1,3 +0,0 @@ -test/compiler/ts/projects/ts_test_compiler_project/dest-exec.ts;dest-exec;esm;test/compiler/ts/projects/ts_test_compiler_project/dest-exec.ts;dest-exec -test/compiler/ts/projects/ts_test_compiler_project/src.ts;src;esm;test/compiler/ts/projects/ts_test_compiler_project/src.ts;src -test/compiler/ts/projects/ts_test_compiler_project/dir/dir_src.ts;dir/dir_src;esm;test/compiler/ts/projects/ts_test_compiler_project/dir/dir_src.ts;dir_src diff --git a/es2panda/test/compiler/ts/projects/ts_test_decorators/filesInfo.txt b/es2panda/test/compiler/ts/projects/ts_test_decorators/filesInfo.txt deleted file mode 100644 index 3a146c55c2..0000000000 --- a/es2panda/test/compiler/ts/projects/ts_test_decorators/filesInfo.txt +++ /dev/null @@ -1 +0,0 @@ -test/compiler/ts/projects/ts_test_decorators/ts-test-decorators-export-exec.ts;ts-test-decorators-export-exec;esm;test/compiler/ts/projects/ts_test_decorators/ts-test-decorators-export-exec.ts;ts-test-decorators-export-exec diff --git a/es2panda/test/runner.py b/es2panda/test/runner.py index 0e94b5ef69..9efdfe609f 100755 --- a/es2panda/test/runner.py +++ b/es2panda/test/runner.py @@ -865,11 +865,14 @@ class CompilerProjectTest(Test): self.projects_path = projects_path self.project = project self.test_paths = test_paths + self.files_info_path = os.path.join(os.path.join(self.projects_path, self.project), 'filesInfo.txt') def remove_project(self, runner): project_path = runner.build_dir + "/" + self.project if path.exists(project_path): shutil.rmtree(project_path) + if path.exists(self.files_info_path): + os.remove(self.files_info_path) def get_file_absolute_path_and_name(self, runner): sub_path = self.path[len(self.projects_path):] @@ -901,6 +904,16 @@ class CompilerProjectTest(Test): self.remove_project(runner) return self + def gen_files_info(self, runner): + fd = os.open(self.files_info_path, os.O_RDWR | os.O_CREAT | os.O_TRUNC) + f = os.fdopen(fd, "w") + for test_path in self.test_paths: + record_name = os.path.relpath(test_path, os.path.dirname(self.files_info_path)).split('.')[0] + module_kind = "esm" + file_info = ('%s;%s;%s;%s;%s' % (test_path, record_name, module_kind, test_path, record_name)) + f.writelines(file_info + '\n') + f.close() + def gen_merged_abc(self, runner): for test_path in self.test_paths: self.path = test_path @@ -927,6 +940,7 @@ class CompilerProjectTest(Test): def run(self, runner): # Compile all ts source files in the project to abc files. if ("--merge-abc" in self.flags): + self.gen_files_info(runner) self.gen_merged_abc(runner) else: self.gen_single_abc(runner) -- Gitee