diff options
author | Thomas Coldrick <thomas.coldrick@codethink.co.uk> | 2019-09-12 15:25:17 +0100 |
---|---|---|
committer | Benjamin Schubert <contact@benschubert.me> | 2020-01-13 17:32:08 +0000 |
commit | ff46a3191e62b2290e03ff730da8946cbb8f2781 (patch) | |
tree | 465afed1a4903da3f7605afc2027340798b0eb6f /tests | |
parent | 379a09a56a5bf2da7d78409ccdfda8e243cdfc13 (diff) | |
download | buildstream-ff46a3191e62b2290e03ff730da8946cbb8f2781.tar.gz |
Tests: Remove bst-plugins-experimental dependency
This stops the tests from being interlinked for BuildStream itself.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/format/variables.py | 40 | ||||
-rw-r--r-- | tests/format/variables/defaults/cmake.bst | 2 | ||||
-rw-r--r-- | tests/format/variables/defaults/distutils.bst | 2 | ||||
-rw-r--r-- | tests/format/variables/defaults/makemaker.bst | 2 | ||||
-rw-r--r-- | tests/format/variables/defaults/modulebuild.bst | 2 | ||||
-rw-r--r-- | tests/format/variables/defaults/project.conf | 10 | ||||
-rw-r--r-- | tests/format/variables/defaults/qmake.bst | 2 | ||||
-rw-r--r-- | tests/format/variables/overrides/cmake.bst | 7 | ||||
-rw-r--r-- | tests/format/variables/overrides/distutils.bst | 6 | ||||
-rw-r--r-- | tests/format/variables/overrides/makemaker.bst | 6 | ||||
-rw-r--r-- | tests/format/variables/overrides/modulebuild.bst | 6 | ||||
-rw-r--r-- | tests/format/variables/overrides/project.conf | 9 | ||||
-rw-r--r-- | tests/format/variables/overrides/qmake.bst | 6 |
13 files changed, 2 insertions, 98 deletions
diff --git a/tests/format/variables.py b/tests/format/variables.py index 35b105f66..1d8b5aff9 100644 --- a/tests/format/variables.py +++ b/tests/format/variables.py @@ -27,25 +27,7 @@ def print_warning(msg): # Test proper loading of some default commands from plugins # ############################################################### @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' - + '-DCMAKE_INSTALL_LIBDIR:PATH="lib"', - ), - ( - "distutils.bst", - "python-install", - '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"'), - ("qmake.bst", "make-install", 'make -j1 INSTALL_ROOT="/buildstream-install" install'), - ], + "target,varname,expected", [("autotools.bst", "make-install", 'make -j1 DESTDIR="/buildstream-install" install')], ) @pytest.mark.datafiles(os.path.join(DATA_DIR, "defaults")) def test_defaults(cli, datafiles, target, varname, expected): @@ -60,25 +42,7 @@ def test_defaults(cli, datafiles, target, varname, expected): # Test overriding of variables to produce different commands # ################################################################ @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' - + '-DCMAKE_INSTALL_LIBDIR:PATH="lib"', - ), - ( - "distutils.bst", - "python-install", - '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"'), - ("qmake.bst", "make-install", 'make -j1 INSTALL_ROOT="/custom/install/root" install'), - ], + "target,varname,expected", [("autotools.bst", "make-install", 'make -j1 DESTDIR="/custom/install/root" install')], ) @pytest.mark.datafiles(os.path.join(DATA_DIR, "overrides")) def test_overrides(cli, datafiles, target, varname, expected): diff --git a/tests/format/variables/defaults/cmake.bst b/tests/format/variables/defaults/cmake.bst deleted file mode 100644 index 4e7db662c..000000000 --- a/tests/format/variables/defaults/cmake.bst +++ /dev/null @@ -1,2 +0,0 @@ -kind: cmake -description: Some kinda cmake element diff --git a/tests/format/variables/defaults/distutils.bst b/tests/format/variables/defaults/distutils.bst deleted file mode 100644 index 2354bea39..000000000 --- a/tests/format/variables/defaults/distutils.bst +++ /dev/null @@ -1,2 +0,0 @@ -kind: distutils -description: Some kinda distutils element diff --git a/tests/format/variables/defaults/makemaker.bst b/tests/format/variables/defaults/makemaker.bst deleted file mode 100644 index 2205cece1..000000000 --- a/tests/format/variables/defaults/makemaker.bst +++ /dev/null @@ -1,2 +0,0 @@ -kind: makemaker -description: Some kinda makemaker element diff --git a/tests/format/variables/defaults/modulebuild.bst b/tests/format/variables/defaults/modulebuild.bst deleted file mode 100644 index 5b5e9b91a..000000000 --- a/tests/format/variables/defaults/modulebuild.bst +++ /dev/null @@ -1,2 +0,0 @@ -kind: modulebuild -description: Some kinda modulebuild element diff --git a/tests/format/variables/defaults/project.conf b/tests/format/variables/defaults/project.conf index 029f07c3a..2027cc27a 100644 --- a/tests/format/variables/defaults/project.conf +++ b/tests/format/variables/defaults/project.conf @@ -1,13 +1,3 @@ # Basic project configuration that doesnt override anything # name: pony - -plugins: -- origin: pip - package-name: bst-plugins-experimental - elements: - cmake: 0 - distutils: 0 - makemaker: 0 - modulebuild: 0 - qmake: 0 diff --git a/tests/format/variables/defaults/qmake.bst b/tests/format/variables/defaults/qmake.bst deleted file mode 100644 index 53209760d..000000000 --- a/tests/format/variables/defaults/qmake.bst +++ /dev/null @@ -1,2 +0,0 @@ -kind: qmake -description: Some kinda qmake element diff --git a/tests/format/variables/overrides/cmake.bst b/tests/format/variables/overrides/cmake.bst deleted file mode 100644 index ceea2bb12..000000000 --- a/tests/format/variables/overrides/cmake.bst +++ /dev/null @@ -1,7 +0,0 @@ -kind: cmake -description: Some kinda cmake element - -variables: - generator: Ninja - install-root: /custom/install/root - prefix: /opt diff --git a/tests/format/variables/overrides/distutils.bst b/tests/format/variables/overrides/distutils.bst deleted file mode 100644 index 624f775a5..000000000 --- a/tests/format/variables/overrides/distutils.bst +++ /dev/null @@ -1,6 +0,0 @@ -kind: distutils -description: Some kinda distutils element - -variables: - install-root: /custom/install/root - prefix: /opt diff --git a/tests/format/variables/overrides/makemaker.bst b/tests/format/variables/overrides/makemaker.bst deleted file mode 100644 index faa5f365f..000000000 --- a/tests/format/variables/overrides/makemaker.bst +++ /dev/null @@ -1,6 +0,0 @@ -kind: makemaker -description: Some kinda makemaker element - -variables: - install-root: /custom/install/root - prefix: /opt diff --git a/tests/format/variables/overrides/modulebuild.bst b/tests/format/variables/overrides/modulebuild.bst deleted file mode 100644 index db50057e2..000000000 --- a/tests/format/variables/overrides/modulebuild.bst +++ /dev/null @@ -1,6 +0,0 @@ -kind: modulebuild -description: Some kinda modulebuild element - -variables: - install-root: /custom/install/root - prefix: /opt diff --git a/tests/format/variables/overrides/project.conf b/tests/format/variables/overrides/project.conf index e4854a646..2027cc27a 100644 --- a/tests/format/variables/overrides/project.conf +++ b/tests/format/variables/overrides/project.conf @@ -1,12 +1,3 @@ # Basic project configuration that doesnt override anything # name: pony -plugins: -- origin: pip - package-name: bst-plugins-experimental - elements: - cmake: 0 - distutils: 0 - makemaker: 0 - modulebuild: 0 - qmake: 0 diff --git a/tests/format/variables/overrides/qmake.bst b/tests/format/variables/overrides/qmake.bst deleted file mode 100644 index 5dff2c944..000000000 --- a/tests/format/variables/overrides/qmake.bst +++ /dev/null @@ -1,6 +0,0 @@ -kind: qmake -description: Some kinda qmake element - -variables: - install-root: /custom/install/root - prefix: /opt |