You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by no...@apache.org on 2020/12/29 12:36:21 UTC
[buildstream] branch jjardon/integration-test created (now c6f1c15)
This is an automated email from the ASF dual-hosted git repository.
not-in-ldap pushed a change to branch jjardon/integration-test
in repository https://gitbox.apache.org/repos/asf/buildstream.git.
at c6f1c15 integration-tests/compose-test: Fix location of tarball
This branch includes the following new commits:
new 141e8db buildstream/plugins/elements/autotools.yaml: Make builds out of tree by default
new 4420318 integration-tests/cmake-test: Fix location of tarball
new c6f1c15 integration-tests/compose-test: Fix location of tarball
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[buildstream] 02/03: integration-tests/cmake-test: Fix location of
tarball
Posted by no...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
not-in-ldap pushed a commit to branch jjardon/integration-test
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 442031890271f50989ebf42ceb8373fbd1fb5983
Author: Javier Jardón <jj...@gnome.org>
AuthorDate: Tue Dec 12 20:22:07 2017 +0000
integration-tests/cmake-test: Fix location of tarball
---
integration-tests/cmake-test/elements/step7.bst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/integration-tests/cmake-test/elements/step7.bst b/integration-tests/cmake-test/elements/step7.bst
index bd4d1f3..78180fe 100644
--- a/integration-tests/cmake-test/elements/step7.bst
+++ b/integration-tests/cmake-test/elements/step7.bst
@@ -9,5 +9,5 @@ depends:
sources:
- kind: tar
- url: file:///home/tristanmaat/Documents/Projects/buildstream/buildstream-tests/cmake-test/src/step7.tar.gz
+ url: file:///step7.tar.gz
ref: 9591707afbae77751730b4af4c52a18b1cdc4378237bc64055f099bc95c330db
[buildstream] 01/03: buildstream/plugins/elements/autotools.yaml:
Make builds out of tree by default
Posted by no...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
not-in-ldap pushed a commit to branch jjardon/integration-test
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 141e8dbf465685c49285e6cee654a5aa448ae978
Author: Javier Jardón <jj...@gnome.org>
AuthorDate: Wed Dec 6 16:29:16 2017 +0000
buildstream/plugins/elements/autotools.yaml: Make builds out of tree by default
Similar to what cmake and meson do
---
buildstream/plugins/elements/autotools.yaml | 12 ++++++++----
tests/variables/variables.py | 4 ++--
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/buildstream/plugins/elements/autotools.yaml b/buildstream/plugins/elements/autotools.yaml
index 6a16648..dfa4679 100644
--- a/buildstream/plugins/elements/autotools.yaml
+++ b/buildstream/plugins/elements/autotools.yaml
@@ -2,6 +2,8 @@
variables:
+ build-dir: _builddir
+
autogen: |
export NOCONFIGURE=1;
if [ -e autogen ]; then ./autogen;
@@ -11,7 +13,7 @@ variables:
else autoreconf -ivf;
fi
- conf-cmd: ./configure
+ conf-cmd: configure
conf-extra: ''
conf-global: ''
conf-local: ''
@@ -33,10 +35,12 @@ variables:
configure: |
- %{conf-cmd} %{conf-args}
+ mkdir %{build-dir}
+ cd %{build-dir}
+ ../%{conf-cmd} %{conf-args}
- make: make
- make-install: make -j1 DESTDIR="%{install-root}" install
+ make: make -C %{build-dir}
+ make-install: make -j1 -C %{build-dir} DESTDIR="%{install-root}" install
# Set this if the sources cannot handle parallelization.
#
diff --git a/tests/variables/variables.py b/tests/variables/variables.py
index 47b1ff9..fa8ddb6 100644
--- a/tests/variables/variables.py
+++ b/tests/variables/variables.py
@@ -43,7 +43,7 @@ def assert_command(datafiles, tmpdir, target, command, expected):
###############################################################
@pytest.mark.skipif(not HAVE_ROOT, reason="requires root permissions")
@pytest.mark.parametrize("target,command,expected", [
- ('autotools.bst', 'install-commands', "make -j1 DESTDIR=\"/buildstream/install\" install"),
+ ('autotools.bst', 'install-commands', "make -j1 -C _builddir DESTDIR=\"/buildstream/install\" install"),
('cmake.bst', 'configure-commands',
"cmake -B_builddir -H. -DCMAKE_INSTALL_PREFIX:PATH=\"/usr\" \\\n" +
"-DCMAKE_INSTALL_LIBDIR=lib"),
@@ -64,7 +64,7 @@ def test_defaults(datafiles, tmpdir, target, command, expected):
################################################################
@pytest.mark.skipif(not HAVE_ROOT, reason="requires root permissions")
@pytest.mark.parametrize("target,command,expected", [
- ('autotools.bst', 'install-commands', "make -j1 DESTDIR=\"/custom/install/root\" install"),
+ ('autotools.bst', 'install-commands', "make -j1 -C _builddir DESTDIR=\"/custom/install/root\" install"),
('cmake.bst', 'configure-commands',
"cmake -B_builddir -H. -DCMAKE_INSTALL_PREFIX:PATH=\"/opt\" \\\n" +
"-DCMAKE_INSTALL_LIBDIR=lib"),
[buildstream] 03/03: integration-tests/compose-test: Fix location
of tarball
Posted by no...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
not-in-ldap pushed a commit to branch jjardon/integration-test
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit c6f1c15e078c3a253b03eab0195f1a064133b24d
Author: Javier Jardón <jj...@gnome.org>
AuthorDate: Tue Dec 12 20:22:27 2017 +0000
integration-tests/compose-test: Fix location of tarball
---
integration-tests/compose-test/elements/dependencies/amhello-full.bst | 2 +-
integration-tests/compose-test/elements/dependencies/amhello.bst | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/integration-tests/compose-test/elements/dependencies/amhello-full.bst b/integration-tests/compose-test/elements/dependencies/amhello-full.bst
index 29e94bf..307bc65 100644
--- a/integration-tests/compose-test/elements/dependencies/amhello-full.bst
+++ b/integration-tests/compose-test/elements/dependencies/amhello-full.bst
@@ -7,5 +7,5 @@ depends:
sources:
- kind: tar
- url: file:///home/tristanmaat/Documents/Projects/buildstream/buildstream-tests/compose-test/src/amhello.tar.gz
+ url: file:///amhello.tar.gz
ref: 3aa3c2bf7a488fea24303c4d98d1b5c0a72734f61615b935cf62e4e126b127d2
diff --git a/integration-tests/compose-test/elements/dependencies/amhello.bst b/integration-tests/compose-test/elements/dependencies/amhello.bst
index 2e09158..5dc13b4 100644
--- a/integration-tests/compose-test/elements/dependencies/amhello.bst
+++ b/integration-tests/compose-test/elements/dependencies/amhello.bst
@@ -9,5 +9,5 @@ depends:
sources:
- kind: tar
- url: file:///home/tristanmaat/Documents/Projects/buildstream/buildstream-tests/compose-test/src/amhello.tar.gz
+ url: file:///amhello.tar.gz
ref: 3aa3c2bf7a488fea24303c4d98d1b5c0a72734f61615b935cf62e4e126b127d2