diff options
| -rw-r--r-- | mesonbuild/templates/cpptemplates.py | 3 | ||||
| -rw-r--r-- | mesonbuild/templates/ctemplates.py | 3 | ||||
| -rw-r--r-- | mesonbuild/templates/cudatemplates.py | 3 | ||||
| -rw-r--r-- | mesonbuild/templates/dlangtemplates.py | 3 | ||||
| -rw-r--r-- | mesonbuild/templates/fortrantemplates.py | 3 | ||||
| -rw-r--r-- | mesonbuild/templates/javatemplates.py | 1 | ||||
| -rw-r--r-- | mesonbuild/templates/objcpptemplates.py | 3 | ||||
| -rw-r--r-- | mesonbuild/templates/objctemplates.py | 3 | ||||
| -rw-r--r-- | mesonbuild/templates/rusttemplates.py | 3 | ||||
| -rw-r--r-- | test cases/common/149 recursive linking/3rdorderdeps/meson.build | 2 |
10 files changed, 17 insertions, 10 deletions
diff --git a/mesonbuild/templates/cpptemplates.py b/mesonbuild/templates/cpptemplates.py index 5bff67b..f664e42 100644 --- a/mesonbuild/templates/cpptemplates.py +++ b/mesonbuild/templates/cpptemplates.py @@ -153,6 +153,7 @@ def create_lib_cpp_sample(project_name, version): lowercase_token = re.sub(r'[^a-z0-9]', '_', project_name.lower()) uppercase_token = lowercase_token.upper() class_name = uppercase_token[0] + lowercase_token[1:] + test_exe_name = lowercase_token + '_test' namespace = lowercase_token lib_hpp_name = lowercase_token + '.hpp' lib_cpp_name = lowercase_token + '.cpp' @@ -165,7 +166,7 @@ def create_lib_cpp_sample(project_name, version): 'header_file': lib_hpp_name, 'source_file': lib_cpp_name, 'test_source_file': test_cpp_name, - 'test_exe_name': lowercase_token, + 'test_exe_name': test_exe_name, 'project_name': project_name, 'lib_name': lowercase_token, 'test_name': lowercase_token, diff --git a/mesonbuild/templates/ctemplates.py b/mesonbuild/templates/ctemplates.py index f46f054..64686c8 100644 --- a/mesonbuild/templates/ctemplates.py +++ b/mesonbuild/templates/ctemplates.py @@ -134,6 +134,7 @@ def create_lib_c_sample(project_name, version): lowercase_token = re.sub(r'[^a-z0-9]', '_', project_name.lower()) uppercase_token = lowercase_token.upper() function_name = lowercase_token[0:3] + '_func' + test_exe_name = lowercase_token + '_test' lib_h_name = lowercase_token + '.h' lib_c_name = lowercase_token + '.c' test_c_name = lowercase_token + '_test.c' @@ -144,7 +145,7 @@ def create_lib_c_sample(project_name, version): 'header_file': lib_h_name, 'source_file': lib_c_name, 'test_source_file': test_c_name, - 'test_exe_name': lowercase_token, + 'test_exe_name': test_exe_name, 'project_name': project_name, 'lib_name': lowercase_token, 'test_name': lowercase_token, diff --git a/mesonbuild/templates/cudatemplates.py b/mesonbuild/templates/cudatemplates.py index d083fe8..cc0782c 100644 --- a/mesonbuild/templates/cudatemplates.py +++ b/mesonbuild/templates/cudatemplates.py @@ -153,6 +153,7 @@ def create_lib_cuda_sample(project_name, version): lowercase_token = re.sub(r'[^a-z0-9]', '_', project_name.lower()) uppercase_token = lowercase_token.upper() class_name = uppercase_token[0] + lowercase_token[1:] + test_exe_name = lowercase_token + '_test' namespace = lowercase_token lib_h_name = lowercase_token + '.h' lib_cuda_name = lowercase_token + '.cu' @@ -165,7 +166,7 @@ def create_lib_cuda_sample(project_name, version): 'header_file': lib_h_name, 'source_file': lib_cuda_name, 'test_source_file': test_cuda_name, - 'test_exe_name': lowercase_token, + 'test_exe_name': test_exe_name, 'project_name': project_name, 'lib_name': lowercase_token, 'test_name': lowercase_token, diff --git a/mesonbuild/templates/dlangtemplates.py b/mesonbuild/templates/dlangtemplates.py index 124634c..265e3d5 100644 --- a/mesonbuild/templates/dlangtemplates.py +++ b/mesonbuild/templates/dlangtemplates.py @@ -113,6 +113,7 @@ def create_lib_d_sample(project_name, version): lowercase_token = re.sub(r'[^a-z0-9]', '_', project_name.lower()) uppercase_token = lowercase_token.upper() function_name = lowercase_token[0:3] + '_func' + test_exe_name = lowercase_token + '_test' lib_m_name = lowercase_token lib_d_name = lowercase_token + '.d' test_d_name = lowercase_token + '_test.d' @@ -123,7 +124,7 @@ def create_lib_d_sample(project_name, version): 'module_file': lib_m_name, 'source_file': lib_d_name, 'test_source_file': test_d_name, - 'test_exe_name': lowercase_token, + 'test_exe_name': test_exe_name, 'project_name': project_name, 'lib_name': lowercase_token, 'test_name': lowercase_token, diff --git a/mesonbuild/templates/fortrantemplates.py b/mesonbuild/templates/fortrantemplates.py index 3bf1b74..b784fda 100644 --- a/mesonbuild/templates/fortrantemplates.py +++ b/mesonbuild/templates/fortrantemplates.py @@ -111,6 +111,7 @@ def create_lib_fortran_sample(project_name, version): lowercase_token = re.sub(r'[^a-z0-9]', '_', project_name.lower()) uppercase_token = lowercase_token.upper() function_name = lowercase_token[0:3] + '_func' + test_exe_name = lowercase_token + '_test' lib_fortran_name = lowercase_token + '.f90' test_fortran_name = lowercase_token + '_test.f90' kwargs = {'utoken': uppercase_token, @@ -119,7 +120,7 @@ def create_lib_fortran_sample(project_name, version): 'function_name': function_name, 'source_file': lib_fortran_name, 'test_source_file': test_fortran_name, - 'test_exe_name': lowercase_token, + 'test_exe_name': test_exe_name, 'project_name': project_name, 'lib_name': lowercase_token, 'test_name': lowercase_token, diff --git a/mesonbuild/templates/javatemplates.py b/mesonbuild/templates/javatemplates.py index e8a8c15..012823a 100644 --- a/mesonbuild/templates/javatemplates.py +++ b/mesonbuild/templates/javatemplates.py @@ -118,7 +118,6 @@ def create_lib_java_sample(project_name, version): 'class_name': class_name, 'source_file': lib_java_name, 'test_source_file': test_java_name, - 'test_exe_name': lowercase_token, 'project_name': project_name, 'lib_name': lowercase_token, 'test_name': lowercase_token, diff --git a/mesonbuild/templates/objcpptemplates.py b/mesonbuild/templates/objcpptemplates.py index 329a568..2d71573 100644 --- a/mesonbuild/templates/objcpptemplates.py +++ b/mesonbuild/templates/objcpptemplates.py @@ -134,6 +134,7 @@ def create_lib_objcpp_sample(project_name, version): lowercase_token = re.sub(r'[^a-z0-9]', '_', project_name.lower()) uppercase_token = lowercase_token.upper() function_name = lowercase_token[0:3] + '_func' + test_exe_name = lowercase_token + '_test' lib_h_name = lowercase_token + '.h' lib_objcpp_name = lowercase_token + '.mm' test_objcpp_name = lowercase_token + '_test.mm' @@ -144,7 +145,7 @@ def create_lib_objcpp_sample(project_name, version): 'header_file': lib_h_name, 'source_file': lib_objcpp_name, 'test_source_file': test_objcpp_name, - 'test_exe_name': lowercase_token, + 'test_exe_name': test_exe_name, 'project_name': project_name, 'lib_name': lowercase_token, 'test_name': lowercase_token, diff --git a/mesonbuild/templates/objctemplates.py b/mesonbuild/templates/objctemplates.py index db89c28..73791f5 100644 --- a/mesonbuild/templates/objctemplates.py +++ b/mesonbuild/templates/objctemplates.py @@ -134,6 +134,7 @@ def create_lib_objc_sample(project_name, version): lowercase_token = re.sub(r'[^a-z0-9]', '_', project_name.lower()) uppercase_token = lowercase_token.upper() function_name = lowercase_token[0:3] + '_func' + test_exe_name = lowercase_token + '_test' lib_h_name = lowercase_token + '.h' lib_objc_name = lowercase_token + '.m' test_objc_name = lowercase_token + '_test.m' @@ -144,7 +145,7 @@ def create_lib_objc_sample(project_name, version): 'header_file': lib_h_name, 'source_file': lib_objc_name, 'test_source_file': test_objc_name, - 'test_exe_name': lowercase_token, + 'test_exe_name': test_exe_name, 'project_name': project_name, 'lib_name': lowercase_token, 'test_name': lowercase_token, diff --git a/mesonbuild/templates/rusttemplates.py b/mesonbuild/templates/rusttemplates.py index 848dfc0..ab8ecbd 100644 --- a/mesonbuild/templates/rusttemplates.py +++ b/mesonbuild/templates/rusttemplates.py @@ -82,6 +82,7 @@ def create_lib_rust_sample(project_name, version): lowercase_token = re.sub(r'[^a-z0-9]', '_', project_name.lower()) uppercase_token = lowercase_token.upper() function_name = lowercase_token[0:3] + '_func' + test_exe_name = lowercase_token + '_test' lib_crate_name = lowercase_token lib_rs_name = lowercase_token + '.rs' test_rs_name = lowercase_token + '_test.rs' @@ -92,7 +93,7 @@ def create_lib_rust_sample(project_name, version): 'crate_file': lib_crate_name, 'source_file': lib_rs_name, 'test_source_file': test_rs_name, - 'test_exe_name': lowercase_token, + 'test_exe_name': test_exe_name, 'project_name': project_name, 'lib_name': lowercase_token, 'test_name': lowercase_token, diff --git a/test cases/common/149 recursive linking/3rdorderdeps/meson.build b/test cases/common/149 recursive linking/3rdorderdeps/meson.build index d4ef745..4c5ac73 100644 --- a/test cases/common/149 recursive linking/3rdorderdeps/meson.build +++ b/test cases/common/149 recursive linking/3rdorderdeps/meson.build @@ -41,7 +41,7 @@ foreach dep2 : ['sh', 'st'] main_c = configure_file(input : 'main.c.in', output : name + '-main.c', configuration : cdata) - dep3_bin = executable(name, main_c, link_with : dep3_lib, + dep3_bin = executable(name + '_test', main_c, link_with : dep3_lib, c_args : build_args) test(name + 'test', dep3_bin) endforeach |