diff options
| author | Phillip Smyth <phillip.smyth@codethink.co.uk> | 2018-03-07 15:02:01 +0000 |
|---|---|---|
| committer | Phillip Smyth <phillip.smyth@codethink.co.uk> | 2018-03-23 13:33:43 +0000 |
| commit | 13b075f1366d0082cd91abe28646fe367bd0f8da (patch) | |
| tree | 15d5c1c1bca83ce52809525a9bfac089a0ff7075 /tests/variables/variables.py | |
| parent | 357ac70eb66f85078280ca86d871ae2c1a995241 (diff) | |
| download | buildstream-issue-89_unique_build_dirs.tar.gz | |
Generate unique subdirs for built elementsissue-89_unique_build_dirs
Based on issue 89 (https://gitlab.com/BuildStream/buildstream/issues/89) there has been interest in
ensuring that elements are staged into unique subdirs while building. This patch supports that by doing the following:
* Modify project config to add 2 new variables ("project-name" and "element")
* Changed the default install-root from "/buildstream/install" to "/buildstream-install"
* Update the tests to accommodate these changes
* Update the expected cache keys in the tests
Diffstat (limited to 'tests/variables/variables.py')
| -rw-r--r-- | tests/variables/variables.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/variables/variables.py b/tests/variables/variables.py index b16511ad6..944d19818 100644 --- a/tests/variables/variables.py +++ b/tests/variables/variables.py @@ -43,16 +43,16 @@ def assert_command(datafiles, tmpdir, target, command, expected): # Test proper loading of some default commands from plugins # ############################################################### @pytest.mark.parametrize("target,command,expected", [ - ('autotools.bst', 'install-commands', "make -j1 DESTDIR=\"/buildstream/install\" install"), + ('autotools.bst', 'install-commands', "make -j1 DESTDIR=\"/buildstream-install\" install"), ('cmake.bst', 'configure-commands', "cmake -B_builddir -H. -DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" + "-DCMAKE_INSTALL_LIBDIR=lib"), ('distutils.bst', 'install-commands', "python3 setup.py install --prefix \"/usr\" \\\n" + - "--root \"/buildstream/install\""), - ('makemaker.bst', 'configure-commands', "perl Makefile.PL PREFIX=/buildstream/install/usr"), - ('modulebuild.bst', 'configure-commands', "perl Build.PL --prefix \"/buildstream/install/usr\""), - ('qmake.bst', 'install-commands', "make -j1 INSTALL_ROOT=\"/buildstream/install\" install"), + "--root \"/buildstream-install\""), + ('makemaker.bst', 'configure-commands', "perl Makefile.PL PREFIX=/buildstream-install/usr"), + ('modulebuild.bst', 'configure-commands', "perl Build.PL --prefix \"/buildstream-install/usr\""), + ('qmake.bst', 'install-commands', "make -j1 INSTALL_ROOT=\"/buildstream-install\" install"), ]) @pytest.mark.datafiles(os.path.join(DATA_DIR, 'defaults')) def test_defaults(datafiles, tmpdir, target, command, expected): |