diff options
| author | Javier Jardón <jjardon@gnome.org> | 2018-01-17 17:28:50 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2018-01-17 17:48:20 +0000 |
| commit | d01b9141cb17aded7041ee13639dd2b3d9c9d931 (patch) | |
| tree | 039c67f558b23d045dbbced15329c06da6546792 /tests/variables/variables.py | |
| parent | b7099b125ef9c4cd1c1105648f5992b4f4a63fe4 (diff) | |
| download | buildstream-jjardon/cmake_ninja.tar.gz | |
buildstream/plugins/elements/cmake.yaml: Use ninja instead makejjardon/cmake_ninja
Diffstat (limited to 'tests/variables/variables.py')
| -rw-r--r-- | tests/variables/variables.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/variables/variables.py b/tests/variables/variables.py index 24f323c69..6623b92ea 100644 --- a/tests/variables/variables.py +++ b/tests/variables/variables.py @@ -45,7 +45,7 @@ def assert_command(datafiles, tmpdir, target, command, expected): @pytest.mark.parametrize("target,command,expected", [ ('autotools.bst', 'install-commands', "make -j1 DESTDIR=\"/buildstream/install\" install"), ('cmake.bst', 'configure-commands', - "cmake -B_builddir -H. -DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" + + "cmake -B_builddir -H. -GNinja -DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" + "-DCMAKE_INSTALL_LIBDIR=lib"), ('distutils.bst', 'install-commands', "python3 setup.py install --prefix \"/usr\" \\\n" + @@ -65,7 +65,7 @@ def test_defaults(datafiles, tmpdir, target, command, expected): @pytest.mark.parametrize("target,command,expected", [ ('autotools.bst', 'install-commands', "make -j1 DESTDIR=\"/custom/install/root\" install"), ('cmake.bst', 'configure-commands', - "cmake -B_builddir -H. -DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" + + "cmake -B_builddir -H. -GNinja -DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" + "-DCMAKE_INSTALL_LIBDIR=lib"), ('distutils.bst', 'install-commands', "python3 setup.py install --prefix \"/opt\" \\\n" + |