Snapcraft

Merge lp://qastaging/~dholbach/snapcraft/1496392 into lp://qastaging/~snappy-dev/snapcraft/core

  1. 1496392
  2. Merge into core
Proposed by Daniel Holbach
Status: Merged
Approved by: Leo Arias
Approved revision: 173
Merged at revision: 173
Proposed branch: lp://qastaging/~dholbach/snapcraft/1496392
Merge into: lp://qastaging/~snappy-dev/snapcraft/core
Diff against target: 181 lines (+65/-49)
5 files modified
debian/control (+5/-14)
debian/rules (+0/-6)
debian/tests/control (+10/-0)
integration-tests/runtests.sh (+48/-0)
runtests.sh (+2/-29)
To merge this branch: bzr merge lp://qastaging/~dholbach/snapcraft/1496392
Reviewer Review Type Date Requested Status
Leo Arias (community) Approve
Sergio Schvezov Approve
Review via email: mp+271319@code.qastaging.launchpad.net

Commit message

Add autopkgtest, reshuffle build-deps accordingly and run wrap-and-sort.

Description of the change

One test fails, which also fails, when I run ./runtests.sh locally:

2015.com.canonical.snapcraft::snapcraft/normal/dependencies: fail

To test the autopkgtest, I ran in the branch:

Just once: adt-buildvm-ubuntu-cloud -v

Then:
 bzr bd -- -S
 adt-run --source ../snapcraft_0.2.dsc --- qemu adt-wily-amd64-cloud.img

To post a comment you must log in.
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

thanks for this!

Are you sure on of the tests fail though? The test name has a 'fail' in it
2015.com.canonical.snapcraft::snapcraft/normal/dependencies-fail: pass

:-)

I approve, but am going to wait on elopio

review: Approve
Revision history for this message
Daniel Holbach (dholbach) wrote :
Download full text (8.9 KiB)

-------------[ Running job 11 / 21. Estimated time left: 0:00:03 ]--------------
-----------------------[ snapcraft/normal/dependencies ]------------------------
ID: 2015.com.canonical.snapcraft::snapcraft/normal/dependencies
Category: 2013.com.canonical.plainbox::uncategorised
... 8< -------------------------------------------------------------------------
+ cp -rT /home/daniel/dev/snappy/snapcraft/integration-tests/data/dependencies .
+ snapcraft-coverage stage
Starting new HTTPS connection (1): wiki.ubuntu.com
Pulling p1
Building p1
gcc -shared -fPIC -o libp1.so p1.c
mkdir -p /tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/lib /tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/include
cp -a libp1.so /tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/lib
cp -a p1.h /tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/include
make
make install DESTDIR=/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install
Staging p1
Pulling p2
Building p2
gcc -shared -fPIC -o libp2.so -I/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/include -I/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/usr/include -I/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/include/x86_64-linux-gnu -I/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/usr/include/x86_64-linux-gnu -L/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/lib -L/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/usr/lib -L/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/lib/x86_64-linux-gnu -L/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/usr/lib/x86_64-linux-gnu p2.c -lp1
mkdir -p /tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p2/install/lib /tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p2/install/include
cp -a libp2.so /tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p2/install/lib
cp -a p2.h /tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p2/install/include
make
make install DESTDIR=/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p2/install
Staging p2
Pulling p3
Building p3
gcc -o p3 -I/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/include -I/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/usr/include -I/tmp/cwd-ft5m88da.701b311da688faea814ceebc385627ea2374f25d396e8ef336fb1b171dd593d9/parts/p1/install/include/x86_64-linux-gnu -I/tmp/cwd-ft5m88da.701b311da688...

Read more...

lp://qastaging/~dholbach/snapcraft/1496392 updated
170. By Daniel Holbach

merge from trunk

171. By Daniel Holbach

merged lp:~elopio/snapcraft/dep8 and resolved conflicts

Revision history for this message
Daniel Holbach (dholbach) wrote :

Running ./integration-tests/runtests.sh now assemble-meta fails: http://pastebin.ubuntu.com/12435785/

lp://qastaging/~dholbach/snapcraft/1496392 updated
172. By Daniel Holbach

add build-essential to test-depends

173. By Daniel Holbach

merge trunk

Revision history for this message
Daniel Holbach (dholbach) wrote :

It works now!

Revision history for this message
Leo Arias (elopio) wrote :

indeed, it works!
Thanks Daniel.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches