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

[Sam Spilsbury]

Fix typo and linker error.

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))

[Sam Spilsbury (smspillaz)]

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)]

Awesome, looks good!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/79/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=panda-pbuilder,distribution=quantal,flavor=armhf/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/79/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/80/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=panda-pbuilder,distribution=quantal,flavor=armhf/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/80/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/81/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=panda-pbuilder,distribution=quantal,flavor=armhf/81/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/81/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/81/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

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

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2012-11-23 23:55:02 +0000
+++ tests/Makefile.am	2012-12-05 09:05:23 +0000
@@ -275,7 +275,7 @@
 
 xtest_text_entry_CPPFLAGS = $(TestFlags)
 xtest_text_entry_LDADD = $(TestLibs)
-xtest_text_entry_LDFLAGS = -lpthread -lXtst
+xtest_text_entry_LDFLAGS = -lpthread -lXtst -libus-1.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0
 
 xtest_text_entry_logic_SOURCES = xtest-text-entry-logic.cpp \
   nux_automated_test_framework.cpp \

=== modified file 'tests/gtest-nux-gesturebroker.cpp'
--- tests/gtest-nux-gesturebroker.cpp	2012-11-28 03:34:12 +0000
+++ tests/gtest-nux-gesturebroker.cpp	2012-12-05 09:05:23 +0000
@@ -87,7 +87,7 @@
   ASSERT_EQ (0, g_gesture_acceptance[0]);
 
   /* This target is now unavailable */
-  target->MakeUnavailable();
+  target->Die();
 
   /* Reject the gesture */
   EXPECT_EQ (-1, g_gesture_acceptance[0]);