diff options
author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2017-10-25 12:34:59 +0100 |
---|---|---|
committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2017-10-26 08:36:58 +0000 |
commit | 0a625d1f74848b52d91e02b063e43468e10de779 (patch) | |
tree | 8f1e72b69012cc4db4d63ce05a0c86189438c74d | |
parent | 47bf951c2ade22d1bc2120c49a732345b05f26d0 (diff) | |
download | buildstream-0a625d1f74848b52d91e02b063e43468e10de779.tar.gz |
Remove dpkg-build test from integration-tests
It has been moved to an external repository.
18 files changed, 0 insertions, 237 deletions
diff --git a/integration-tests/dpkg-build-test/.bst/workspaces.yml b/integration-tests/dpkg-build-test/.bst/workspaces.yml deleted file mode 100644 index e69de29bb..000000000 --- a/integration-tests/dpkg-build-test/.bst/workspaces.yml +++ /dev/null diff --git a/integration-tests/dpkg-build-test/elements/dependencies/base-configure.bst b/integration-tests/dpkg-build-test/elements/dependencies/base-configure.bst deleted file mode 100644 index deff782de..000000000 --- a/integration-tests/dpkg-build-test/elements/dependencies/base-configure.bst +++ /dev/null @@ -1,28 +0,0 @@ -kind: script -depends: -- filename: dependencies/base-system.bst - type: build - -variables: - install-root: / - -config: - - commands: - - | - # Avoid some chowns which fail at dpkg configure time - # - mv /bin/chown /bin/chown.real - ln -s true /bin/chown - - - | - # This is expected to fail, but will configure everything we need - # at least for the purpose of building, other dpkg scripts which - # require real root privileges will always fail here. - DEBIAN_FRONTEND=noninteractive dpkg --configure -a --abort-after=100000 || exit 0 - - - | - # Restore chown - # - rm -f /bin/chown - mv /bin/chown.real /bin/chown diff --git a/integration-tests/dpkg-build-test/elements/dependencies/base-platform.bst b/integration-tests/dpkg-build-test/elements/dependencies/base-platform.bst deleted file mode 100644 index a04a5b81c..000000000 --- a/integration-tests/dpkg-build-test/elements/dependencies/base-platform.bst +++ /dev/null @@ -1,19 +0,0 @@ -kind: import -description: Import the base freedesktop platform -sources: -- kind: ostree - url: gnomesdk:repo/ - gpg-key: keys/gnome-sdk.gpg - (?): - - arch == "x86_64": - track: runtime/org.freedesktop.BasePlatform/x86_64/1.4 - ref: c9d09b7250a12ef09d95952fc4f49a35e5f8c2c1dd7141b7eeada4069e6f6576 - - arch == "i386": - track: runtime/org.freedesktop.BasePlatform/i386/1.4 - ref: 27ebae91839a454596a273391b0e53063eaa8aca4fc9cb64654582bfbc338c96 -config: - source: files -public: - bst: - integration-commands: - - ldconfig diff --git a/integration-tests/dpkg-build-test/elements/dependencies/base-system.bst b/integration-tests/dpkg-build-test/elements/dependencies/base-system.bst deleted file mode 100644 index d19a2b3b2..000000000 --- a/integration-tests/dpkg-build-test/elements/dependencies/base-system.bst +++ /dev/null @@ -1,13 +0,0 @@ -kind: manual -depends: -- filename: dependencies/base-platform.bst - type: build -sources: -- kind: git - url: https://gitlab.com/BuildStream/buildstream-sysroots.git - track: dpkg-build - ref: ecf14954e4298ce5495f701464339162fad73f30 -config: - install-commands: - - xz -d dpkg-build-sysroot.tar.xz - - tar xf dpkg-build-sysroot.tar -C %{install-root} --no-same-owner diff --git a/integration-tests/dpkg-build-test/elements/dpkg-build-test.bst b/integration-tests/dpkg-build-test/elements/dpkg-build-test.bst deleted file mode 100644 index 76b1104b8..000000000 --- a/integration-tests/dpkg-build-test/elements/dpkg-build-test.bst +++ /dev/null @@ -1,10 +0,0 @@ -kind: dpkg_build -description: dpkg-build test - -depends: -- filename: dependencies/base-configure.bst - type: build - -sources: -- kind: local - path: src diff --git a/integration-tests/dpkg-build-test/elements/dpkg-deploy-test.bst b/integration-tests/dpkg-build-test/elements/dpkg-deploy-test.bst deleted file mode 100644 index ce277e4d6..000000000 --- a/integration-tests/dpkg-build-test/elements/dpkg-deploy-test.bst +++ /dev/null @@ -1,12 +0,0 @@ -kind: dpkg_deploy -description: dpkg-deploy test - -depends: -- filename: dependencies/base-configure.bst - type: build -- filename: dpkg-build-test.bst - type: build - -config: - base: dependencies/base-configure.bst - input: dpkg-build-test.bst diff --git a/integration-tests/dpkg-build-test/expected/dpkg-build-test/usr/share/doc/test/changelog.gz b/integration-tests/dpkg-build-test/expected/dpkg-build-test/usr/share/doc/test/changelog.gz Binary files differdeleted file mode 100644 index bf2252c3c..000000000 --- a/integration-tests/dpkg-build-test/expected/dpkg-build-test/usr/share/doc/test/changelog.gz +++ /dev/null diff --git a/integration-tests/dpkg-build-test/expected/dpkg-build-test/usr/share/foo b/integration-tests/dpkg-build-test/expected/dpkg-build-test/usr/share/foo deleted file mode 100644 index e69de29bb..000000000 --- a/integration-tests/dpkg-build-test/expected/dpkg-build-test/usr/share/foo +++ /dev/null diff --git a/integration-tests/dpkg-build-test/expected/dpkg-deploy-test/test_0.1_amd64.deb b/integration-tests/dpkg-build-test/expected/dpkg-deploy-test/test_0.1_amd64.deb Binary files differdeleted file mode 100755 index a10c4e673..000000000 --- a/integration-tests/dpkg-build-test/expected/dpkg-deploy-test/test_0.1_amd64.deb +++ /dev/null diff --git a/integration-tests/dpkg-build-test/keys/gnome-sdk.gpg b/integration-tests/dpkg-build-test/keys/gnome-sdk.gpg Binary files differdeleted file mode 100644 index 8434b686c..000000000 --- a/integration-tests/dpkg-build-test/keys/gnome-sdk.gpg +++ /dev/null diff --git a/integration-tests/dpkg-build-test/project.conf b/integration-tests/dpkg-build-test/project.conf deleted file mode 100644 index 46985b075..000000000 --- a/integration-tests/dpkg-build-test/project.conf +++ /dev/null @@ -1,21 +0,0 @@ -# Import-test BuildStream project configuration. - -# Project name -# -name: script-test - -aliases: - gnomesdk: https://sdk.gnome.org/ - -# Base project relative element path, elements will be loaded -# from this base. - -element-path: elements - -options: - arch: - type: arch - description: The machine architecture - values: - - x86_64 - - i386 diff --git a/integration-tests/dpkg-build-test/run-dpkg-build-test.sh b/integration-tests/dpkg-build-test/run-dpkg-build-test.sh deleted file mode 100755 index eb78c3f28..000000000 --- a/integration-tests/dpkg-build-test/run-dpkg-build-test.sh +++ /dev/null @@ -1,110 +0,0 @@ -#!/bin/bash -# -# A script to run a BuildStream test case. - - -TEST_DIR="elements/" -RESULTS="results/" -EXPECTED="expected/" - -set -eu - -# compare_debs -# -# Compares results to expected files for every .deb file found -# -# Args: -# test_name ($1) - The name of the test, for error reporting -# result_dir ($2) - The directory containing result files -# expected_dir ($3) - The directory containing expected files -# -# Returns: -# 1 if the debs are all equivalent, 0 otherwise. -compare_debs () ( - set +e - - local test_name="$1" - local result_dir="$2" - local expected_dir="$3" - - # First, expected and result must have the same .deb file lists - diff <(cd $result_dir/$test_name && find . -name "*.deb" | sort) <(cd $expected_dir/$test_name && find . -name "*.deb" | sort) - if [ "$?" -ne 0 ] - then - printf "%-34s ${RED}%9s${END}\n" "$test_name" "failed" - return 1 - fi - - for deb in $(cd $result_dir/$test_name && find . -name "*.deb"); do - result_deb="$result_dir/$test_name/$deb" - expected_deb="$expected_dir/$test_name/$deb" - diff <(dpkg-deb -c $result_deb | tr -s ' ' | cut -d' ' -f6) <(dpkg-deb -c $expected_deb | tr -s ' ' | cut -d' ' -f6) - if [ "$?" -ne 0 ] - then - printf "%-34s ${RED}%9s${END}\n" "$test_name" "failed" - return 1 - fi - done - printf "%-34s ${GREEN}%9s${END}\n" "$test_name" "succeeded" - return 0 -) - -# run_test -# -# Run tests for this test case. -# -# This should create a set of directories that match the directories -# in 'results/', as well as a log of the BuildStream output in -# 'test_log.log'. -# -run_test () { - local element - local elements - local element_name - local test_dir - local bst_file - local tar_file - - local successes=0 - local total=0 - local exit - - source ../lib.sh - - mkdir -p "$TEST_DIR" - elements="$(find "$TEST_DIR" -maxdepth 1 -type f)" - - for element in $elements; - do - total=$((total + 1)) - - element_name="$(basename "$element")" - element_name="${element_name%.*}" - - test_dir="$RESULTS/$element_name" - - echo "Running test '$element_name'" - - bst_with_flags build "$element_name".bst - echo "Built $element_name" - bst_with_flags checkout "$element_name".bst "$test_dir" - - exit=0 - if [ "$element" == "dpkg-deploy-test.bst" ]; then - compare_debs "$element_name" "$RESULTS" "$EXPECTED" || exit=$? - else - compare_results_no_contents "$element_name" "$RESULTS" "$EXPECTED" || exit=$? - fi - if [ $exit == 0 ] - then - successes=$((successes + 1)) - fi - done - - if [ $total != $successes ] - then - return 1 - fi -} - -run_test "$@" diff --git a/integration-tests/dpkg-build-test/src/Makefile b/integration-tests/dpkg-build-test/src/Makefile deleted file mode 100644 index a14e4a7a7..000000000 --- a/integration-tests/dpkg-build-test/src/Makefile +++ /dev/null @@ -1,9 +0,0 @@ - -build: - $(shell touch foo) - -install: build - install -d $(DESTDIR)/usr/share - install -m 0644 foo $(DESTDIR)/usr/share/foo - -all: build install diff --git a/integration-tests/dpkg-build-test/src/debian/changelog b/integration-tests/dpkg-build-test/src/debian/changelog deleted file mode 100644 index 944fa6662..000000000 --- a/integration-tests/dpkg-build-test/src/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -test (0.1) unstable; urgency=medium - - * Test - - -- Testy McTesterson <testy.mctesterson@example.org> Mon 17 Jul 2017 14:14:01 +0100 diff --git a/integration-tests/dpkg-build-test/src/debian/compat b/integration-tests/dpkg-build-test/src/debian/compat deleted file mode 100644 index f599e28b8..000000000 --- a/integration-tests/dpkg-build-test/src/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/integration-tests/dpkg-build-test/src/debian/control b/integration-tests/dpkg-build-test/src/debian/control deleted file mode 100644 index 095cd661c..000000000 --- a/integration-tests/dpkg-build-test/src/debian/control +++ /dev/null @@ -1,5 +0,0 @@ -Source: test - -Package: test -Architecture: any -Description: A test diff --git a/integration-tests/dpkg-build-test/src/debian/rules b/integration-tests/dpkg-build-test/src/debian/rules deleted file mode 100755 index cbe925d75..000000000 --- a/integration-tests/dpkg-build-test/src/debian/rules +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/make -f -%: - dh $@ diff --git a/integration-tests/dpkg-build-test/src/debian/test.install b/integration-tests/dpkg-build-test/src/debian/test.install deleted file mode 100644 index da897999b..000000000 --- a/integration-tests/dpkg-build-test/src/debian/test.install +++ /dev/null @@ -1 +0,0 @@ -foo usr/share |