Nux

Merge lp:~smspillaz/nux/nux.fix_1086701 into lp:nux

  1. nux.fix_1086701
  2. Merge into trunk
Proposed by Sam Spilsbury on 2012-12-05
Status: Merged
Approved by: Francis Ginther on 2012-12-11
Approved revision: 729
Merged at revision: 737
Proposed branch: lp:~smspillaz/nux/nux.fix_1086701
Merge into: lp:nux
Diff against target: 25 lines (+2/-2)
2 files modified
tests/Makefile.am (+1/-1)
tests/gtest-nux-gesturebroker.cpp (+1/-1)
To merge this branch: bzr merge lp:~smspillaz/nux/nux.fix_1086701
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2012-12-11
Brandon Schaefer (community) 2012-12-05 Approve on 2012-12-11
Review via email: mp+138070@code.launchpad.net

Commit Message

Fix typo and linker error.

Description of the Change

The tests were failing to build due to a lingering typo. This fixes that typo and also fixes a linker error with ibus.

This crash still happens:

[----------] 3 tests from GeisAdapterTest
[ RUN ] GeisAdapterTest.SignalsInitComplete

Program received signal SIGSEGV, Segmentation fault.
0x00007ffff7276903 in std::__detail::_List_node_base::_M_hook(std::__detail::_List_node_base*) () from /usr/lib/x86_64-linux-gnu/libstdc++.so.6
(gdb) bt
#0 0x00007ffff7276903 in std::__detail::_List_node_base::_M_hook(std::__detail::_List_node_base*) () from /usr/lib/x86_64-linux-gnu/libstdc++.so.6
#1 0x0000000000421cdf in _M_insert<_GeisEvent* const&> (__position=...,
    this=0x48a9b8) at /usr/include/c++/4.7/bits/stl_list.h:1534
#2 push_back (__x=<synthetic pointer>, this=0x48a9b8)
    at /usr/include/c++/4.7/bits/stl_list.h:997
#3 FinishInitialization (geis=0x48a9b0, this=<optimised out>)
    at gtest-nux-geisadapter.cpp:36
#4 GeisAdapterTest_SignalsInitComplete_Test::TestBody (this=0x487760)
    at gtest-nux-geisadapter.cpp:67
#5 0x000000000044932a in HandleSehExceptionsInMethodIfSupported<testing::Test, void> (method=<optimised out>, object=<optimised out>,
    location=<optimised out>) at /usr/src/gtest/src/gtest.cc:2090
#6 testing::internal::HandleExceptionsInMethodIfSupported<testing::Test, void>
    (object=object@entry=0x487760, method=&virtual testing::Test::TestBody(),
    location=location@entry=0x44c308 "the test body")
    at /usr/src/gtest/src/gtest.cc:2126
#7 0x000000000043e307 in testing::Test::Run (this=this@entry=0x487760)
    at /usr/src/gtest/src/gtest.cc:2162
#8 0x000000000043e3de in testing::TestInfo::Run (this=0x47bcb0)
    at /usr/src/gtest/src/gtest.cc:2338
#9 0x000000000043e52d in testing::TestCase::Run (this=0x47bdf0)
    at /usr/src/gtest/src/gtest.cc:2445

However its unrelated, and also very strange (it seems as though geis_new returns a pointer to free'd memory because stl is complaining that a list object is 0x0 (when that isn't true at all))

To post a comment you must log in.
Sam Spilsbury (smspillaz) wrote :

Someone needs to do something about the tests not being built by default, having it this way is error-prone and defeats the purpose of a test suite

Brandon Schaefer (brandontschaefer) wrote :

Awesome, looks good!

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Francis Ginther (fginther) wrote :

Re-approved. Job failed due to a configuration error.

PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Francis Ginther (fginther) wrote :

Re-approved. I was too clever and tried to enable too much data collection. Going back to the older configuration.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/Makefile.am'
2--- tests/Makefile.am 2012-11-23 23:55:02 +0000
3+++ tests/Makefile.am 2012-12-05 09:05:23 +0000
4@@ -275,7 +275,7 @@
5
6 xtest_text_entry_CPPFLAGS = $(TestFlags)
7 xtest_text_entry_LDADD = $(TestLibs)
8-xtest_text_entry_LDFLAGS = -lpthread -lXtst
9+xtest_text_entry_LDFLAGS = -lpthread -lXtst -libus-1.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0
10
11 xtest_text_entry_logic_SOURCES = xtest-text-entry-logic.cpp \
12 nux_automated_test_framework.cpp \
13
14=== modified file 'tests/gtest-nux-gesturebroker.cpp'
15--- tests/gtest-nux-gesturebroker.cpp 2012-11-28 03:34:12 +0000
16+++ tests/gtest-nux-gesturebroker.cpp 2012-12-05 09:05:23 +0000
17@@ -87,7 +87,7 @@
18 ASSERT_EQ (0, g_gesture_acceptance[0]);
19
20 /* This target is now unavailable */
21- target->MakeUnavailable();
22+ target->Die();
23
24 /* Reject the gesture */
25 EXPECT_EQ (-1, g_gesture_acceptance[0]);

Subscribers

People subscribed via source and target branches