I have made the following changes intended for : nemo:devel:mw / maliit-framework
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.merproject.org//request/show/83 Thank You, Martin Kampas [This message was auto-generated] --- Request # 83: Messages from BOSS: State: review at 2013-03-22T08:30:09 by cibot Reviews: accepted by cibot : Prechecks succeeded. new for nemo:devel:mw : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:martyone:branches:nemo:devel:mw / maliit-framework -> nemo:devel:mw / maliit-framework changes files: -------------- --- maliit-framework.changes +++ maliit-framework.changes @@ -0,0 +1,4 @@ +* Tue Mar 19 2013 Martin Kampas <[email protected]> - 0.81.4+git2.13d20e5fbc4 +- NEMO#528 - maliit-framework-tests fail +- Add maliit-framework-0.81.4+git2.13d20e5fbc4-fix-tests-definition.patch + new: ---- maliit-framework-0.81.4+git2.13d20e5fbc4-fix-tests-definition.patch spec files: ----------- --- maliit-framework.spec +++ maliit-framework.spec @@ -20,6 +20,7 @@ Source3: maliit-server.service Source100: maliit-framework.yaml Patch0: enable-systemd-activation.patch +Patch1: %{name}-%{version}-fix-tests-definition.patch Requires: dbus-x11 Requires(pre): %{_bindir}/gconftool-2 Requires(preun): %{_bindir}/gconftool-2 @@ -136,6 +137,8 @@ # enable-systemd-activation.patch %patch0 -p1 +# %{name}-%{version}-fix-tests-definition.patch +%patch1 -p1 # >> setup # << setup other changes: -------------- ++++++ maliit-framework-0.81.4+git2.13d20e5fbc4-fix-tests-definition.patch (new) --- maliit-framework-0.81.4+git2.13d20e5fbc4-fix-tests-definition.patch +++ maliit-framework-0.81.4+git2.13d20e5fbc4-fix-tests-definition.patch @@ -0,0 +1,55 @@ +From de55485b91e66ad6cb83f1c13390ecec7b26b4af Mon Sep 17 00:00:00 2001 +From: Martin Kampas <[email protected]> +Date: Tue, 19 Mar 2013 07:46:21 +0100 +Subject: [PATCH] Fix tests.xml generation + +Fixes NEMO#528 - maliit-framework-tests fail + +Signed-off-by: Martin Kampas <[email protected]> +--- + tests/gen-tests-xml.sh.in | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/tests/gen-tests-xml.sh.in b/tests/gen-tests-xml.sh.in +index c6d7331..f9bc659 100755 +--- a/tests/gen-tests-xml.sh.in ++++ b/tests/gen-tests-xml.sh.in +@@ -1,13 +1,13 @@ + #!/bin/bash + + STARTUP_TEMPLATE="<case name=\"init_testcase\" description=\"stop other components\" requirement=\"\" timeout=\"120\"> +- <step expected_result=\"0\">initctl stop xsession/clipboard</step> ++ <step expected_result=\"0\">systemctl --user stop maliit-server.service</step> + </case> + " + UT_STARTUP="${STARTUP_TEMPLATE}" + + FINAL_TEMPLATE="<case name=\"zfinal_testcase\" description=\"restart stopped components\" requirement=\"\" timeout=\"120\"> +- <step expected_result=\"0\">initctl start xsession/clipboard</step> ++ <step expected_result=\"0\">systemctl --user start maliit-server.service</step> + </case> + " + UT_FINAL="${FINAL_TEMPLATE}" +@@ -19,7 +19,7 @@ for TEST in `ls -d ?t_*`; do + if [ -x $TEST/$TEST ]; then + + TESTCASE_TEMPLATE="<case name=\"$TEST\" description=\"$TEST\" requirement=\"\" timeout=\"60\"> +- <step expected_result=\"0\">LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@MALIIT_TEST_LIBDIR@/plugins:/usr/lib/qt4/plugins/inputmethods:/usr/lib/meego-im-plugins/factories @MALIIT_TEST_LIBDIR@/$TEST/$TEST</step> ++ <step expected_result=\"0\">LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@MALIIT_TEST_LIBDIR@/plugins:/usr/lib/qt4/plugins/inputmethods:@M_IM_FACTORY_PLUGINS_DIR@ @MALIIT_TEST_LIBDIR@/$TEST/$TEST</step> + </case> + " + +@@ -32,10 +32,6 @@ TESTSUITE_TEMPLATE="<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?> + <suite name=\"@MALIIT_TEST_SUITE@\"> + <set name=\"unit_tests\" description=\"Unit Tests\"> + +- <case name=\"sleep_workaround\" description=\"ensure X server is running. remove when proper fix is in place\" requirement=\"\" timeout=\"60\"> +- <step expected_result=\"0\">sleep 30</step> +- </case> +- + $UT_STARTUP + $UT_TESTCASES + $UT_FINAL +-- +1.8.1.5 + ++++++ maliit-framework.yaml --- maliit-framework.yaml +++ maliit-framework.yaml @@ -10,6 +10,7 @@ - "%{name}-%{version}.tar.bz2" Patches: - enable-systemd-activation.patch + - "%{name}-%{version}-fix-tests-definition.patch" ExtraSources: - maliit-server.desktop;%{_sysconfdir}/xdg/autostart - maliit-server.sh;%{_sysconfdir}/profile.d
