diff options
author | Thomas Coldrick <thomas.coldrick@codethink.co.uk> | 2019-09-12 15:25:17 +0100 |
---|---|---|
committer | Thomas Coldrick <othko97@gmail.com> | 2019-10-15 19:09:35 +0100 |
commit | 1aae25a9c15fed48bd12edc395b4cbf49f298860 (patch) | |
tree | f34736ae09c7346c458c860a56b1c4adc91e4dc5 | |
parent | 1d4703b5dbed7bf2f4af0c11c49dfd43f07bba9e (diff) | |
download | buildstream-1aae25a9c15fed48bd12edc395b4cbf49f298860.tar.gz |
Tests: Remove bst-plugins-experimental dependency
This stops the tests from being interlinked for BuildStream itself.
-rw-r--r-- | tests/format/variables.py | 18 | ||||
-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 | ||||
-rw-r--r-- | tox.ini | 1 |
14 files changed, 0 insertions, 79 deletions
diff --git a/tests/format/variables.py b/tests/format/variables.py index 4610e039f..5c4c94b3b 100644 --- a/tests/format/variables.py +++ b/tests/format/variables.py @@ -31,15 +31,6 @@ def print_warning(msg): ############################################################### @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"), ]) @pytest.mark.datafiles(os.path.join(DATA_DIR, 'defaults')) def test_defaults(cli, datafiles, target, varname, expected): @@ -57,15 +48,6 @@ def test_defaults(cli, datafiles, 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" + - "-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"), ]) @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 @@ -30,7 +30,6 @@ deps = py{35,36,37}: -rrequirements/requirements.txt py{35,36,37}: -rrequirements/dev-requirements.txt py{35,36,37}: -rrequirements/plugin-requirements.txt - git+https://gitlab.com/BuildStream/bst-plugins-experimental.git@5b004e5850ab0e987c00c681b2c768f6ae02586b # Only require coverage and pytest-cov when using it !nocover: -rrequirements/cov-requirements.txt |