diff options
| author | Abderrahim Kitouni <a.kitouni@gmail.com> | 2018-04-12 10:07:01 +0100 |
|---|---|---|
| committer | Abderrahim Kitouni <a.kitouni@gmail.com> | 2018-04-14 14:53:36 +0100 |
| commit | d41940f516498f827967b8e5d311ce6accb88f56 (patch) | |
| tree | 43acf4a921fe07fd68a2f13c7c302d62b891a56b /tests/format/variables.py | |
| parent | d603051e4ac14ccb7413861963eccffd21fcdf34 (diff) | |
| download | buildstream-abderrahim/cmake-ninja.tar.gz | |
plugins/elements/cmake.yaml: allow using ninja instead of make (#279)abderrahim/cmake-ninja
This uses the build tool mode of cmake to have a single command that can call
either make or ninja.
I've also modified the tests to take the new commands into account
Diffstat (limited to 'tests/format/variables.py')
| -rw-r--r-- | tests/format/variables.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/format/variables.py b/tests/format/variables.py index e4b6297aa..1d34911ea 100644 --- a/tests/format/variables.py +++ b/tests/format/variables.py @@ -18,7 +18,7 @@ DATA_DIR = os.path.join( @pytest.mark.parametrize("target,varname,expected", [ ('autotools.bst', 'make-install', "make -j1 DESTDIR=\"/buildstream-install\" install"), ('cmake.bst', 'cmake', - "cmake -B_builddir -H. -DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" + + "cmake -B_builddir -H. -G\"Unix Makefiles\" -DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" + "-DCMAKE_INSTALL_LIBDIR=lib "), ('distutils.bst', 'python-install', "python3 setup.py install --prefix \"/usr\" \\\n" + @@ -44,7 +44,7 @@ def test_defaults(cli, datafiles, tmpdir, target, varname, expected): @pytest.mark.parametrize("target,varname,expected", [ ('autotools.bst', 'make-install', "make -j1 DESTDIR=\"/custom/install/root\" install"), ('cmake.bst', 'cmake', - "cmake -B_builddir -H. -DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" + + "cmake -B_builddir -H. -G\"Ninja\" -DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" + "-DCMAKE_INSTALL_LIBDIR=lib "), ('distutils.bst', 'python-install', "python3 setup.py install --prefix \"/opt\" \\\n" + |