Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noGdbOnArm into lp:ubuntu-ui-toolkit/staging

Proposed by Cris Dywan
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 1910
Merged at revision: 1913
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noGdbOnArm
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 19 lines (+7/-2)
1 file modified
tests/unit/runtest.sh (+7/-2)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noGdbOnArm
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Zoltan Balogh Approve
Review via email: mp+290043@code.launchpad.net

Commit message

No gdb when running unit tests on armv7l

To post a comment you must log in.
Revision history for this message
Zoltan Balogh (bzoltan) :
review: Approve
1910. By Cris Dywan

Use less specific arm arch check

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tests/unit/runtest.sh'
--- tests/unit/runtest.sh 2016-03-15 19:41:28 +0000
+++ tests/unit/runtest.sh 2016-03-24 17:42:15 +0000
@@ -43,8 +43,13 @@
43 fi43 fi
44 _CMD="-n $_TESTFILE -m 300"44 _CMD="-n $_TESTFILE -m 300"
4545
46 _CMD="dbus-test-runner --task gdb -p --quiet $_CMD"46 DEB_HOST_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
47 _CMD="$_CMD -p --batch -p -ex -p 'set print thread-events off' -p -ex -p run -p -ex -p bt -p --return-child-result -p --args -p $EXE"47 if [[ ${DEB_HOST_ARCH} =~ 'arm' ]]; then
48 _CMD="dbus-test-runner --task $EXE $_CMD"
49 else
50 _CMD="dbus-test-runner --task gdb -p --quiet $_CMD"
51 _CMD="$_CMD -p --batch -p -ex -p 'set print thread-events off' -p -ex -p run -p -ex -p bt -p --return-child-result -p --args -p $EXE"
52 fi
4853
49 if [ "$_MINIMAL" = "minimal" ]; then54 if [ "$_MINIMAL" = "minimal" ]; then
50 _CMD="$_CMD -p -platform -p minimal"55 _CMD="$_CMD -p -platform -p minimal"

Subscribers

People subscribed via source and target branches