You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by no...@apache.org on 2020/12/29 12:54:43 UTC
[buildstream] 01/08: Tests: Remove bst-plugins-experimental
dependency
This is an automated email from the ASF dual-hosted git repository.
not-in-ldap pushed a commit to branch coldtom/external-plugins
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 1aae25a9c15fed48bd12edc395b4cbf49f298860
Author: Thomas Coldrick <th...@codethink.co.uk>
AuthorDate: Thu Sep 12 15:25:17 2019 +0100
Tests: Remove bst-plugins-experimental dependency
This stops the tests from being interlinked for BuildStream itself.
---
tests/format/variables.py | 18 ------------------
tests/format/variables/defaults/cmake.bst | 2 --
tests/format/variables/defaults/distutils.bst | 2 --
tests/format/variables/defaults/makemaker.bst | 2 --
tests/format/variables/defaults/modulebuild.bst | 2 --
tests/format/variables/defaults/project.conf | 10 ----------
tests/format/variables/defaults/qmake.bst | 2 --
tests/format/variables/overrides/cmake.bst | 7 -------
tests/format/variables/overrides/distutils.bst | 6 ------
tests/format/variables/overrides/makemaker.bst | 6 ------
tests/format/variables/overrides/modulebuild.bst | 6 ------
tests/format/variables/overrides/project.conf | 9 ---------
tests/format/variables/overrides/qmake.bst | 6 ------
tox.ini | 1 -
14 files changed, 79 deletions(-)
diff --git a/tests/format/variables.py b/tests/format/variables.py
index 4610e03..5c4c94b 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 4e7db66..0000000
--- 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 2354bea..0000000
--- 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 2205cec..0000000
--- 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 5b5e9b9..0000000
--- 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 029f07c..2027cc2 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 5320976..0000000
--- 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 ceea2bb..0000000
--- 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 624f775..0000000
--- 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 faa5f36..0000000
--- 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 db50057..0000000
--- 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 e4854a6..2027cc2 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 5dff2c9..0000000
--- 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
diff --git a/tox.ini b/tox.ini
index a00197d..309e0cc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -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