diff options
| author | Tristan Maat <tm@tlater.net> | 2018-01-11 08:26:12 +0000 |
|---|---|---|
| committer | Tristan Maat <tristan.maat@codethink.co.uk> | 2018-02-07 16:14:15 +0000 |
| commit | 831a4dfcf1d3149a675b35922a16ee270408e3ac (patch) | |
| tree | dcb12889e9585a13fd90fb334cef13a707a0788c | |
| parent | eeed9f62eec752e3071211ccbdca1139e6e3448b (diff) | |
| download | buildstream-831a4dfcf1d3149a675b35922a16ee270408e3ac.tar.gz | |
Remove old integration tests
187 files changed, 0 insertions, 2341 deletions
diff --git a/integration-tests/autotools-test/elements/amhello-run.bst b/integration-tests/autotools-test/elements/amhello-run.bst deleted file mode 100644 index bd6c903b0..000000000 --- a/integration-tests/autotools-test/elements/amhello-run.bst +++ /dev/null @@ -1,12 +0,0 @@ -kind: script -description: Run autotools-built binary - -depends: - - filename: dependencies/base-platform.bst - type: build - - filename: amhello.bst - type: build - -config: - commands: - - "/usr/bin/hello > /buildstream/install/test" diff --git a/integration-tests/autotools-test/elements/amhello.bst b/integration-tests/autotools-test/elements/amhello.bst deleted file mode 100644 index 5dc13b4ac..000000000 --- a/integration-tests/autotools-test/elements/amhello.bst +++ /dev/null @@ -1,13 +0,0 @@ -kind: autotools -description: Autotools test - -depends: -- filename: dependencies/base-platform.bst - type: build -- filename: dependencies/base-sdk.bst - type: build - -sources: -- kind: tar - url: file:///amhello.tar.gz - ref: 3aa3c2bf7a488fea24303c4d98d1b5c0a72734f61615b935cf62e4e126b127d2 diff --git a/integration-tests/autotools-test/elements/dependencies/base-platform.bst b/integration-tests/autotools-test/elements/dependencies/base-platform.bst deleted file mode 100644 index a04a5b81c..000000000 --- a/integration-tests/autotools-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/autotools-test/elements/dependencies/base-sdk.bst b/integration-tests/autotools-test/elements/dependencies/base-sdk.bst deleted file mode 100644 index a1b6c5856..000000000 --- a/integration-tests/autotools-test/elements/dependencies/base-sdk.bst +++ /dev/null @@ -1,16 +0,0 @@ -kind: import -description: Import the base freedesktop SDK -sources: -- kind: ostree - url: gnomesdk:repo/ - gpg-key: keys/gnome-sdk.gpg - (?): - - arch == "x86_64": - track: runtime/org.freedesktop.BaseSdk/x86_64/1.4 - ref: 0d9d255d56b08aeaaffb1c820eef85266eb730cb5667e50681185ccf5cd7c882 - - arch == "i386": - track: runtime/org.freedesktop.BaseSdk/i386/1.4 - ref: 16036b747c1ec8e7fe291f5b1f667cb942f0267d08fcad962e9b7627d6cf1981 -config: - source: files - target: usr diff --git a/integration-tests/autotools-test/expected/amhello-run/test b/integration-tests/autotools-test/expected/amhello-run/test deleted file mode 100644 index cb3ea7cb8..000000000 --- a/integration-tests/autotools-test/expected/amhello-run/test +++ /dev/null @@ -1,2 +0,0 @@ -Hello World! -This is amhello 1.0. diff --git a/integration-tests/autotools-test/expected/amhello/usr/bin/hello b/integration-tests/autotools-test/expected/amhello/usr/bin/hello Binary files differdeleted file mode 100755 index 0a6eb4149..000000000 --- a/integration-tests/autotools-test/expected/amhello/usr/bin/hello +++ /dev/null diff --git a/integration-tests/autotools-test/expected/amhello/usr/lib/debug/hello b/integration-tests/autotools-test/expected/amhello/usr/lib/debug/hello Binary files differdeleted file mode 100644 index 4f3ef879f..000000000 --- a/integration-tests/autotools-test/expected/amhello/usr/lib/debug/hello +++ /dev/null diff --git a/integration-tests/autotools-test/expected/amhello/usr/share/doc/amhello/README b/integration-tests/autotools-test/expected/amhello/usr/share/doc/amhello/README deleted file mode 100644 index d24723a81..000000000 --- a/integration-tests/autotools-test/expected/amhello/usr/share/doc/amhello/README +++ /dev/null @@ -1,2 +0,0 @@ -This is a demonstration package for GNU Automake. -Type `info Automake' to read the Automake manual. diff --git a/integration-tests/autotools-test/keys/gnome-sdk.gpg b/integration-tests/autotools-test/keys/gnome-sdk.gpg Binary files differdeleted file mode 100644 index 8434b686c..000000000 --- a/integration-tests/autotools-test/keys/gnome-sdk.gpg +++ /dev/null diff --git a/integration-tests/autotools-test/project.conf b/integration-tests/autotools-test/project.conf deleted file mode 100644 index 71e562b67..000000000 --- a/integration-tests/autotools-test/project.conf +++ /dev/null @@ -1,22 +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/autotools-test/run-autotools-test.sh b/integration-tests/autotools-test/run-autotools-test.sh deleted file mode 100644 index c55b94192..000000000 --- a/integration-tests/autotools-test/run-autotools-test.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -# -# A script to run a BuildStream test case. - - -TEST_DIR="elements/" -RESULTS="results/" -EXPECTED="expected/" - -set -eu - -# 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 - - tar_file="$(dirname "$(readlink -f "$0")")/src/amhello.tar.gz" - bst_file="$(dirname "$(readlink -f "$0")")/elements/amhello.bst" - - patch_file_location "$bst_file" "$tar_file" - - 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 - bst_checkout "$element_name".bst "$test_dir" - - exit=0 - compare_results "$element_name" "$RESULTS" "$EXPECTED" || exit=$? - if [ $exit == 0 ] - then - successes=$((successes + 1)) - fi - done - - if [ $total != $successes ] - then - return 1 - fi -} - -run_test "$@" diff --git a/integration-tests/autotools-test/src/amhello.tar.gz b/integration-tests/autotools-test/src/amhello.tar.gz Binary files differdeleted file mode 100644 index 2850f31aa..000000000 --- a/integration-tests/autotools-test/src/amhello.tar.gz +++ /dev/null diff --git a/integration-tests/bzr-test/elements/bzr-test.bst b/integration-tests/bzr-test/elements/bzr-test.bst deleted file mode 100644 index 25349ca0c..000000000 --- a/integration-tests/bzr-test/elements/bzr-test.bst +++ /dev/null @@ -1,19 +0,0 @@ -kind: manual -description: bzr test - -depends: -- filename: dependencies/base-platform.bst - type: build -- filename: dependencies/base-sdk.bst - type: build - -sources: -- kind: bzr - url: file:///src - track: trunk - - ref: '2' -config: - install-commands: - - "mkdir -p %{install-root}" - - "./test" diff --git a/integration-tests/bzr-test/elements/dependencies/base-platform.bst b/integration-tests/bzr-test/elements/dependencies/base-platform.bst deleted file mode 100644 index a04a5b81c..000000000 --- a/integration-tests/bzr-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/bzr-test/elements/dependencies/base-sdk.bst b/integration-tests/bzr-test/elements/dependencies/base-sdk.bst deleted file mode 100644 index a1b6c5856..000000000 --- a/integration-tests/bzr-test/elements/dependencies/base-sdk.bst +++ /dev/null @@ -1,16 +0,0 @@ -kind: import -description: Import the base freedesktop SDK -sources: -- kind: ostree - url: gnomesdk:repo/ - gpg-key: keys/gnome-sdk.gpg - (?): - - arch == "x86_64": - track: runtime/org.freedesktop.BaseSdk/x86_64/1.4 - ref: 0d9d255d56b08aeaaffb1c820eef85266eb730cb5667e50681185ccf5cd7c882 - - arch == "i386": - track: runtime/org.freedesktop.BaseSdk/i386/1.4 - ref: 16036b747c1ec8e7fe291f5b1f667cb942f0267d08fcad962e9b7627d6cf1981 -config: - source: files - target: usr diff --git a/integration-tests/bzr-test/expected/bzr-test/test b/integration-tests/bzr-test/expected/bzr-test/test deleted file mode 100644 index 9daeafb98..000000000 --- a/integration-tests/bzr-test/expected/bzr-test/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/integration-tests/bzr-test/keys/gnome-sdk.gpg b/integration-tests/bzr-test/keys/gnome-sdk.gpg Binary files differdeleted file mode 100644 index 8434b686c..000000000 --- a/integration-tests/bzr-test/keys/gnome-sdk.gpg +++ /dev/null diff --git a/integration-tests/bzr-test/project.conf b/integration-tests/bzr-test/project.conf deleted file mode 100644 index 46985b075..000000000 --- a/integration-tests/bzr-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/bzr-test/run-bzr-test.sh b/integration-tests/bzr-test/run-bzr-test.sh deleted file mode 100644 index 2194cb907..000000000 --- a/integration-tests/bzr-test/run-bzr-test.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/bash -# -# A script to run a BuildStream test case. - - -TEST_DIR="elements/" -RESULTS="results/" -EXPECTED="expected/" - -set -eu - -# 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 - - tar_file="$(dirname "$(readlink -f "$0")")/src" - bst_file="$(dirname "$(readlink -f "$0")")/elements/bzr-test.bst" - - patch_file_location "$bst_file" "$tar_file" - - 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 - bst_checkout "$element_name".bst "$test_dir" - - exit=0 - compare_results "$element_name" "$RESULTS" "$EXPECTED" || exit=$? - if [ $exit == 0 ] - then - successes=$((successes + 1)) - fi - done - - if [ $total != $successes ] - then - return 1 - fi -} - -run_test "$@" diff --git a/integration-tests/bzr-test/src/.bzr/README b/integration-tests/bzr-test/src/.bzr/README deleted file mode 100644 index f82dc1c3c..000000000 --- a/integration-tests/bzr-test/src/.bzr/README +++ /dev/null @@ -1,3 +0,0 @@ -This is a Bazaar control directory. -Do not change any files in this directory. -See http://bazaar.canonical.com/ for more information about Bazaar. diff --git a/integration-tests/bzr-test/src/.bzr/branch-format b/integration-tests/bzr-test/src/.bzr/branch-format deleted file mode 100644 index 9eb09b735..000000000 --- a/integration-tests/bzr-test/src/.bzr/branch-format +++ /dev/null @@ -1 +0,0 @@ -Bazaar-NG meta directory, format 1 diff --git a/integration-tests/bzr-test/src/.bzr/repository/format b/integration-tests/bzr-test/src/.bzr/repository/format deleted file mode 100644 index b200528b2..000000000 --- a/integration-tests/bzr-test/src/.bzr/repository/format +++ /dev/null @@ -1 +0,0 @@ -Bazaar repository format 2a (needs bzr 1.16 or later) diff --git a/integration-tests/bzr-test/src/.bzr/repository/indices/6fad9644bfab38c89a8c6dbd6bdcaec1.cix b/integration-tests/bzr-test/src/.bzr/repository/indices/6fad9644bfab38c89a8c6dbd6bdcaec1.cix Binary files differdeleted file mode 100644 index 1c028a9e4..000000000 --- a/integration-tests/bzr-test/src/.bzr/repository/indices/6fad9644bfab38c89a8c6dbd6bdcaec1.cix +++ /dev/null diff --git a/integration-tests/bzr-test/src/.bzr/repository/indices/6fad9644bfab38c89a8c6dbd6bdcaec1.iix b/integration-tests/bzr-test/src/.bzr/repository/indices/6fad9644bfab38c89a8c6dbd6bdcaec1.iix Binary files differdeleted file mode 100644 index 1196e82cc..000000000 --- a/integration-tests/bzr-test/src/.bzr/repository/indices/6fad9644bfab38c89a8c6dbd6bdcaec1.iix +++ /dev/null diff --git a/integration-tests/bzr-test/src/.bzr/repository/indices/6fad9644bfab38c89a8c6dbd6bdcaec1.rix b/integration-tests/bzr-test/src/.bzr/repository/indices/6fad9644bfab38c89a8c6dbd6bdcaec1.rix Binary files differdeleted file mode 100644 index 6fbcddcea..000000000 --- a/integration-tests/bzr-test/src/.bzr/repository/indices/6fad9644bfab38c89a8c6dbd6bdcaec1.rix +++ /dev/null diff --git a/integration-tests/bzr-test/src/.bzr/repository/indices/6fad9644bfab38c89a8c6dbd6bdcaec1.six b/integration-tests/bzr-test/src/.bzr/repository/indices/6fad9644bfab38c89a8c6dbd6bdcaec1.six deleted file mode 100644 index a2afde6b9..000000000 --- a/integration-tests/bzr-test/src/.bzr/repository/indices/6fad9644bfab38c89a8c6dbd6bdcaec1.six +++ /dev/null @@ -1,5 +0,0 @@ -B+Tree Graph Index 2 -node_ref_lists=0 -key_elements=1 -len=0 -row_lengths= diff --git a/integration-tests/bzr-test/src/.bzr/repository/indices/6fad9644bfab38c89a8c6dbd6bdcaec1.tix b/integration-tests/bzr-test/src/.bzr/repository/indices/6fad9644bfab38c89a8c6dbd6bdcaec1.tix Binary files differdeleted file mode 100644 index a900ac4f2..000000000 --- a/integration-tests/bzr-test/src/.bzr/repository/indices/6fad9644bfab38c89a8c6dbd6bdcaec1.tix +++ /dev/null diff --git a/integration-tests/bzr-test/src/.bzr/repository/indices/e8975cb14db47e36ae3f979cfea23219.cix b/integration-tests/bzr-test/src/.bzr/repository/indices/e8975cb14db47e36ae3f979cfea23219.cix deleted file mode 100644 index 55a4e1bfd..000000000 --- a/integration-tests/bzr-test/src/.bzr/repository/indices/e8975cb14db47e36ae3f979cfea23219.cix +++ /dev/null @@ -1,9 +0,0 @@ -B+Tree Graph Index 2 -node_ref_lists=0 -key_elements=1 -len=2 -row_lengths=1 -xœ%˱
1 ÐÔ7EFð·ãäŒÄ0‰ ë - -$hØ $^ÿÞŸç¾?öÌãuMÜÈ÷ÖL’‘¥[ƒGxWˆzPéÍXu•"‚J ÿ ¤&´w;ƒÜ¦Â–
(ÓÌ<#% Y -šUfþåÆ||†"#
\ No newline at end of file diff --git a/integration-tests/bzr-test/src/.bzr/repository/indices/e8975cb14db47e36ae3f979cfea23219.iix b/integration-tests/bzr-test/src/.bzr/repository/indices/e8975cb14db47e36ae3f979cfea23219.iix Binary files differdeleted file mode 100644 index a040c5d93..000000000 --- a/integration-tests/bzr-test/src/.bzr/repository/indices/e8975cb14db47e36ae3f979cfea23219.iix +++ /dev/null diff --git a/integration-tests/bzr-test/src/.bzr/repository/indices/e8975cb14db47e36ae3f979cfea23219.rix b/integration-tests/bzr-test/src/.bzr/repository/indices/e8975cb14db47e36ae3f979cfea23219.rix Binary files differdeleted file mode 100644 index c9ab6138a..000000000 --- a/integration-tests/bzr-test/src/.bzr/repository/indices/e8975cb14db47e36ae3f979cfea23219.rix +++ /dev/null diff --git a/integration-tests/bzr-test/src/.bzr/repository/indices/e8975cb14db47e36ae3f979cfea23219.six b/integration-tests/bzr-test/src/.bzr/repository/indices/e8975cb14db47e36ae3f979cfea23219.six deleted file mode 100644 index a2afde6b9..000000000 --- a/integration-tests/bzr-test/src/.bzr/repository/indices/e8975cb14db47e36ae3f979cfea23219.six +++ /dev/null @@ -1,5 +0,0 @@ -B+Tree Graph Index 2 -node_ref_lists=0 -key_elements=1 -len=0 -row_lengths= diff --git a/integration-tests/bzr-test/src/.bzr/repository/indices/e8975cb14db47e36ae3f979cfea23219.tix b/integration-tests/bzr-test/src/.bzr/repository/indices/e8975cb14db47e36ae3f979cfea23219.tix Binary files differdeleted file mode 100644 index 8a6c6e832..000000000 --- a/integration-tests/bzr-test/src/.bzr/repository/indices/e8975cb14db47e36ae3f979cfea23219.tix +++ /dev/null diff --git a/integration-tests/bzr-test/src/.bzr/repository/pack-names b/integration-tests/bzr-test/src/.bzr/repository/pack-names Binary files differdeleted file mode 100644 index 250af6115..000000000 --- a/integration-tests/bzr-test/src/.bzr/repository/pack-names +++ /dev/null diff --git a/integration-tests/bzr-test/src/.bzr/repository/packs/6fad9644bfab38c89a8c6dbd6bdcaec1.pack b/integration-tests/bzr-test/src/.bzr/repository/packs/6fad9644bfab38c89a8c6dbd6bdcaec1.pack Binary files differdeleted file mode 100644 index 58dd575d1..000000000 --- a/integration-tests/bzr-test/src/.bzr/repository/packs/6fad9644bfab38c89a8c6dbd6bdcaec1.pack +++ /dev/null diff --git a/integration-tests/bzr-test/src/.bzr/repository/packs/e8975cb14db47e36ae3f979cfea23219.pack b/integration-tests/bzr-test/src/.bzr/repository/packs/e8975cb14db47e36ae3f979cfea23219.pack Binary files differdeleted file mode 100644 index 29b1cbfff..000000000 --- a/integration-tests/bzr-test/src/.bzr/repository/packs/e8975cb14db47e36ae3f979cfea23219.pack +++ /dev/null diff --git a/integration-tests/bzr-test/src/.bzr/repository/shared-storage b/integration-tests/bzr-test/src/.bzr/repository/shared-storage deleted file mode 100644 index e69de29bb..000000000 --- a/integration-tests/bzr-test/src/.bzr/repository/shared-storage +++ /dev/null diff --git a/integration-tests/bzr-test/src/trunk/.bzr/README b/integration-tests/bzr-test/src/trunk/.bzr/README deleted file mode 100644 index f82dc1c3c..000000000 --- a/integration-tests/bzr-test/src/trunk/.bzr/README +++ /dev/null @@ -1,3 +0,0 @@ -This is a Bazaar control directory. -Do not change any files in this directory. -See http://bazaar.canonical.com/ for more information about Bazaar. diff --git a/integration-tests/bzr-test/src/trunk/.bzr/branch-format b/integration-tests/bzr-test/src/trunk/.bzr/branch-format deleted file mode 100644 index 9eb09b735..000000000 --- a/integration-tests/bzr-test/src/trunk/.bzr/branch-format +++ /dev/null @@ -1 +0,0 @@ -Bazaar-NG meta directory, format 1 diff --git a/integration-tests/bzr-test/src/trunk/.bzr/branch/branch.conf b/integration-tests/bzr-test/src/trunk/.bzr/branch/branch.conf deleted file mode 100644 index e69de29bb..000000000 --- a/integration-tests/bzr-test/src/trunk/.bzr/branch/branch.conf +++ /dev/null diff --git a/integration-tests/bzr-test/src/trunk/.bzr/branch/format b/integration-tests/bzr-test/src/trunk/.bzr/branch/format deleted file mode 100644 index dc392f449..000000000 --- a/integration-tests/bzr-test/src/trunk/.bzr/branch/format +++ /dev/null @@ -1 +0,0 @@ -Bazaar Branch Format 7 (needs bzr 1.6) diff --git a/integration-tests/bzr-test/src/trunk/.bzr/branch/last-revision b/integration-tests/bzr-test/src/trunk/.bzr/branch/last-revision deleted file mode 100644 index 067624909..000000000 --- a/integration-tests/bzr-test/src/trunk/.bzr/branch/last-revision +++ /dev/null @@ -1 +0,0 @@ -2 tristan.maat@codethink.co.uk-20170629145450-002fmq5jowd85hfz diff --git a/integration-tests/bzr-test/src/trunk/.bzr/branch/tags b/integration-tests/bzr-test/src/trunk/.bzr/branch/tags deleted file mode 100644 index e69de29bb..000000000 --- a/integration-tests/bzr-test/src/trunk/.bzr/branch/tags +++ /dev/null diff --git a/integration-tests/bzr-test/src/trunk/.bzr/checkout/conflicts b/integration-tests/bzr-test/src/trunk/.bzr/checkout/conflicts deleted file mode 100644 index 0dc2d3a0f..000000000 --- a/integration-tests/bzr-test/src/trunk/.bzr/checkout/conflicts +++ /dev/null @@ -1 +0,0 @@ -BZR conflict list format 1 diff --git a/integration-tests/bzr-test/src/trunk/.bzr/checkout/dirstate b/integration-tests/bzr-test/src/trunk/.bzr/checkout/dirstate Binary files differdeleted file mode 100644 index 78c7774e1..000000000 --- a/integration-tests/bzr-test/src/trunk/.bzr/checkout/dirstate +++ /dev/null diff --git a/integration-tests/bzr-test/src/trunk/.bzr/checkout/format b/integration-tests/bzr-test/src/trunk/.bzr/checkout/format deleted file mode 100644 index e0261c797..000000000 --- a/integration-tests/bzr-test/src/trunk/.bzr/checkout/format +++ /dev/null @@ -1 +0,0 @@ -Bazaar Working Tree Format 6 (bzr 1.14) diff --git a/integration-tests/bzr-test/src/trunk/.bzr/checkout/views b/integration-tests/bzr-test/src/trunk/.bzr/checkout/views deleted file mode 100644 index e69de29bb..000000000 --- a/integration-tests/bzr-test/src/trunk/.bzr/checkout/views +++ /dev/null diff --git a/integration-tests/bzr-test/src/trunk/test b/integration-tests/bzr-test/src/trunk/test deleted file mode 100644 index b2c5fe44a..000000000 --- a/integration-tests/bzr-test/src/trunk/test +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -echo "test" > /buildstream/install/test diff --git a/integration-tests/cmake-test/elements/dependencies/base-platform.bst b/integration-tests/cmake-test/elements/dependencies/base-platform.bst deleted file mode 100644 index a04a5b81c..000000000 --- a/integration-tests/cmake-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/cmake-test/elements/dependencies/base-sdk.bst b/integration-tests/cmake-test/elements/dependencies/base-sdk.bst deleted file mode 100644 index a1b6c5856..000000000 --- a/integration-tests/cmake-test/elements/dependencies/base-sdk.bst +++ /dev/null @@ -1,16 +0,0 @@ -kind: import -description: Import the base freedesktop SDK -sources: -- kind: ostree - url: gnomesdk:repo/ - gpg-key: keys/gnome-sdk.gpg - (?): - - arch == "x86_64": - track: runtime/org.freedesktop.BaseSdk/x86_64/1.4 - ref: 0d9d255d56b08aeaaffb1c820eef85266eb730cb5667e50681185ccf5cd7c882 - - arch == "i386": - track: runtime/org.freedesktop.BaseSdk/i386/1.4 - ref: 16036b747c1ec8e7fe291f5b1f667cb942f0267d08fcad962e9b7627d6cf1981 -config: - source: files - target: usr diff --git a/integration-tests/cmake-test/elements/step7-run.bst b/integration-tests/cmake-test/elements/step7-run.bst deleted file mode 100644 index 0a51c485e..000000000 --- a/integration-tests/cmake-test/elements/step7-run.bst +++ /dev/null @@ -1,12 +0,0 @@ -kind: script -description: Cmake binary run test - -depends: - - filename: dependencies/base-platform.bst - type: build - - filename: step7.bst - type: build - -config: - commands: - - "/usr/bin/Tutorial 9 > /buildstream/install/test" diff --git a/integration-tests/cmake-test/elements/step7.bst b/integration-tests/cmake-test/elements/step7.bst deleted file mode 100644 index bd4d1f3cd..000000000 --- a/integration-tests/cmake-test/elements/step7.bst +++ /dev/null @@ -1,13 +0,0 @@ -kind: cmake -description: Cmake test - -depends: - - filename: dependencies/base-platform.bst - type: build - - filename: dependencies/base-sdk.bst - type: build - -sources: - - kind: tar - url: file:///home/tristanmaat/Documents/Projects/buildstream/buildstream-tests/cmake-test/src/step7.tar.gz - ref: 9591707afbae77751730b4af4c52a18b1cdc4378237bc64055f099bc95c330db diff --git a/integration-tests/cmake-test/expected/step7-run/test b/integration-tests/cmake-test/expected/step7-run/test deleted file mode 100644 index 8a2ba1b74..000000000 --- a/integration-tests/cmake-test/expected/step7-run/test +++ /dev/null @@ -1,11 +0,0 @@ -Computing sqrt of 9 to be 3 -Computing sqrt of 9 to be 3 -Computing sqrt of 9 to be 3 -Computing sqrt of 9 to be 3 -Computing sqrt of 9 to be 3 -Computing sqrt of 9 to be 3 -Computing sqrt of 9 to be 3 -Computing sqrt of 9 to be 3 -Computing sqrt of 9 to be 3 -Computing sqrt of 9 to be 3 -The square root of 9 is 3 diff --git a/integration-tests/cmake-test/expected/step7/usr/bin/Tutorial b/integration-tests/cmake-test/expected/step7/usr/bin/Tutorial Binary files differdeleted file mode 100644 index 29687aa26..000000000 --- a/integration-tests/cmake-test/expected/step7/usr/bin/Tutorial +++ /dev/null diff --git a/integration-tests/cmake-test/expected/step7/usr/include/MathFunctions.h b/integration-tests/cmake-test/expected/step7/usr/include/MathFunctions.h deleted file mode 100644 index cd36bccff..000000000 --- a/integration-tests/cmake-test/expected/step7/usr/include/MathFunctions.h +++ /dev/null @@ -1 +0,0 @@ -double mysqrt(double x); diff --git a/integration-tests/cmake-test/expected/step7/usr/include/TutorialConfig.h b/integration-tests/cmake-test/expected/step7/usr/include/TutorialConfig.h deleted file mode 100644 index e38a218af..000000000 --- a/integration-tests/cmake-test/expected/step7/usr/include/TutorialConfig.h +++ /dev/null @@ -1,9 +0,0 @@ -// the configured options and settings for Tutorial -#define Tutorial_VERSION_MAJOR 1 -#define Tutorial_VERSION_MINOR 0 -#define USE_MYMATH - -// does the platform provide exp and log functions? -/* #undef HAVE_LOG */ -/* #undef HAVE_EXP */ - diff --git a/integration-tests/cmake-test/expected/step7/usr/lib/debug/Tutorial b/integration-tests/cmake-test/expected/step7/usr/lib/debug/Tutorial Binary files differdeleted file mode 100644 index 3e1e8bdf9..000000000 --- a/integration-tests/cmake-test/expected/step7/usr/lib/debug/Tutorial +++ /dev/null diff --git a/integration-tests/cmake-test/keys/gnome-sdk.gpg b/integration-tests/cmake-test/keys/gnome-sdk.gpg Binary files differdeleted file mode 100644 index 8434b686c..000000000 --- a/integration-tests/cmake-test/keys/gnome-sdk.gpg +++ /dev/null diff --git a/integration-tests/cmake-test/project.conf b/integration-tests/cmake-test/project.conf deleted file mode 100644 index 46985b075..000000000 --- a/integration-tests/cmake-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/cmake-test/run-cmake-test.sh b/integration-tests/cmake-test/run-cmake-test.sh deleted file mode 100644 index 750bb5d52..000000000 --- a/integration-tests/cmake-test/run-cmake-test.sh +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/bash -# -# A script to run a BuildStream test case. - - -TEST_DIR="elements/" -RESULTS="results/" -EXPECTED="expected/" - -set -eu - -# run_test -# -# Run tests for this test case. -# -# This test has more manual intervention since it creates binary files -# which may change. -# -run_test () { - local bst_file - local tar_file - - local successes=0 - local total=2 - local exit - - source ../lib.sh - - ############################################################### - ### Setup - ############################################################### - - tar_file="$(dirname "$(readlink -f "$0")")/src/step7.tar.gz" - bst_file="$(dirname "$(readlink -f "$0")")/elements/step7.bst" - - patch_file_location "$bst_file" "$tar_file" - - mkdir -p "$TEST_DIR" - - ############################################################### - ### Run tests - ############################################################### - - ## Test step7 - echo "Running test 'step7'" - - bst_with_flags build "step7.bst" - bst_checkout "step7.bst" "results/step7" - - # Remove changing binary file - rm results/step7/usr/bin/libMathFunctions.a - - exit=0 - diff -r "$RESULTS/step7" "$EXPECTED/step7" || exit=$? - if [ $exit == 0 ] - then - successes=$((successes + 1)) - printf "%-34s ${GREEN}%9s${END}\n" "step7" "succeeded" - else - echo "Error: Unexpected or missing file in 'results/step7'" - printf "%-34s ${RED}%9s${END}\n" "step7" "failed" - fi - - ## Test step7-run - echo "Running test 'step7-run'" - - bst_with_flags build "step7-run.bst" - bst_checkout "step7-run.bst" "results/step7-run" - - exit=0 - compare_results "step7-run" "results" "expected" || exit=$? - if [ $exit == 0 ] - then - successes=$((successes + 1)) - else - echo "Error: Unexpected or missing file in 'results/step7'" - fi - - ############################################################### - ### Check results - ############################################################### - - if [ $total != $successes ] - then - return 1 - fi -} - -run_test "$@" diff --git a/integration-tests/cmake-test/src/step7.tar.gz b/integration-tests/cmake-test/src/step7.tar.gz Binary files differdeleted file mode 100644 index f9643afce..000000000 --- a/integration-tests/cmake-test/src/step7.tar.gz +++ /dev/null diff --git a/integration-tests/compose-test/elements/compose-all-test.bst b/integration-tests/compose-test/elements/compose-all-test.bst deleted file mode 100644 index 78ce497c5..000000000 --- a/integration-tests/compose-test/elements/compose-all-test.bst +++ /dev/null @@ -1,16 +0,0 @@ -kind: compose - -depends: - - filename: dependencies/amhello.bst - type: build - - filename: dependencies/amhello-run.bst - type: build - -config: - include: - - runtime - - devel - - debug - - doc - - locale - - test diff --git a/integration-tests/compose-test/elements/compose-exclude-debug.bst b/integration-tests/compose-test/elements/compose-exclude-debug.bst deleted file mode 100644 index 6291b349e..000000000 --- a/integration-tests/compose-test/elements/compose-exclude-debug.bst +++ /dev/null @@ -1,11 +0,0 @@ -kind: compose - -depends: - - filename: dependencies/amhello.bst - type: build - - filename: dependencies/amhello-run.bst - type: build - -config: - exclude: - - debug diff --git a/integration-tests/compose-test/elements/compose-integration-remove.bst b/integration-tests/compose-test/elements/compose-integration-remove.bst deleted file mode 100644 index 5e2b1645c..000000000 --- a/integration-tests/compose-test/elements/compose-integration-remove.bst +++ /dev/null @@ -1,5 +0,0 @@ -kind: compose - -depends: -- filename: dependencies/integrate-remove-doc.bst - type: build diff --git a/integration-tests/compose-test/elements/compose-no-debug.bst b/integration-tests/compose-test/elements/compose-no-debug.bst deleted file mode 100644 index 5a6517d09..000000000 --- a/integration-tests/compose-test/elements/compose-no-debug.bst +++ /dev/null @@ -1,14 +0,0 @@ -kind: compose - -depends: - - filename: dependencies/amhello.bst - type: build - - filename: dependencies/amhello-run.bst - type: build - -config: - include: - - runtime - - devel - - doc - - locale diff --git a/integration-tests/compose-test/elements/compose-no-devel.bst b/integration-tests/compose-test/elements/compose-no-devel.bst deleted file mode 100644 index f13f01b88..000000000 --- a/integration-tests/compose-test/elements/compose-no-devel.bst +++ /dev/null @@ -1,14 +0,0 @@ -kind: compose - -depends: - - filename: dependencies/amhello.bst - type: build - - filename: dependencies/devel-run.bst - type: build - -config: - include: - - runtime - - debug - - doc - - locale diff --git a/integration-tests/compose-test/elements/compose-no-doc.bst b/integration-tests/compose-test/elements/compose-no-doc.bst deleted file mode 100644 index 6c47b851b..000000000 --- a/integration-tests/compose-test/elements/compose-no-doc.bst +++ /dev/null @@ -1,14 +0,0 @@ -kind: compose - -depends: - - filename: dependencies/amhello.bst - type: build - - filename: dependencies/amhello-run.bst - type: build - -config: - include: - - runtime - - devel - - debug - - locale diff --git a/integration-tests/compose-test/elements/compose-no-locale.bst b/integration-tests/compose-test/elements/compose-no-locale.bst deleted file mode 100644 index 9e3d62e05..000000000 --- a/integration-tests/compose-test/elements/compose-no-locale.bst +++ /dev/null @@ -1,14 +0,0 @@ -kind: compose - -depends: - - filename: dependencies/amhello.bst - type: build - - filename: dependencies/locale-run.bst - type: build - -config: - include: - - runtime - - devel - - debug - - doc diff --git a/integration-tests/compose-test/elements/compose-no-test.bst b/integration-tests/compose-test/elements/compose-no-test.bst deleted file mode 100644 index 418c2d475..000000000 --- a/integration-tests/compose-test/elements/compose-no-test.bst +++ /dev/null @@ -1,15 +0,0 @@ -kind: compose - -depends: - - filename: dependencies/amhello.bst - type: build - - filename: dependencies/amhello-run.bst - type: build - -config: - include: - - runtime - - devel - - debug - - doc - - locale diff --git a/integration-tests/compose-test/elements/compose-only-runtime.bst b/integration-tests/compose-test/elements/compose-only-runtime.bst deleted file mode 100644 index 401c16dc8..000000000 --- a/integration-tests/compose-test/elements/compose-only-runtime.bst +++ /dev/null @@ -1,9 +0,0 @@ -kind: compose - -depends: - - filename: dependencies/amhello.bst - type: build - -config: - include: - - runtime diff --git a/integration-tests/compose-test/elements/dependencies/amhello-full.bst b/integration-tests/compose-test/elements/dependencies/amhello-full.bst deleted file mode 100644 index 29e94bffb..000000000 --- a/integration-tests/compose-test/elements/dependencies/amhello-full.bst +++ /dev/null @@ -1,11 +0,0 @@ -kind: autotools -description: Autotools test - -depends: -- dependencies/base-platform.bst -- dependencies/base-sdk.bst - -sources: -- kind: tar - url: file:///home/tristanmaat/Documents/Projects/buildstream/buildstream-tests/compose-test/src/amhello.tar.gz - ref: 3aa3c2bf7a488fea24303c4d98d1b5c0a72734f61615b935cf62e4e126b127d2 diff --git a/integration-tests/compose-test/elements/dependencies/amhello-run.bst b/integration-tests/compose-test/elements/dependencies/amhello-run.bst deleted file mode 100644 index a6162155b..000000000 --- a/integration-tests/compose-test/elements/dependencies/amhello-run.bst +++ /dev/null @@ -1,14 +0,0 @@ -kind: script -description: Run autotools-built binary - -depends: - - filename: dependencies/base-platform.bst - type: build - - filename: dependencies/amhello.bst - type: build - -config: - commands: - - "mkdir -p /buildstream/install/tests" - - "/usr/bin/hello > /buildstream/install/tests/test" - - "echo BLABLABLA %{debugdir} >> /buildstream/install/tests/test" diff --git a/integration-tests/compose-test/elements/dependencies/amhello.bst b/integration-tests/compose-test/elements/dependencies/amhello.bst deleted file mode 100644 index 2e0915803..000000000 --- a/integration-tests/compose-test/elements/dependencies/amhello.bst +++ /dev/null @@ -1,13 +0,0 @@ -kind: autotools -description: Autotools test - -depends: -- filename: dependencies/base-platform.bst - type: build -- filename: dependencies/base-sdk.bst - type: build - -sources: -- kind: tar - url: file:///home/tristanmaat/Documents/Projects/buildstream/buildstream-tests/compose-test/src/amhello.tar.gz - ref: 3aa3c2bf7a488fea24303c4d98d1b5c0a72734f61615b935cf62e4e126b127d2 diff --git a/integration-tests/compose-test/elements/dependencies/base-platform.bst b/integration-tests/compose-test/elements/dependencies/base-platform.bst deleted file mode 100644 index a04a5b81c..000000000 --- a/integration-tests/compose-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/compose-test/elements/dependencies/base-sdk.bst b/integration-tests/compose-test/elements/dependencies/base-sdk.bst deleted file mode 100644 index a1b6c5856..000000000 --- a/integration-tests/compose-test/elements/dependencies/base-sdk.bst +++ /dev/null @@ -1,16 +0,0 @@ -kind: import -description: Import the base freedesktop SDK -sources: -- kind: ostree - url: gnomesdk:repo/ - gpg-key: keys/gnome-sdk.gpg - (?): - - arch == "x86_64": - track: runtime/org.freedesktop.BaseSdk/x86_64/1.4 - ref: 0d9d255d56b08aeaaffb1c820eef85266eb730cb5667e50681185ccf5cd7c882 - - arch == "i386": - track: runtime/org.freedesktop.BaseSdk/i386/1.4 - ref: 16036b747c1ec8e7fe291f5b1f667cb942f0267d08fcad962e9b7627d6cf1981 -config: - source: files - target: usr diff --git a/integration-tests/compose-test/elements/dependencies/devel-run.bst b/integration-tests/compose-test/elements/dependencies/devel-run.bst deleted file mode 100644 index 4134fec81..000000000 --- a/integration-tests/compose-test/elements/dependencies/devel-run.bst +++ /dev/null @@ -1,11 +0,0 @@ -kind: script -description: Run autotools-built binary - -depends: - - filename: dependencies/base-platform.bst - type: build - -config: - commands: - - "mkdir -p /buildstream/install%{includedir}" - - "echo 'You should never see this file!' > /buildstream/install%{includedir}/broken" diff --git a/integration-tests/compose-test/elements/dependencies/integrate-remove-doc.bst b/integration-tests/compose-test/elements/dependencies/integrate-remove-doc.bst deleted file mode 100644 index 382e2e5c4..000000000 --- a/integration-tests/compose-test/elements/dependencies/integrate-remove-doc.bst +++ /dev/null @@ -1,10 +0,0 @@ -kind: stack -description: remove the docs with an integration command - -depends: -- dependencies/amhello-full.bst - -public: - bst: - integration-commands: - - rm -rf /usr/share/doc/amhello diff --git a/integration-tests/compose-test/elements/dependencies/locale-run.bst b/integration-tests/compose-test/elements/dependencies/locale-run.bst deleted file mode 100644 index 52aed047d..000000000 --- a/integration-tests/compose-test/elements/dependencies/locale-run.bst +++ /dev/null @@ -1,11 +0,0 @@ -kind: script -description: Run autotools-built binary - -depends: - - filename: dependencies/base-platform.bst - type: build - -config: - commands: - - "mkdir -p /buildstream/install%{datadir}/locale" - - "echo 'You should never see this file!' > /buildstream/install%{datadir}/locale/broken" diff --git a/integration-tests/compose-test/expected/compose-all-test/tests/test b/integration-tests/compose-test/expected/compose-all-test/tests/test deleted file mode 100644 index 5eb4bd2cd..000000000 --- a/integration-tests/compose-test/expected/compose-all-test/tests/test +++ /dev/null @@ -1,3 +0,0 @@ -Hello World! -This is amhello 1.0. -BLABLABLA /usr/lib/debug diff --git a/integration-tests/compose-test/expected/compose-all-test/usr/bin/hello b/integration-tests/compose-test/expected/compose-all-test/usr/bin/hello Binary files differdeleted file mode 100755 index 0a6eb4149..000000000 --- a/integration-tests/compose-test/expected/compose-all-test/usr/bin/hello +++ /dev/null diff --git a/integration-tests/compose-test/expected/compose-all-test/usr/lib/debug/hello b/integration-tests/compose-test/expected/compose-all-test/usr/lib/debug/hello Binary files differdeleted file mode 100644 index 4f3ef879f..000000000 --- a/integration-tests/compose-test/expected/compose-all-test/usr/lib/debug/hello +++ /dev/null diff --git a/integration-tests/compose-test/expected/compose-all-test/usr/share/doc/amhello/README b/integration-tests/compose-test/expected/compose-all-test/usr/share/doc/amhello/README deleted file mode 100644 index d24723a81..000000000 --- a/integration-tests/compose-test/expected/compose-all-test/usr/share/doc/amhello/README +++ /dev/null @@ -1,2 +0,0 @@ -This is a demonstration package for GNU Automake. -Type `info Automake' to read the Automake manual. diff --git a/integration-tests/compose-test/expected/compose-exclude-debug/tests/test b/integration-tests/compose-test/expected/compose-exclude-debug/tests/test deleted file mode 100644 index 5eb4bd2cd..000000000 --- a/integration-tests/compose-test/expected/compose-exclude-debug/tests/test +++ /dev/null @@ -1,3 +0,0 @@ -Hello World! -This is amhello 1.0. -BLABLABLA /usr/lib/debug diff --git a/integration-tests/compose-test/expected/compose-exclude-debug/usr/bin/hello b/integration-tests/compose-test/expected/compose-exclude-debug/usr/bin/hello Binary files differdeleted file mode 100755 index 0a6eb4149..000000000 --- a/integration-tests/compose-test/expected/compose-exclude-debug/usr/bin/hello +++ /dev/null diff --git a/integration-tests/compose-test/expected/compose-exclude-debug/usr/lib/.gitkeep b/integration-tests/compose-test/expected/compose-exclude-debug/usr/lib/.gitkeep deleted file mode 100644 index e69de29bb..000000000 --- a/integration-tests/compose-test/expected/compose-exclude-debug/usr/lib/.gitkeep +++ /dev/null diff --git a/integration-tests/compose-test/expected/compose-exclude-debug/usr/share/doc/amhello/README b/integration-tests/compose-test/expected/compose-exclude-debug/usr/share/doc/amhello/README deleted file mode 100644 index d24723a81..000000000 --- a/integration-tests/compose-test/expected/compose-exclude-debug/usr/share/doc/amhello/README +++ /dev/null @@ -1,2 +0,0 @@ -This is a demonstration package for GNU Automake. -Type `info Automake' to read the Automake manual. diff --git a/integration-tests/compose-test/expected/compose-no-debug/usr/bin/hello b/integration-tests/compose-test/expected/compose-no-debug/usr/bin/hello Binary files differdeleted file mode 100755 index 0a6eb4149..000000000 --- a/integration-tests/compose-test/expected/compose-no-debug/usr/bin/hello +++ /dev/null diff --git a/integration-tests/compose-test/expected/compose-no-debug/usr/lib/.gitkeep b/integration-tests/compose-test/expected/compose-no-debug/usr/lib/.gitkeep deleted file mode 100644 index e69de29bb..000000000 --- a/integration-tests/compose-test/expected/compose-no-debug/usr/lib/.gitkeep +++ /dev/null diff --git a/integration-tests/compose-test/expected/compose-no-debug/usr/share/doc/amhello/README b/integration-tests/compose-test/expected/compose-no-debug/usr/share/doc/amhello/README deleted file mode 100644 index d24723a81..000000000 --- a/integration-tests/compose-test/expected/compose-no-debug/usr/share/doc/amhello/README +++ /dev/null @@ -1,2 +0,0 @@ -This is a demonstration package for GNU Automake. -Type `info Automake' to read the Automake manual. diff --git a/integration-tests/compose-test/expected/compose-no-devel/usr/bin/hello b/integration-tests/compose-test/expected/compose-no-devel/usr/bin/hello Binary files differdeleted file mode 100755 index 0a6eb4149..000000000 --- a/integration-tests/compose-test/expected/compose-no-devel/usr/bin/hello +++ /dev/null diff --git a/integration-tests/compose-test/expected/compose-no-devel/usr/lib/debug/hello b/integration-tests/compose-test/expected/compose-no-devel/usr/lib/debug/hello Binary files differdeleted file mode 100644 index 4f3ef879f..000000000 --- a/integration-tests/compose-test/expected/compose-no-devel/usr/lib/debug/hello +++ /dev/null diff --git a/integration-tests/compose-test/expected/compose-no-devel/usr/share/doc/amhello/README b/integration-tests/compose-test/expected/compose-no-devel/usr/share/doc/amhello/README deleted file mode 100644 index d24723a81..000000000 --- a/integration-tests/compose-test/expected/compose-no-devel/usr/share/doc/amhello/README +++ /dev/null @@ -1,2 +0,0 @@ -This is a demonstration package for GNU Automake. -Type `info Automake' to read the Automake manual. diff --git a/integration-tests/compose-test/expected/compose-no-doc/usr/bin/hello b/integration-tests/compose-test/expected/compose-no-doc/usr/bin/hello Binary files differdeleted file mode 100755 index 0a6eb4149..000000000 --- a/integration-tests/compose-test/expected/compose-no-doc/usr/bin/hello +++ /dev/null diff --git a/integration-tests/compose-test/expected/compose-no-doc/usr/lib/debug/hello b/integration-tests/compose-test/expected/compose-no-doc/usr/lib/debug/hello Binary files differdeleted file mode 100644 index 4f3ef879f..000000000 --- a/integration-tests/compose-test/expected/compose-no-doc/usr/lib/debug/hello +++ /dev/null diff --git a/integration-tests/compose-test/expected/compose-no-doc/usr/share/.gitkeep b/integration-tests/compose-test/expected/compose-no-doc/usr/share/.gitkeep deleted file mode 100644 index e69de29bb..000000000 --- a/integration-tests/compose-test/expected/compose-no-doc/usr/share/.gitkeep +++ /dev/null diff --git a/integration-tests/compose-test/expected/compose-no-locale/usr/bin/hello b/integration-tests/compose-test/expected/compose-no-locale/usr/bin/hello Binary files differdeleted file mode 100755 index 0a6eb4149..000000000 --- a/integration-tests/compose-test/expected/compose-no-locale/usr/bin/hello +++ /dev/null diff --git a/integration-tests/compose-test/expected/compose-no-locale/usr/lib/debug/hello b/integration-tests/compose-test/expected/compose-no-locale/usr/lib/debug/hello Binary files differdeleted file mode 100644 index 4f3ef879f..000000000 --- a/integration-tests/compose-test/expected/compose-no-locale/usr/lib/debug/hello +++ /dev/null diff --git a/integration-tests/compose-test/expected/compose-no-locale/usr/share/doc/amhello/README b/integration-tests/compose-test/expected/compose-no-locale/usr/share/doc/amhello/README deleted file mode 100644 index d24723a81..000000000 --- a/integration-tests/compose-test/expected/compose-no-locale/usr/share/doc/amhello/README +++ /dev/null @@ -1,2 +0,0 @@ -This is a demonstration package for GNU Automake. -Type `info Automake' to read the Automake manual. diff --git a/integration-tests/compose-test/expected/compose-no-test/usr/bin/hello b/integration-tests/compose-test/expected/compose-no-test/usr/bin/hello Binary files differdeleted file mode 100755 index 0a6eb4149..000000000 --- a/integration-tests/compose-test/expected/compose-no-test/usr/bin/hello +++ /dev/null diff --git a/integration-tests/compose-test/expected/compose-no-test/usr/lib/debug/hello b/integration-tests/compose-test/expected/compose-no-test/usr/lib/debug/hello Binary files differdeleted file mode 100644 index 4f3ef879f..000000000 --- a/integration-tests/compose-test/expected/compose-no-test/usr/lib/debug/hello +++ /dev/null diff --git a/integration-tests/compose-test/expected/compose-no-test/usr/share/doc/amhello/README b/integration-tests/compose-test/expected/compose-no-test/usr/share/doc/amhello/README deleted file mode 100644 index d24723a81..000000000 --- a/integration-tests/compose-test/expected/compose-no-test/usr/share/doc/amhello/README +++ /dev/null @@ -1,2 +0,0 @@ -This is a demonstration package for GNU Automake. -Type `info Automake' to read the Automake manual. diff --git a/integration-tests/compose-test/expected/compose-only-runtime/usr/bin/hello b/integration-tests/compose-test/expected/compose-only-runtime/usr/bin/hello Binary files differdeleted file mode 100755 index 0a6eb4149..000000000 --- a/integration-tests/compose-test/expected/compose-only-runtime/usr/bin/hello +++ /dev/null diff --git a/integration-tests/compose-test/expected/compose-only-runtime/usr/lib/.gitkeep b/integration-tests/compose-test/expected/compose-only-runtime/usr/lib/.gitkeep deleted file mode 100644 index e69de29bb..000000000 --- a/integration-tests/compose-test/expected/compose-only-runtime/usr/lib/.gitkeep +++ /dev/null diff --git a/integration-tests/compose-test/expected/compose-only-runtime/usr/share/.gitkeep b/integration-tests/compose-test/expected/compose-only-runtime/usr/share/.gitkeep deleted file mode 100644 index e69de29bb..000000000 --- a/integration-tests/compose-test/expected/compose-only-runtime/usr/share/.gitkeep +++ /dev/null diff --git a/integration-tests/compose-test/keys/gnome-sdk.gpg b/integration-tests/compose-test/keys/gnome-sdk.gpg Binary files differdeleted file mode 100644 index 8434b686c..000000000 --- a/integration-tests/compose-test/keys/gnome-sdk.gpg +++ /dev/null diff --git a/integration-tests/compose-test/project.conf b/integration-tests/compose-test/project.conf deleted file mode 100644 index 234fdaf28..000000000 --- a/integration-tests/compose-test/project.conf +++ /dev/null @@ -1,26 +0,0 @@ -# Import-test BuildStream project configuration. - -# Project name -# -name: script-test - -aliases: - gnomesdk: https://sdk.gnome.org/ - -split-rules: - test: - - | - /tests/* - -# 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/compose-test/run-compose-test.sh b/integration-tests/compose-test/run-compose-test.sh deleted file mode 100644 index 71ad8d097..000000000 --- a/integration-tests/compose-test/run-compose-test.sh +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/bash -# -# A script to run a BuildStream test case. - - -TEST_DIR="elements/" -RESULTS="results/" -EXPECTED="expected/" - -set -eu - -# 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_file1 - local bst_file2 - local tar_file - - local successes=0 - local total=0 - local exit - - source ../lib.sh - - tar_file="$(dirname "$(readlink -f "$0")")/src/amhello.tar.gz" - bst_file1="$(dirname "$(readlink -f "$0")")/elements/dependencies/amhello.bst" - bst_file2="$(dirname "$(readlink -f "$0")")/elements/dependencies/amhello-full.bst" - - patch_file_location "$bst_file1" "$tar_file" - patch_file_location "$bst_file2" "$tar_file" - - # Get rid of .gitkeep files - find . -name ".gitkeep" -exec rm {} \; - - 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 - bst_checkout "$element_name".bst "$test_dir" - - # XXX Special case for compose-integration-remove, dont - # use the automated compare_results for this because - # we dont want to commit a huge result set to compare - # - # Instead just check for the presence of some files - # and assert that the result has properly removed some - # files due to integration commands removing them. - # - if [ "${element_name}" == "compose-integration-remove" ]; then - if [ -e "${test_dir}/usr/share/doc/amhello" ]; then - # This is a failure if the directory which was removed - # by the integration commands still exists - exit=1 - else - exit=0 - fi - report_results "${element_name}" $exit - else - # The rest of the tests here use the weird comparison - # of exactness in the checkout results - exit=0 - compare_results "$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/compose-test/src/amhello.tar.gz b/integration-tests/compose-test/src/amhello.tar.gz Binary files differdeleted file mode 100644 index 2850f31aa..000000000 --- a/integration-tests/compose-test/src/amhello.tar.gz +++ /dev/null diff --git a/integration-tests/import-test/elements/import-src-test.bst b/integration-tests/import-test/elements/import-src-test.bst deleted file mode 100644 index 555e8aaf5..000000000 --- a/integration-tests/import-test/elements/import-src-test.bst +++ /dev/null @@ -1,9 +0,0 @@ -kind: import -description: Import test -config: - source: /sub-test - target: / - -sources: -- kind: local - path: source diff --git a/integration-tests/import-test/elements/import-sub-test.bst b/integration-tests/import-test/elements/import-sub-test.bst deleted file mode 100644 index 90e894ecc..000000000 --- a/integration-tests/import-test/elements/import-sub-test.bst +++ /dev/null @@ -1,9 +0,0 @@ -kind: import -description: Import test -config: - source: / - target: / - -sources: -- kind: local - path: source/sub-test diff --git a/integration-tests/import-test/elements/import-test.bst b/integration-tests/import-test/elements/import-test.bst deleted file mode 100644 index adfbe502e..000000000 --- a/integration-tests/import-test/elements/import-test.bst +++ /dev/null @@ -1,9 +0,0 @@ -kind: import -description: Import test -config: - source: / - target: / - -sources: -- kind: local - path: source diff --git a/integration-tests/import-test/elements/import-tgt-test.bst b/integration-tests/import-test/elements/import-tgt-test.bst deleted file mode 100644 index 6a102c24d..000000000 --- a/integration-tests/import-test/elements/import-tgt-test.bst +++ /dev/null @@ -1,9 +0,0 @@ -kind: import -description: Import test -config: - source: / - target: /output - -sources: -- kind: local - path: source diff --git a/integration-tests/import-test/expected/import-src-test/sub-test.txt b/integration-tests/import-test/expected/import-src-test/sub-test.txt deleted file mode 100644 index d73906c87..000000000 --- a/integration-tests/import-test/expected/import-src-test/sub-test.txt +++ /dev/null @@ -1 +0,0 @@ -This is another test diff --git a/integration-tests/import-test/expected/import-sub-test/sub-test.txt b/integration-tests/import-test/expected/import-sub-test/sub-test.txt deleted file mode 100644 index d73906c87..000000000 --- a/integration-tests/import-test/expected/import-sub-test/sub-test.txt +++ /dev/null @@ -1 +0,0 @@ -This is another test diff --git a/integration-tests/import-test/expected/import-test/sub-test/sub-test.txt b/integration-tests/import-test/expected/import-test/sub-test/sub-test.txt deleted file mode 100644 index d73906c87..000000000 --- a/integration-tests/import-test/expected/import-test/sub-test/sub-test.txt +++ /dev/null @@ -1 +0,0 @@ -This is another test diff --git a/integration-tests/import-test/expected/import-test/test.txt b/integration-tests/import-test/expected/import-test/test.txt deleted file mode 100644 index 0527e6bd2..000000000 --- a/integration-tests/import-test/expected/import-test/test.txt +++ /dev/null @@ -1 +0,0 @@ -This is a test diff --git a/integration-tests/import-test/expected/import-tgt-test/output/sub-test/sub-test.txt b/integration-tests/import-test/expected/import-tgt-test/output/sub-test/sub-test.txt deleted file mode 100644 index d73906c87..000000000 --- a/integration-tests/import-test/expected/import-tgt-test/output/sub-test/sub-test.txt +++ /dev/null @@ -1 +0,0 @@ -This is another test diff --git a/integration-tests/import-test/expected/import-tgt-test/output/test.txt b/integration-tests/import-test/expected/import-tgt-test/output/test.txt deleted file mode 100644 index 0527e6bd2..000000000 --- a/integration-tests/import-test/expected/import-tgt-test/output/test.txt +++ /dev/null @@ -1 +0,0 @@ -This is a test diff --git a/integration-tests/import-test/project.conf b/integration-tests/import-test/project.conf deleted file mode 100644 index 7a062116d..000000000 --- a/integration-tests/import-test/project.conf +++ /dev/null @@ -1,11 +0,0 @@ -# Import-test BuildStream project configuration. - -# Project name -# -name: import-name - -# Base project relative element path, elements will be loaded -# from this base. - -element-path: elements - diff --git a/integration-tests/import-test/run-import-test.sh b/integration-tests/import-test/run-import-test.sh deleted file mode 100644 index 6eff20656..000000000 --- a/integration-tests/import-test/run-import-test.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash -# -# A script to run a BuildStream test case. - - -TEST_DIR="elements/" -RESULTS="results/" -EXPECTED="expected/" - -set -eu - -# 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 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 - bst_checkout "$element_name".bst "$test_dir" - - exit=0 - compare_results "$element_name" "$RESULTS" "$EXPECTED" || exit=$? - if [ $exit == 0 ] - then - successes=$((successes + 1)) - fi - done - - if [ $total != $successes ] - then - return 1 - fi -} - -run_test "$@" diff --git a/integration-tests/import-test/source/sub-test/sub-test.txt b/integration-tests/import-test/source/sub-test/sub-test.txt deleted file mode 100644 index d73906c87..000000000 --- a/integration-tests/import-test/source/sub-test/sub-test.txt +++ /dev/null @@ -1 +0,0 @@ -This is another test diff --git a/integration-tests/import-test/source/test.txt b/integration-tests/import-test/source/test.txt deleted file mode 100644 index 0527e6bd2..000000000 --- a/integration-tests/import-test/source/test.txt +++ /dev/null @@ -1 +0,0 @@ -This is a test diff --git a/integration-tests/lib.sh b/integration-tests/lib.sh deleted file mode 100644 index a77082c6d..000000000 --- a/integration-tests/lib.sh +++ /dev/null @@ -1,202 +0,0 @@ -GREEN="\e[0;32m" -YELLOW="\e[0;33m" -RED="\e[0;31m" -END="\e[0m" - -# patch_file_location -# -# Patch the location of a file in a file:// path. -# -# Args: -# bst ($1) - The bst file to patch. -# file ($2) - The file path to change to. -# -patch_file_location() { - local bst="$1" - local file="$2" - - sed -i "s|file://.*$|file://$file|" "$bst" -} - -# check_permissions -# -# Compare the user execute permissions between two files. -# -# Args: -# source ($1) - The first file -# target ($2) - The second file -# -# Returns: -# 1 if the permissions mismatch -# -check_permissions () { - local source="$1" - local target="$2" - local file_perm1 - local file_perm2 - - # This only checks executable permissions since git will not - # persist local permissions. - file_perm1=$(stat -c '%A' "$source" | sed 's/...\(.\).\+/\1/') - file_perm2=$(stat -c '%A' "$target" | sed 's/...\(.\).\+/\1/') - - if [ "$file_perm1" != "$file_perm2" ] - then - printf "Error: File permissions differ for files %s (%s) and %s (%s)" \ - "$source" "$(stat -c '%A' "$source")" \ - "$target" "$(stat -c '%A' "$target")\n" - return 1 - fi - return 0 -} - -# ensure_equal -# -# Recursively test for differences in content or permissions between -# the given directories. -# -# Args: -# src ($1) - The first directory -# target ($2) - The second directory -# -# Returns: -# 0 (bash true) if the files in the directories match, otherwise 1 -# if they mismatch -# -ensure_equal () ( - set +e - - local src="$1" - local target="$2" - - local target_file - local target_files - local source_file - - # Check for file differences - diff -r "$src" "$target" - if [ $? -ne 0 ] - then - echo "Error: Unexpected or missing file in '$src'" - return 1 - fi - - # Check for permission differences - target_files=$(find "$target") - for target_file in $target_files - do - source_file="$src${target_file#$target}" - - check_permissions "$source_file" "$target_file" - if [ $? -ne 0 ] - then - echo "Error: File permissions differ for files '$source_file' and '$target_file'" - return 1 - fi - done - - return 0 -) - -# bst_with_flags -# -# Call bst with the flags defined by the main script. -# -bst_with_flags() { - if [ ! -z "${BST_COVERAGE}" ]; then - coverage run --parallel-mode \ - --rcfile=${BST_COVERAGE} \ - $(which bst) -c "${CONFIG_LOCATION}" ${BST_FLAGS:-} "$@" - else - bst -c "${CONFIG_LOCATION}" ${BST_FLAGS:-} "$@" - fi -} - -# bst_checkout -# -# Call bst checkout -# -# Args -# element_name ($1) - the element name to checkout -# directory ($2) - the checkout directory -bst_checkout() { - local element=$1 - local directory=$2 - - # Use --hardlinks option to speed things up, this - # is fine as long as we dont modify files in the checkout. - # - bst_with_flags checkout --hardlinks "${element}" "${directory}" -} - -# report_results -# -# Args: -# test_name ($1) - The name of the test -# success ($2) - A bash truthy integer (0 is True, non 0 is False) -report_results() { - test_name=$1 - success=$2 - - if [ "$success" -eq 0 ]; then - echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" - printf "%-34s ${GREEN}%9s${END}\n" "$test_name" "succeeded" - echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" - else - echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" - printf "%-34s ${RED}%9s${END}\n" "$test_name" "failed" - echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" - fi -} - -# compare_results -# -# Compare results to expected files, reporting success/failure for -# each test. -# -# 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: -# 0 if the files are equal, 1 otherwise. -# -compare_results() ( - set +e - - local test_name="$1" - local result_dir="$2" - local expected_dir="$3" - - ensure_equal "$result_dir/$test_name" "$expected_dir/$test_name" - - local success=$? - report_results $test_name $success - return $success -) - -# comare_results_no_contents -# -# Compare results to expected files, ignoring the contents of the files, -# reporting success/failure for each test. -# -# 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 dirs are equivalent, 0 otherwise. -compare_results_no_contents() ( - set +e - - local test_name="$1" - local result_dir="$2" - local expected_dir="$3" - - diff <(cd $result_dir/$test_name && find . | sort) <(cd $expected_dir/$test_name && find . | sort) - local success=$? - report_results $test_name $success - return $success -) diff --git a/integration-tests/local-test/elements/dependencies/base-platform.bst b/integration-tests/local-test/elements/dependencies/base-platform.bst deleted file mode 100644 index a04a5b81c..000000000 --- a/integration-tests/local-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/local-test/elements/dependencies/base-sdk.bst b/integration-tests/local-test/elements/dependencies/base-sdk.bst deleted file mode 100644 index a1b6c5856..000000000 --- a/integration-tests/local-test/elements/dependencies/base-sdk.bst +++ /dev/null @@ -1,16 +0,0 @@ -kind: import -description: Import the base freedesktop SDK -sources: -- kind: ostree - url: gnomesdk:repo/ - gpg-key: keys/gnome-sdk.gpg - (?): - - arch == "x86_64": - track: runtime/org.freedesktop.BaseSdk/x86_64/1.4 - ref: 0d9d255d56b08aeaaffb1c820eef85266eb730cb5667e50681185ccf5cd7c882 - - arch == "i386": - track: runtime/org.freedesktop.BaseSdk/i386/1.4 - ref: 16036b747c1ec8e7fe291f5b1f667cb942f0267d08fcad962e9b7627d6cf1981 -config: - source: files - target: usr diff --git a/integration-tests/local-test/elements/local-test.bst b/integration-tests/local-test/elements/local-test.bst deleted file mode 100644 index 8af8b7848..000000000 --- a/integration-tests/local-test/elements/local-test.bst +++ /dev/null @@ -1,18 +0,0 @@ -kind: manual -description: bzr test - -depends: -- filename: dependencies/base-platform.bst - type: build -- filename: dependencies/base-sdk.bst - type: build - -sources: -- kind: local - path: src - directory: somewhere - -config: - install-commands: - - "mkdir -p %{install-root}" - - "somewhere/test" diff --git a/integration-tests/local-test/expected/local-test/test b/integration-tests/local-test/expected/local-test/test deleted file mode 100644 index 9daeafb98..000000000 --- a/integration-tests/local-test/expected/local-test/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/integration-tests/local-test/keys/gnome-sdk.gpg b/integration-tests/local-test/keys/gnome-sdk.gpg Binary files differdeleted file mode 100644 index 8434b686c..000000000 --- a/integration-tests/local-test/keys/gnome-sdk.gpg +++ /dev/null diff --git a/integration-tests/local-test/project.conf b/integration-tests/local-test/project.conf deleted file mode 100644 index 46985b075..000000000 --- a/integration-tests/local-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/local-test/run-local-test.sh b/integration-tests/local-test/run-local-test.sh deleted file mode 100644 index ca7a7efe7..000000000 --- a/integration-tests/local-test/run-local-test.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -# -# A script to run a BuildStream test case. - - -TEST_DIR="elements/" -RESULTS="results/" -EXPECTED="expected/" - -set -eu - -# 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 - bst_checkout "$element_name".bst "$test_dir" - - exit=0 - compare_results "$element_name" "$RESULTS" "$EXPECTED" || exit=$? - if [ $exit == 0 ] - then - successes=$((successes + 1)) - fi - done - - if [ $total != $successes ] - then - return 1 - fi -} - -run_test "$@" diff --git a/integration-tests/local-test/src/test b/integration-tests/local-test/src/test deleted file mode 100755 index 6a834ea0a..000000000 --- a/integration-tests/local-test/src/test +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -echo 'test' > /buildstream/install/test diff --git a/integration-tests/manual-test/elements/dependencies/base-platform.bst b/integration-tests/manual-test/elements/dependencies/base-platform.bst deleted file mode 100644 index a04a5b81c..000000000 --- a/integration-tests/manual-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/manual-test/elements/manual-environment-test.bst b/integration-tests/manual-test/elements/manual-environment-test.bst deleted file mode 100644 index d57b5f7bc..000000000 --- a/integration-tests/manual-test/elements/manual-environment-test.bst +++ /dev/null @@ -1,21 +0,0 @@ -kind: manual -description: Manual test - -variables: - max-jobs: 2 - -depends: - - filename: dependencies/base-platform.bst - type: build - -config: - install-commands: - - "echo $MAKEFLAGS >> test" - - "echo $V >> test" - - "cp test %{install-root}" - -environment: - MAKEFLAGS: -j%{max-jobs} -Wall - V: 2 - -# FIXME: Test environment-nocache diff --git a/integration-tests/manual-test/elements/manual-noparallel-test.bst b/integration-tests/manual-test/elements/manual-noparallel-test.bst deleted file mode 100644 index 3655d1fe8..000000000 --- a/integration-tests/manual-test/elements/manual-noparallel-test.bst +++ /dev/null @@ -1,20 +0,0 @@ -kind: manual -description: Manual test - -variables: - max-jobs: 2 - notparallel: True - -depends: - - filename: dependencies/base-platform.bst - type: build - -config: - install-commands: - - "echo $MAKEFLAGS >> test" - - "echo $V >> test" - - "cp test %{install-root}" - -environment: - MAKEFLAGS: -j%{max-jobs} -Wall - V: 2 diff --git a/integration-tests/manual-test/elements/manual-test.bst b/integration-tests/manual-test/elements/manual-test.bst deleted file mode 100644 index f3fde3789..000000000 --- a/integration-tests/manual-test/elements/manual-test.bst +++ /dev/null @@ -1,20 +0,0 @@ -kind: manual -description: Manual test - -depends: - - filename: dependencies/base-platform.bst - type: build - -config: - configure-commands: - - "echo './configure' >> test" - - build-commands: - - "echo 'make' >> test" - - install-commands: - - "echo 'make install' >> test" - - "cp test %{install-root}" - - strip-commands: - - "echo 'strip' >> %{install-root}/test" diff --git a/integration-tests/manual-test/expected/manual-environment-test/test b/integration-tests/manual-test/expected/manual-environment-test/test deleted file mode 100644 index 9743f83af..000000000 --- a/integration-tests/manual-test/expected/manual-environment-test/test +++ /dev/null @@ -1,2 +0,0 @@ --j2 -Wall -2 diff --git a/integration-tests/manual-test/expected/manual-noparallel-test/test b/integration-tests/manual-test/expected/manual-noparallel-test/test deleted file mode 100644 index 19d9a0ba9..000000000 --- a/integration-tests/manual-test/expected/manual-noparallel-test/test +++ /dev/null @@ -1,2 +0,0 @@ --j1 -Wall -2 diff --git a/integration-tests/manual-test/expected/manual-test/test b/integration-tests/manual-test/expected/manual-test/test deleted file mode 100644 index 236ca4dc7..000000000 --- a/integration-tests/manual-test/expected/manual-test/test +++ /dev/null @@ -1,4 +0,0 @@ -./configure -make -make install -strip diff --git a/integration-tests/manual-test/keys/gnome-sdk.gpg b/integration-tests/manual-test/keys/gnome-sdk.gpg Binary files differdeleted file mode 100644 index 8434b686c..000000000 --- a/integration-tests/manual-test/keys/gnome-sdk.gpg +++ /dev/null diff --git a/integration-tests/manual-test/project.conf b/integration-tests/manual-test/project.conf deleted file mode 100644 index 46985b075..000000000 --- a/integration-tests/manual-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/manual-test/run-manual-test.sh b/integration-tests/manual-test/run-manual-test.sh deleted file mode 100644 index 6eff20656..000000000 --- a/integration-tests/manual-test/run-manual-test.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash -# -# A script to run a BuildStream test case. - - -TEST_DIR="elements/" -RESULTS="results/" -EXPECTED="expected/" - -set -eu - -# 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 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 - bst_checkout "$element_name".bst "$test_dir" - - exit=0 - compare_results "$element_name" "$RESULTS" "$EXPECTED" || exit=$? - if [ $exit == 0 ] - then - successes=$((successes + 1)) - fi - done - - if [ $total != $successes ] - then - return 1 - fi -} - -run_test "$@" diff --git a/integration-tests/pip-test/elements/dependencies/base-platform.bst b/integration-tests/pip-test/elements/dependencies/base-platform.bst deleted file mode 100644 index 51c9dc9fe..000000000 --- a/integration-tests/pip-test/elements/dependencies/base-platform.bst +++ /dev/null @@ -1,18 +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.6 - ref: 9a2d4d9b4a2cf4e1ddcfd1b696e5cefba35d62b70ef61435b15ea3cb905cc4cf - - arch == "i386": - track: runtime/org.freedesktop.BasePlatform/i386/1.6 -config: - source: files -public: - bst: - integration-commands: - - ldconfig diff --git a/integration-tests/pip-test/elements/dependencies/base-sdk.bst b/integration-tests/pip-test/elements/dependencies/base-sdk.bst deleted file mode 100644 index ba7ae24c5..000000000 --- a/integration-tests/pip-test/elements/dependencies/base-sdk.bst +++ /dev/null @@ -1,15 +0,0 @@ -kind: import -description: Import the base freedesktop SDK -sources: -- kind: ostree - url: gnomesdk:repo/ - gpg-key: keys/gnome-sdk.gpg - (?): - - arch == "x86_64": - track: runtime/org.freedesktop.BaseSdk/x86_64/1.6 - ref: fa0dbd1b1eee9ec89518c1938c89803e0c54a12cd7ce892082433ad56b8a6f9b - - arch == "i386": - track: runtime/org.freedesktop.BaseSdk/i386/1.6 -config: - source: files - target: usr diff --git a/integration-tests/pip-test/elements/hello-run.bst b/integration-tests/pip-test/elements/hello-run.bst deleted file mode 100644 index be577be8a..000000000 --- a/integration-tests/pip-test/elements/hello-run.bst +++ /dev/null @@ -1,14 +0,0 @@ -kind: script -description: Run pip-built binary - -depends: -- filename: dependencies/base-platform.bst - type: build -- filename: dependencies/base-sdk.bst - type: build -- filename: hello.bst - type: build - -config: - commands: - - "/usr/bin/hello > /buildstream/install/test" diff --git a/integration-tests/pip-test/elements/hello.bst b/integration-tests/pip-test/elements/hello.bst deleted file mode 100644 index 3d02428db..000000000 --- a/integration-tests/pip-test/elements/hello.bst +++ /dev/null @@ -1,16 +0,0 @@ -kind: pip -description: Pip test - -variables: - pip: pip3 - -depends: -- filename: dependencies/base-platform.bst - type: build -- filename: dependencies/base-sdk.bst - type: build - -sources: -- kind: tar - url: file:///hello.tar.xz - ref: ad96570b552498807abec33c06210bf68378d854ced6753b77916c5ed517610d diff --git a/integration-tests/pip-test/expected/hello-run/test b/integration-tests/pip-test/expected/hello-run/test deleted file mode 100644 index af5626b4a..000000000 --- a/integration-tests/pip-test/expected/hello-run/test +++ /dev/null @@ -1 +0,0 @@ -Hello, world! diff --git a/integration-tests/pip-test/expected/hello/usr/bin/hello b/integration-tests/pip-test/expected/hello/usr/bin/hello deleted file mode 100755 index c1cd3ca66..000000000 --- a/integration-tests/pip-test/expected/hello/usr/bin/hello +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/python3 -# EASY-INSTALL-ENTRY-SCRIPT: 'hello==0.1','console_scripts','hello' -__requires__ = 'hello==0.1' -import sys -from pkg_resources import load_entry_point - -if __name__ == '__main__': - sys.exit( - load_entry_point('hello==0.1', 'console_scripts', 'hello')() - ) diff --git a/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/PKG-INFO b/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/PKG-INFO deleted file mode 100644 index 9e9aa2fe6..000000000 --- a/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/PKG-INFO +++ /dev/null @@ -1,10 +0,0 @@ -Metadata-Version: 1.0 -Name: hello -Version: 0.1 -Summary: Hello, world! -Home-page: UNKNOWN -Author: Mathieu Bridon -Author-email: bochecha@daitauha.fr -License: MIT -Description: A dummy project to test the pip element in BuildStream -Platform: UNKNOWN diff --git a/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/SOURCES.txt b/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/SOURCES.txt deleted file mode 100644 index 613c32f69..000000000 --- a/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/SOURCES.txt +++ /dev/null @@ -1,6 +0,0 @@ -hello/__init__.py -hello.egg-info/PKG-INFO -hello.egg-info/SOURCES.txt -hello.egg-info/dependency_links.txt -hello.egg-info/entry_points.txt -hello.egg-info/top_level.txt
\ No newline at end of file diff --git a/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/dependency_links.txt b/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/dependency_links.txt deleted file mode 100644 index 8b1378917..000000000 --- a/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/dependency_links.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/entry_points.txt b/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/entry_points.txt deleted file mode 100644 index f65ce1f13..000000000 --- a/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/entry_points.txt +++ /dev/null @@ -1,3 +0,0 @@ -[console_scripts] -hello = hello:main - diff --git a/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/installed-files.txt b/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/installed-files.txt deleted file mode 100644 index a6a125251..000000000 --- a/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/installed-files.txt +++ /dev/null @@ -1,8 +0,0 @@ -../../../../bin/hello -../hello/__init__.py -../hello/__pycache__/__init__.cpython-35.pyc -PKG-INFO -SOURCES.txt -dependency_links.txt -entry_points.txt -top_level.txt diff --git a/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/top_level.txt b/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/top_level.txt deleted file mode 100644 index ce0136250..000000000 --- a/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello-0.1-py3.5.egg-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -hello diff --git a/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello/__init__.py b/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello/__init__.py deleted file mode 100644 index 4e00169b0..000000000 --- a/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello/__init__.py +++ /dev/null @@ -1,12 +0,0 @@ -def hello(name='world'): - return 'Hello, {name}!'.format(name=name) - - -def main(): - import argparse - - parser = argparse.ArgumentParser() - parser.add_argument('name', nargs='?', default='world') - args = parser.parse_args() - - print(hello(args.name)) diff --git a/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello/__pycache__/__init__.cpython-35.pyc b/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello/__pycache__/__init__.cpython-35.pyc Binary files differdeleted file mode 100644 index 19f41ac78..000000000 --- a/integration-tests/pip-test/expected/hello/usr/lib/python3.5/site-packages/hello/__pycache__/__init__.cpython-35.pyc +++ /dev/null diff --git a/integration-tests/pip-test/keys/gnome-sdk.gpg b/integration-tests/pip-test/keys/gnome-sdk.gpg Binary files differdeleted file mode 100644 index 8434b686c..000000000 --- a/integration-tests/pip-test/keys/gnome-sdk.gpg +++ /dev/null diff --git a/integration-tests/pip-test/project.conf b/integration-tests/pip-test/project.conf deleted file mode 100644 index 46985b075..000000000 --- a/integration-tests/pip-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/pip-test/run-pip-test.sh b/integration-tests/pip-test/run-pip-test.sh deleted file mode 100644 index 917896844..000000000 --- a/integration-tests/pip-test/run-pip-test.sh +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash -# -# A script to run a BuildStream test case. - - -TEST_DIR="elements/" -RESULTS="results/" -EXPECTED="expected/" - -set -eu - -# 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 - - tar_file="$(dirname "$(readlink -f "$0")")/src/hello.tar.xz" - bst_file="$(dirname "$(readlink -f "$0")")/elements/hello.bst" - - patch_file_location "$bst_file" "$tar_file" - - 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 - bst_checkout "$element_name".bst "$test_dir" - - exit=0 - - # Unfortunately the order written by Pip is not deterministic - # https://github.com/pypa/pip/pull/4667 - for FILE in $(find "$RESULTS" -name 'installed-files.txt'); do - LC_ALL=C sort "$FILE" > "$FILE.tmp" - mv "$FILE.tmp" "$FILE" - done - - compare_results "$element_name" "$RESULTS" "$EXPECTED" || exit=$? - if [ $exit == 0 ] - then - successes=$((successes + 1)) - fi - done - - if [ $total != $successes ] - then - return 1 - fi -} - -run_test "$@" diff --git a/integration-tests/pip-test/src/hello.tar.xz b/integration-tests/pip-test/src/hello.tar.xz Binary files differdeleted file mode 100644 index 72ec9b399..000000000 --- a/integration-tests/pip-test/src/hello.tar.xz +++ /dev/null diff --git a/integration-tests/run-test.sh b/integration-tests/run-test.sh deleted file mode 100755 index 17039bc99..000000000 --- a/integration-tests/run-test.sh +++ /dev/null @@ -1,196 +0,0 @@ -#!/bin/bash - -set -u - -GREEN="\e[0;32m" -YELLOW="\e[0;33m" -RED="\e[0;31m" -END="\e[0m" - -usage () { - cat <<EOF -Usage: - run-test.sh [-h|--help] [-a <arg>|--arg <arg>] <command> [<args>] - -Run various commands to test bst. - -Commands: - - test Run the test suite. If no arguments are given, the full - suite is run, otherwise the given arguments will be run - run Run the test suite. (Does not clean) - clean Clean temporary test files - -Options: - --help Display this help message and exit - --arg Specify an argument for bst, such as --colors - --cov Specify a coverage rcfile - --sources Specify a location for the source cache -EOF -} - -BST_COVERAGE= -BST_FLAGS= -BST_SOURCE_CACHE= -export BST_COVERAGE -export BST_FLAGS -export BST_SOURCE_CACHE - -main () { - while : ; - do - case "${1:-}" in - "test") - shift - configure - clean "$@" - run "$@" - break ;; - "run") - shift - configure - run "$@" - break ;; - "clean") - shift - clean "$@" - break ;; - --sources) - export BST_SOURCE_CACHE=$(realpath -m "${2}") - shift 2 ;; - -c|--cov) - export BST_COVERAGE=$(realpath -m "${2}") - shift 2 ;; - -a|--arg) - export BST_FLAGS="${BST_FLAGS:-} $2" - shift 2 ;; - -h|--help) - usage - break ;; - *) - echo "Error: Unrecognized argument '${1:-}'" 1>&2 - usage - break ;; - esac - done -} - - -# configure -# -# Creates the buildstream.conf configuration -configure () { - # Treat source cache specially, we want to reuse it when - # running automated CI - if [ -z "${BST_SOURCE_CACHE}" ]; then - BST_SOURCE_CACHE="$(pwd)/tmp/sources" - fi - - # Create buildstream.conf - cat > "$(pwd)/buildstream.conf" <<EOF -sourcedir: "${BST_SOURCE_CACHE}" -builddir: "$(pwd)/tmp/build" -artifactdir: "$(pwd)/tmp/artifacts" -logdir: "$(pwd)/tmp/logs" -EOF - CONFIG_LOCATION="$(pwd)/buildstream.conf" - export CONFIG_LOCATION -} - - -# run -# -# Run all tests in the current directory. -run () { - local succeeded=0 - local failed=0 - local state - local tests - local dir - - if [ $# -ge 1 ]; - then - tests=$@ - else - tests="*" - fi - - for dir in $tests; - do - if [ -d "$dir" ] && [ "$dir" != "tmp" ] - then - run-test "$dir" - state=$? - if [ $state == 0 ] - then - ((succeeded++)) - else - ((failed++)) - fi - fi - done - - if [ ! -z "${BST_COVERAGE}" ]; then - if [ -f .coverage ]; then - rm -f .coverage - fi - - for file in $(find . -name ".coverage.*"); do - coverage combine -a ${file} - done - coverage report -m - fi - - echo - printf "%4s test%.*s ${GREEN}succeeded${END}.\n" $succeeded $((succeeded != 1)) "s" - printf "%4s test%.*s ${RED}failed${END}.\n" $failed $((failed != 1)) "s" - - if [ $failed != 0 ] - then - exit 1 - fi -} - -# clean -# -# Clean all tests in the current directory. -clean () { - local dir - - for dir in *; - do - if [ -d "$dir" ] - then - (cd "$dir" || exit 1 - rm -rf "results/"* - rm -rf ".bst/" - rm -rf "$(pwd)/tmp/") - fi - done -} - -# run-test -# -# Run the test in the given directory -# -# Args: -# test ($1) - The test to run -# -run-test () { - local test="$1" - - echo "============================================================" - echo "Running tests for test case '$test'" - echo "============================================================" - - (cd "$test" || exit 1 - bash "run-$(basename "$test").sh") - - if [ ! "$?" -eq 0 ] - then - echo -e "Tests for '$test' ${RED}failed${END}.\n" 2>&1 - return 1 - fi -} - -main "$@" diff --git a/integration-tests/script-test/elements/dependencies/base-platform.bst b/integration-tests/script-test/elements/dependencies/base-platform.bst deleted file mode 100644 index a04a5b81c..000000000 --- a/integration-tests/script-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/script-test/elements/script-cwd-test.bst b/integration-tests/script-test/elements/script-cwd-test.bst deleted file mode 100644 index 48b25fb07..000000000 --- a/integration-tests/script-test/elements/script-cwd-test.bst +++ /dev/null @@ -1,14 +0,0 @@ -kind: script -description: Write to root using a script element - -variables: - cwd: /buildstream - -depends: - - filename: dependencies/base-platform.bst - type: build - -config: - commands: - - "echo 'test' > test" - - "cp /buildstream/test %{install-root}" diff --git a/integration-tests/script-test/elements/script-layout-test.bst b/integration-tests/script-test/elements/script-layout-test.bst deleted file mode 100644 index bb623a88f..000000000 --- a/integration-tests/script-test/elements/script-layout-test.bst +++ /dev/null @@ -1,23 +0,0 @@ -kind: script -description: Write to root using a script element - -variables: - install-root: /buildstream/nstall - build-root: /buildstream/uild - -depends: - - filename: dependencies/base-platform.bst - type: build - - filename: script-test.bst - type: build - -config: - layout: - - element: dependencies/base-platform.bst - destination: / - - - element: script-test.bst - destination: "%{build-root}" - - commands: - - "cp %{build-root}/test %{install-root}" diff --git a/integration-tests/script-test/elements/script-no-root-test.bst b/integration-tests/script-test/elements/script-no-root-test.bst deleted file mode 100644 index 2a40202d5..000000000 --- a/integration-tests/script-test/elements/script-no-root-test.bst +++ /dev/null @@ -1,12 +0,0 @@ -kind: script -description: Write to root using a script element - -depends: - - filename: dependencies/base-platform.bst - type: build - -config: - commands: - - "mkdir -p /buildstream/install" - - "echo 'I can not write to root' > /test" - - "cp /test /buildstream/install" diff --git a/integration-tests/script-test/elements/script-root-test.bst b/integration-tests/script-test/elements/script-root-test.bst deleted file mode 100644 index 4b2045e6f..000000000 --- a/integration-tests/script-test/elements/script-root-test.bst +++ /dev/null @@ -1,14 +0,0 @@ -kind: script -description: Write to root using a script element - -depends: - - filename: dependencies/base-platform.bst - type: build - -config: - root-read-only: False - - commands: - - "mkdir -p /buildstream/install" - - "echo 'I can write to root' > /test" - - "cp /test /buildstream/install" diff --git a/integration-tests/script-test/elements/script-test.bst b/integration-tests/script-test/elements/script-test.bst deleted file mode 100644 index 8ea31e0fe..000000000 --- a/integration-tests/script-test/elements/script-test.bst +++ /dev/null @@ -1,11 +0,0 @@ -kind: script -description: Script test - -depends: - - filename: dependencies/base-platform.bst - type: build - -config: - commands: - - "mkdir -p /buildstream/install" - - "echo 'Hi' > /buildstream/install/test" diff --git a/integration-tests/script-test/expected/script-cwd-test/test b/integration-tests/script-test/expected/script-cwd-test/test deleted file mode 100644 index 9daeafb98..000000000 --- a/integration-tests/script-test/expected/script-cwd-test/test +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/integration-tests/script-test/expected/script-layout-test/test b/integration-tests/script-test/expected/script-layout-test/test deleted file mode 100644 index b14df6442..000000000 --- a/integration-tests/script-test/expected/script-layout-test/test +++ /dev/null @@ -1 +0,0 @@ -Hi diff --git a/integration-tests/script-test/expected/script-no-root-test/test b/integration-tests/script-test/expected/script-no-root-test/test deleted file mode 100644 index 520aaba9b..000000000 --- a/integration-tests/script-test/expected/script-no-root-test/test +++ /dev/null @@ -1 +0,0 @@ -I can not write to root diff --git a/integration-tests/script-test/expected/script-root-test/test b/integration-tests/script-test/expected/script-root-test/test deleted file mode 100644 index 0987e6f11..000000000 --- a/integration-tests/script-test/expected/script-root-test/test +++ /dev/null @@ -1 +0,0 @@ -I can write to root diff --git a/integration-tests/script-test/expected/script-test/test b/integration-tests/script-test/expected/script-test/test deleted file mode 100644 index b14df6442..000000000 --- a/integration-tests/script-test/expected/script-test/test +++ /dev/null @@ -1 +0,0 @@ -Hi diff --git a/integration-tests/script-test/keys/gnome-sdk.gpg b/integration-tests/script-test/keys/gnome-sdk.gpg Binary files differdeleted file mode 100644 index 8434b686c..000000000 --- a/integration-tests/script-test/keys/gnome-sdk.gpg +++ /dev/null diff --git a/integration-tests/script-test/project.conf b/integration-tests/script-test/project.conf deleted file mode 100644 index 46985b075..000000000 --- a/integration-tests/script-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/script-test/run-script-test.sh b/integration-tests/script-test/run-script-test.sh deleted file mode 100644 index 6eff20656..000000000 --- a/integration-tests/script-test/run-script-test.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash -# -# A script to run a BuildStream test case. - - -TEST_DIR="elements/" -RESULTS="results/" -EXPECTED="expected/" - -set -eu - -# 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 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 - bst_checkout "$element_name".bst "$test_dir" - - exit=0 - compare_results "$element_name" "$RESULTS" "$EXPECTED" || exit=$? - if [ $exit == 0 ] - then - successes=$((successes + 1)) - fi - done - - if [ $total != $successes ] - then - return 1 - fi -} - -run_test "$@" diff --git a/integration-tests/shell-test/.bst/workspaces.yml b/integration-tests/shell-test/.bst/workspaces.yml deleted file mode 100644 index e69de29bb..000000000 --- a/integration-tests/shell-test/.bst/workspaces.yml +++ /dev/null diff --git a/integration-tests/shell-test/elements/dependencies/base-platform.bst b/integration-tests/shell-test/elements/dependencies/base-platform.bst deleted file mode 100644 index a04a5b81c..000000000 --- a/integration-tests/shell-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/shell-test/keys/gnome-sdk.gpg b/integration-tests/shell-test/keys/gnome-sdk.gpg Binary files differdeleted file mode 100644 index 8434b686c..000000000 --- a/integration-tests/shell-test/keys/gnome-sdk.gpg +++ /dev/null diff --git a/integration-tests/shell-test/project.conf b/integration-tests/shell-test/project.conf deleted file mode 100644 index 46985b075..000000000 --- a/integration-tests/shell-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/shell-test/run-shell-test.sh b/integration-tests/shell-test/run-shell-test.sh deleted file mode 100644 index 4de4b4a3b..000000000 --- a/integration-tests/shell-test/run-shell-test.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -# -# A script to run a BuildStream test case. - -ECHO_TEST_KEY="1234567890abcdefghijklmnopqrstuvwzyz" - -set -eu -source ../lib.sh - -assert_expected_key () { - - local test_name=$1 - local success=0 - - # Assert that the test key we echoed in our runtime made it to stdout and that we - # captured it in the output file. - if ! grep "${ECHO_TEST_KEY}" shell.out > /dev/null - then - success=1 - else - success=0 - fi - - report_results "$test_name" $success - return $success -} - -# run_test -# -# Run tests for this test case. -# -run_test () { - local success=0 - - bst_with_flags build "dependencies/base-platform.bst" - - bst_with_flags shell "dependencies/base-platform.bst" -- sh -c "echo ${ECHO_TEST_KEY}" | tee shell.out - assert_expected_key 'sh -c "echo ${ECHO_TEST_KEY}"' - if [ $? -ne 0 ]; then - success=1 - fi - - bst_with_flags shell "dependencies/base-platform.bst" -- /bin/echo ${ECHO_TEST_KEY} | tee shell.out - assert_expected_key "/bin/echo ${ECHO_TEST_KEY}" - if [ $? -ne 0 ]; then - success=1 - fi - - bst_with_flags shell "dependencies/base-platform.bst" -- sh -c "printf \"${ECHO_TEST_KEY}\n\"" | tee shell.out - assert_expected_key 'sh -c "printf \"${ECHO_TEST_KEY}\n\""' - if [ $? -ne 0 ]; then - success=1 - fi - - return $success -} - -run_test "$@" diff --git a/integration-tests/stack-test/elements/dependencies/another-hi.bst b/integration-tests/stack-test/elements/dependencies/another-hi.bst deleted file mode 100644 index c2b273dec..000000000 --- a/integration-tests/stack-test/elements/dependencies/another-hi.bst +++ /dev/null @@ -1,11 +0,0 @@ -kind: script -description: Another hi test - -depends: - - filename: dependencies/base-platform.bst - type: build - -config: - commands: - - "mkdir -p /buildstream/install" - - "echo 'Another hi' > /buildstream/install/another-hi" diff --git a/integration-tests/stack-test/elements/dependencies/base-platform.bst b/integration-tests/stack-test/elements/dependencies/base-platform.bst deleted file mode 100644 index a04a5b81c..000000000 --- a/integration-tests/stack-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/stack-test/elements/dependencies/hi.bst b/integration-tests/stack-test/elements/dependencies/hi.bst deleted file mode 100644 index 0b15e8761..000000000 --- a/integration-tests/stack-test/elements/dependencies/hi.bst +++ /dev/null @@ -1,11 +0,0 @@ -kind: script -description: Hi test - -depends: - - filename: dependencies/base-platform.bst - type: build - -config: - commands: - - "mkdir -p /buildstream/install" - - "echo 'Hi' > /buildstream/install/hi" diff --git a/integration-tests/stack-test/elements/stack-test.bst b/integration-tests/stack-test/elements/stack-test.bst deleted file mode 100644 index 4141dcc17..000000000 --- a/integration-tests/stack-test/elements/stack-test.bst +++ /dev/null @@ -1,6 +0,0 @@ -kind: stack -description: Stack test - -depends: - - dependencies/hi.bst - - dependencies/another-hi.bst diff --git a/integration-tests/stack-test/expected/stack-test/another-hi b/integration-tests/stack-test/expected/stack-test/another-hi deleted file mode 100644 index 42fa76d82..000000000 --- a/integration-tests/stack-test/expected/stack-test/another-hi +++ /dev/null @@ -1 +0,0 @@ -Another hi diff --git a/integration-tests/stack-test/expected/stack-test/hi b/integration-tests/stack-test/expected/stack-test/hi deleted file mode 100644 index b14df6442..000000000 --- a/integration-tests/stack-test/expected/stack-test/hi +++ /dev/null @@ -1 +0,0 @@ -Hi diff --git a/integration-tests/stack-test/keys/gnome-sdk.gpg b/integration-tests/stack-test/keys/gnome-sdk.gpg Binary files differdeleted file mode 100644 index 8434b686c..000000000 --- a/integration-tests/stack-test/keys/gnome-sdk.gpg +++ /dev/null diff --git a/integration-tests/stack-test/project.conf b/integration-tests/stack-test/project.conf deleted file mode 100644 index 8b3de5ac9..000000000 --- a/integration-tests/stack-test/project.conf +++ /dev/null @@ -1,18 +0,0 @@ -# Import-test BuildStream project configuration. - -# Project name -# -name: script-test - -# 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/stack-test/run-stack-test.sh b/integration-tests/stack-test/run-stack-test.sh deleted file mode 100644 index 6eff20656..000000000 --- a/integration-tests/stack-test/run-stack-test.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash -# -# A script to run a BuildStream test case. - - -TEST_DIR="elements/" -RESULTS="results/" -EXPECTED="expected/" - -set -eu - -# 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 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 - bst_checkout "$element_name".bst "$test_dir" - - exit=0 - compare_results "$element_name" "$RESULTS" "$EXPECTED" || exit=$? - if [ $exit == 0 ] - then - successes=$((successes + 1)) - fi - done - - if [ $total != $successes ] - then - return 1 - fi -} - -run_test "$@" |