diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-10-12 23:38:59 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-10-13 20:53:45 +0300 |
| commit | 1efcea9617cee2f4e15768c52d3ba34634894abe (patch) | |
| tree | 4b86f34233ff5c51a51d89433e412553d4b3be01 | |
| parent | c3db008d82026834e45d07a07e5418585df62026 (diff) | |
| download | meson-1efcea9617cee2f4e15768c52d3ba34634894abe.zip meson-1efcea9617cee2f4e15768c52d3ba34634894abe.tar.gz meson-1efcea9617cee2f4e15768c52d3ba34634894abe.tar.bz2 | |
Renamed path_join to join_paths.
| -rw-r--r-- | mesonbuild/interpreter.py | 4 | ||||
| -rw-r--r-- | test cases/common/119 pathjoin/meson.build | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index d7c1ac2..e486ee9 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -1207,7 +1207,7 @@ class Interpreter(): 'declare_dependency': self.func_declare_dependency, 'assert': self.func_assert, 'environment' : self.func_environment, - 'path_join' : self.func_path_join, + 'join_paths' : self.func_join_paths, } def parse_project(self): @@ -2250,7 +2250,7 @@ class Interpreter(): @stringArgs @noKwargs - def func_path_join(self, node, args, kwargs): + def func_join_paths(self, node, args, kwargs): if isinstance(args, str): st = (args,) else: diff --git a/test cases/common/119 pathjoin/meson.build b/test cases/common/119 pathjoin/meson.build index dd1cf9c..7f33791 100644 --- a/test cases/common/119 pathjoin/meson.build +++ b/test cases/common/119 pathjoin/meson.build @@ -1,9 +1,8 @@ project('pathjoin', 'c') -assert(path_join('foo') == 'foo', 'Single argument join is broken') -assert(path_join('foo', 'bar') == 'foo/bar', 'Path joining is broken') -assert(path_join('foo', 'bar', 'baz') == 'foo/bar/baz', 'Path joining is broken') -assert(path_join('/foo', 'bar') == '/foo/bar', 'Path joining is broken') -assert(path_join('foo', '/bar') == '/bar', 'Absolute path joining is broken') -assert(path_join('/foo', '/bar') == '/bar', 'Absolute path joining is broken') - +assert(join_paths('foo') == 'foo', 'Single argument join is broken') +assert(join_paths('foo', 'bar') == 'foo/bar', 'Path joining is broken') +assert(join_paths('foo', 'bar', 'baz') == 'foo/bar/baz', 'Path joining is broken') +assert(join_paths('/foo', 'bar') == '/foo/bar', 'Path joining is broken') +assert(join_paths('foo', '/bar') == '/bar', 'Absolute path joining is broken') +assert(join_paths('/foo', '/bar') == '/bar', 'Absolute path joining is broken') |