summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Coldrick <thomas.coldrick@codethink.co.uk>2019-08-21 10:42:14 +0100
committerThomas Coldrick <thomas.coldrick@codethink.co.uk>2019-08-21 13:44:39 +0100
commit97ab46e879c9ae81a2eadbfd408a587539593683 (patch)
tree8f5017fa6bf01db683712cba81b542444e9fa27a
parentd20d296ad8eaafc8914c288d8f21c65587e6c687 (diff)
downloadbuildstream-97ab46e879c9ae81a2eadbfd408a587539593683.tar.gz
tests: Remove integration tests for moved plugins
Several plugins have been moved to bst-plugins-experimental, and so to avoid an external dependency we should remove their integration tests. These integration tests will still be run in bst-plugins-experimental, once testing is sorted out.
-rwxr-xr-xtests/integration/base/generate-base.sh3
-rw-r--r--tests/integration/cmake.py68
-rw-r--r--tests/integration/make.py52
-rw-r--r--tests/integration/project/elements/cmake/cmakeconfroothello.bst15
-rw-r--r--tests/integration/project/elements/cmake/cmakehello.bst10
-rw-r--r--tests/integration/project/elements/make/makehello.bst10
-rw-r--r--tests/integration/project/files/cmakehello.tar.gzbin10240 -> 0 bytes
-rw-r--r--tests/integration/project/files/makehello.tar.gzbin432 -> 0 bytes
-rw-r--r--tests/integration/project/project.conf6
9 files changed, 0 insertions, 164 deletions
diff --git a/tests/integration/base/generate-base.sh b/tests/integration/base/generate-base.sh
index 338c6d98f..7edf0e80d 100755
--- a/tests/integration/base/generate-base.sh
+++ b/tests/integration/base/generate-base.sh
@@ -53,9 +53,6 @@ run "ln -s /usr/bin/tcc /usr/bin/cc"
# Install stuff for tests/integration/autotools
run "apk add autoconf automake"
-# Install stuff for tests/integration/cmake
-run "apk add cmake"
-
# Install stuff for tests/integration/pip
run "apk add python3"
diff --git a/tests/integration/cmake.py b/tests/integration/cmake.py
deleted file mode 100644
index 0fe91ed6d..000000000
--- a/tests/integration/cmake.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# Pylint doesn't play well with fixtures and dependency injection from pytest
-# pylint: disable=redefined-outer-name
-
-import os
-import pytest
-
-from buildstream.testing import cli_integration as cli # pylint: disable=unused-import
-from buildstream.testing.integration import assert_contains
-from buildstream.testing._utils.site import HAVE_SANDBOX
-
-
-pytestmark = pytest.mark.integration
-
-
-DATA_DIR = os.path.join(
- os.path.dirname(os.path.realpath(__file__)),
- "project"
-)
-
-
-@pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
-def test_cmake_build(cli, datafiles):
- project = str(datafiles)
- checkout = os.path.join(cli.directory, 'checkout')
- element_name = 'cmake/cmakehello.bst'
-
- result = cli.run(project=project, args=['build', element_name])
- assert result.exit_code == 0
-
- result = cli.run(project=project, args=['artifact', 'checkout', element_name, '--directory', checkout])
- assert result.exit_code == 0
-
- assert_contains(checkout, ['/usr', '/usr/bin', '/usr/bin/hello'])
-
-
-@pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
-@pytest.mark.xfail(HAVE_SANDBOX == 'buildbox', reason='Not working with BuildBox', strict=True)
-def test_cmake_confroot_build(cli, datafiles):
- project = str(datafiles)
- checkout = os.path.join(cli.directory, 'checkout')
- element_name = 'cmake/cmakeconfroothello.bst'
-
- result = cli.run(project=project, args=['build', element_name])
- assert result.exit_code == 0
-
- result = cli.run(project=project, args=['artifact', 'checkout', element_name, '--directory', checkout])
- assert result.exit_code == 0
-
- assert_contains(checkout, ['/usr', '/usr/bin', '/usr/bin/hello'])
-
-
-@pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
-def test_cmake_run(cli, datafiles):
- project = str(datafiles)
- element_name = 'cmake/cmakehello.bst'
-
- result = cli.run(project=project, args=['build', element_name])
- assert result.exit_code == 0
-
- result = cli.run(project=project, args=['shell', element_name, '/usr/bin/hello'])
- assert result.exit_code == 0
-
- assert result.output == """Hello World!
-This is hello.
-"""
diff --git a/tests/integration/make.py b/tests/integration/make.py
deleted file mode 100644
index 664e7ca7a..000000000
--- a/tests/integration/make.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# Pylint doesn't play well with fixtures and dependency injection from pytest
-# pylint: disable=redefined-outer-name
-
-import os
-import pytest
-
-from buildstream.testing import cli_integration as cli # pylint: disable=unused-import
-from buildstream.testing.integration import assert_contains
-from buildstream.testing._utils.site import HAVE_SANDBOX
-
-
-pytestmark = pytest.mark.integration
-
-
-DATA_DIR = os.path.join(
- os.path.dirname(os.path.realpath(__file__)),
- "project"
-)
-
-
-# Test that a make build 'works' - we use the make sample
-# makehello project for this.
-@pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
-def test_make_build(cli, datafiles):
- project = str(datafiles)
- checkout = os.path.join(cli.directory, 'checkout')
- element_name = 'make/makehello.bst'
-
- result = cli.run(project=project, args=['build', element_name])
- assert result.exit_code == 0
-
- result = cli.run(project=project, args=['artifact', 'checkout', element_name, '--directory', checkout])
- assert result.exit_code == 0
-
- assert_contains(checkout, ['/usr', '/usr/bin',
- '/usr/bin/hello'])
-
-
-# Test running an executable built with make
-@pytest.mark.datafiles(DATA_DIR)
-@pytest.mark.skipif(not HAVE_SANDBOX, reason='Only available with a functioning sandbox')
-def test_make_run(cli, datafiles):
- project = str(datafiles)
- element_name = 'make/makehello.bst'
-
- result = cli.run(project=project, args=['build', element_name])
- assert result.exit_code == 0
-
- result = cli.run(project=project, args=['shell', element_name, '/usr/bin/hello'])
- assert result.exit_code == 0
- assert result.output == 'Hello, world\n'
diff --git a/tests/integration/project/elements/cmake/cmakeconfroothello.bst b/tests/integration/project/elements/cmake/cmakeconfroothello.bst
deleted file mode 100644
index cd33dee99..000000000
--- a/tests/integration/project/elements/cmake/cmakeconfroothello.bst
+++ /dev/null
@@ -1,15 +0,0 @@
-kind: cmake
-description: Cmake test
-
-depends:
- - base.bst
-
-sources:
- - kind: tar
- directory: Source
- url: project_dir:/files/cmakehello.tar.gz
- ref: 508266f40dbc5875293bd24c4e50a9eb6b88cbacab742033f7b92f8c087b64e5
-
-variables:
- conf-root: "%{build-root}/Source"
- command-subdir: build
diff --git a/tests/integration/project/elements/cmake/cmakehello.bst b/tests/integration/project/elements/cmake/cmakehello.bst
deleted file mode 100644
index c5fe496ad..000000000
--- a/tests/integration/project/elements/cmake/cmakehello.bst
+++ /dev/null
@@ -1,10 +0,0 @@
-kind: cmake
-description: Cmake test
-
-depends:
- - base.bst
-
-sources:
- - kind: tar
- url: project_dir:/files/cmakehello.tar.gz
- ref: 508266f40dbc5875293bd24c4e50a9eb6b88cbacab742033f7b92f8c087b64e5
diff --git a/tests/integration/project/elements/make/makehello.bst b/tests/integration/project/elements/make/makehello.bst
deleted file mode 100644
index 4b5c5ac3b..000000000
--- a/tests/integration/project/elements/make/makehello.bst
+++ /dev/null
@@ -1,10 +0,0 @@
-kind: make
-description: make test
-
-depends:
-- base.bst
-
-sources:
-- kind: tar
- url: project_dir:/files/makehello.tar.gz
- ref: fd342a36503a0a0dd37b81ddb4d2b78bd398d912d813339e0de44a6b6c393b8e
diff --git a/tests/integration/project/files/cmakehello.tar.gz b/tests/integration/project/files/cmakehello.tar.gz
deleted file mode 100644
index 54d950575..000000000
--- a/tests/integration/project/files/cmakehello.tar.gz
+++ /dev/null
Binary files differ
diff --git a/tests/integration/project/files/makehello.tar.gz b/tests/integration/project/files/makehello.tar.gz
deleted file mode 100644
index d0edcb29c..000000000
--- a/tests/integration/project/files/makehello.tar.gz
+++ /dev/null
Binary files differ
diff --git a/tests/integration/project/project.conf b/tests/integration/project/project.conf
index 635c73a7f..ddfe47b6d 100644
--- a/tests/integration/project/project.conf
+++ b/tests/integration/project/project.conf
@@ -21,9 +21,3 @@ split-rules:
/tests
- |
/tests/*
-plugins:
-- origin: pip
- package-name: bst-plugins-experimental
- elements:
- cmake: 0
- make: 0