diff options
| author | William Salmon <will.salmon@codethink.co.uk> | 2018-09-10 15:37:02 +0100 |
|---|---|---|
| committer | Phil Dawson <phildawson.0807@gmail.com> | 2018-10-16 12:39:14 +0000 |
| commit | 5e7cc645c69f96b35508113fdd311ce2e8ba9ab2 (patch) | |
| tree | 433f7599c0d076413f4363bdaf5f1b75bf47a41e /tests | |
| parent | bbcb9bd5cd5ba85e499d4a37058ca9e8663399d4 (diff) | |
| download | buildstream-5e7cc645c69f96b35508113fdd311ce2e8ba9ab2.tar.gz | |
Add conf-root variable to builds
Adding the conf-root variable makes creating out of source builds
slightly easier.
For issue #512 in Gitlab.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/format/variables.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/format/variables.py b/tests/format/variables.py index d01d87e5b..26bb3db98 100644 --- a/tests/format/variables.py +++ b/tests/format/variables.py @@ -19,10 +19,10 @@ 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. -G\"Unix Makefiles\" -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" + + "python3 ./setup.py install --prefix \"/usr\" \\\n" + "--root \"/buildstream-install\""), ('makemaker.bst', 'configure', "perl Makefile.PL PREFIX=/buildstream-install/usr"), ('modulebuild.bst', 'configure', "perl Build.PL --prefix \"/buildstream-install/usr\""), @@ -45,10 +45,10 @@ 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. -G\"Ninja\" -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" + + "python3 ./setup.py install --prefix \"/opt\" \\\n" + "--root \"/custom/install/root\""), ('makemaker.bst', 'configure', "perl Makefile.PL PREFIX=/custom/install/root/opt"), ('modulebuild.bst', 'configure', "perl Build.PL --prefix \"/custom/install/root/opt\""), |