I have made the following changes intended for : nemo:devel:mw / telepathy-qt4
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/205 Thank You, Reto Zingg [This message was auto-generated] --- Request # 205: Messages from BOSS: State: review at 2013-04-12T20:53:27 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:kontio:Telepathy / telepathy-qt4 -> nemo:devel:mw / telepathy-qt4 changes files: -------------- --- telepathy-qt4.changes +++ telepathy-qt4.changes @@ -0,0 +1,3 @@ +* Fri Apr 12 2013 Reto Zingg <[email protected]> - 0.9.3 +- package tests to -tests package + new: ---- INSIGNIFICANT mktests.sh.in nemo-tests-install.patch runDbusTest.sh.in runTest.sh.in spec files: ----------- --- telepathy-qt4.spec +++ telepathy-qt4.spec @@ -15,7 +15,12 @@ License: GPLv2 URL: http://telepathy.freedesktop.org/wiki/ Source0: http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-%{version}.tar.gz +Source1: INSIGNIFICANT +Source2: mktests.sh.in +Source3: runDbusTest.sh.in +Source4: runTest.sh.in Source100: telepathy-qt4.yaml +Patch0: nemo-tests-install.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: pkgconfig(QtCore) >= 4.6.0 @@ -73,22 +78,44 @@ that use telepathy-qt4-farstream. +%package tests +Summary: Automated tests for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} +Requires: dbus-python + +%description tests +This package contains automated tests and tests.xml + + %prep %setup -q -n telepathy-qt-%{version} +# nemo-tests-install.patch +%patch0 -p1 # >> setup +%__cp $RPM_SOURCE_DIR/INSIGNIFICANT tests/ +%__cp $RPM_SOURCE_DIR/mktests.sh.in tests/ +%__cp $RPM_SOURCE_DIR/runDbusTest.sh.in tests/ +%__cp $RPM_SOURCE_DIR/runTest.sh.in tests/ +%__chmod 0644 tests/INSIGNIFICANT +%__chmod 0755 tests/mktests.sh.in +%__chmod 0755 tests/runDbusTest.sh.in +%__chmod 0755 tests/runTest.sh.in # << setup %build # >> build pre -%cmake -DENABLE_TESTS=FALSE -DENABLE_FARSIGHT=FALSE -DENABLE_FARSTREAM=TRUE +%cmake -DENABLE_TESTS=TRUE -DENABLE_FARSIGHT=FALSE -DENABLE_FARSTREAM=TRUE -DENABLE_EXAMPLES=FALSE # << build pre make %{?jobs:-j%jobs} # >> build post +tests/mktests.sh > tests/tests.xml # << build post %install @@ -139,3 +166,9 @@ %{_libdir}/cmake/TelepathyQt4Farstream/TelepathyQt4FarstreamConfigVersion.cmake %{_libdir}/pkgconfig/TelepathyQt4Farstream.pc # << files farstream-devel + +%files tests +%defattr(-,root,root,-) +/opt/tests/%{name}/* +# >> files tests +# << files tests other changes: -------------- ++++++ INSIGNIFICANT (new) --- INSIGNIFICANT +++ INSIGNIFICANT ++++++ mktests.sh.in (new) --- mktests.sh.in +++ mktests.sh.in @@ -0,0 +1,57 @@ +#!/bin/sh + +IFS=";" + +cat <<EOF +<?xml version="1.0" encoding="UTF-8"?> +<testdefinition version="1.0"> + <suite name="telepathy-qt@QT_VERSION_MAJOR@"> + <description>Telepathy Qt @QT_VERSION_MAJOR@ tests</description> + <set name="telepathy-qt@QT_VERSION_MAJOR@-unit-tests"> +EOF + +for testcase in $(cat tests/unit-tests.list) +do + #testcase_name=$(echo $testcase|sed 's/\//_/') + attributes="name=\"$testcase\"" + insignificant=`grep "^$testcase" tests/INSIGNIFICANT || true` + if test -n "$insignificant" + then + continue + attributes="$attributes insignificant=\"true\"" + fi + cat <<EOF + <case $attributes> + <step>@NEMO_TESTS_DIR_BIN@/runTest.sh @NEMO_TESTS_DIR_BIN@/$testcase</step> + </case> +EOF +done + +cat <<EOF + </set> + <set name="telepathy-qt@QT_VERSION_MAJOR@-dbus-tests"> +EOF + +for testcase in $(cat tests/dbus/dbus-tests.list) +do + #testcase_name=$(echo $testcase|sed 's/\//_/') + attributes="name=\"$testcase\"" + insignificant=`grep "^$testcase" tests/INSIGNIFICANT || true` + if test -n "$insignificant" + then + continue + attributes="$attributes insignificant=\"true\"" + fi + cat <<EOF + <case $attributes> + <step>@NEMO_TESTS_DIR_BIN@/runDbusTest.sh @NEMO_TESTS_DIR_BIN@/$testcase</step> + </case> +EOF +done + +cat <<EOF + </set> + </suite> +</testdefinition> +EOF + ++++++ nemo-tests-install.patch (new) --- nemo-tests-install.patch +++ nemo-tests-install.patch @@ -0,0 +1,126 @@ +diff -Naur telepathy-qt-0.9.3/cmake/modules/TpQtMacros.cmake telepathy-qt-0.9.3-tests-install/cmake/modules/TpQtMacros.cmake +--- telepathy-qt-0.9.3/cmake/modules/TpQtMacros.cmake 2012-07-13 17:40:23.000000000 +0000 ++++ telepathy-qt-0.9.3-tests-install/cmake/modules/TpQtMacros.cmake 2013-04-12 14:12:41.159804156 +0000 +@@ -419,6 +419,7 @@ + set(with_session_bus ${CMAKE_CURRENT_BINARY_DIR}/runDbusTest.sh) + add_test(${_fancyName} ${SH} ${with_session_bus} ${CMAKE_CURRENT_BINARY_DIR}/test-${_name}) + list(APPEND _telepathy_qt_test_cases test-${_name}) ++ list(APPEND _telepathy_qt_test_cases_dbus test-${_name}) + + # Valgrind and Callgrind targets + _tpqt_add_check_targets(${_fancyName} ${_name} ${with_session_bus} ${CMAKE_CURRENT_BINARY_DIR}/test-${_name}) +diff -Naur telepathy-qt-0.9.3/tests/CMakeLists.txt telepathy-qt-0.9.3-tests-install/tests/CMakeLists.txt +--- telepathy-qt-0.9.3/tests/CMakeLists.txt 2012-07-13 17:40:23.000000000 +0000 ++++ telepathy-qt-0.9.3-tests-install/tests/CMakeLists.txt 2013-04-12 20:34:51.013462217 +0000 +@@ -42,6 +42,24 @@ + tpqt_add_generic_unit_test(RCCSpec rccspec) + tpqt_add_generic_unit_test(FileTransferChannelCreationProperties file-transfer-channel-creation-properties) + ++# Add Nemo install targets ++set(NEMO_TESTS_DIR "/opt/tests/telepathy-qt${QT_VERSION_MAJOR}") ++set(NEMO_TESTS_DIR_BIN "${NEMO_TESTS_DIR}/bin") ++set(NEMO_TESTS_DIR_LIB "${NEMO_TESTS_DIR}/lib") ++set(NEMO_TESTS_DIR_DATA "${NEMO_TESTS_DIR}/data") ++set(NEMO_TESTS_DIR_DBUS "${NEMO_TESTS_DIR}/dbus-1") ++configure_file(mktests.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/mktests.sh) ++configure_file(runDbusTest.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/runDbusTest.sh) ++configure_file(runTest.sh.in ${CMAKE_CURRENT_SOURCE_DIR}/runTest.sh) ++file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unit-tests.list "${_telepathy_qt_test_cases}") ++INSTALL(TARGETS ${_telepathy_qt_test_cases} RUNTIME DESTINATION ${NEMO_TESTS_DIR_BIN}) ++INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/runTest.sh ${CMAKE_CURRENT_SOURCE_DIR}/runDbusTest.sh DESTINATION ${NEMO_TESTS_DIR_BIN} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ++INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSIGNIFICANT ${CMAKE_CURRENT_SOURCE_DIR}/tests.xml DESTINATION ${NEMO_TESTS_DIR}) ++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/unit-tests.list DESTINATION ${NEMO_TESTS_DIR}) ++INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/test-key-file-format-error.ini ${CMAKE_CURRENT_SOURCE_DIR}/test-key-file.ini DESTINATION ${NEMO_TESTS_DIR_DATA}/tests) ++INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/telepathy DESTINATION ${NEMO_TESTS_DIR_DATA}/tests) ++ + add_subdirectory(dbus-1) + add_subdirectory(dbus) + add_subdirectory(lib) ++ +diff -Naur telepathy-qt-0.9.3/tests/dbus/CMakeLists.txt telepathy-qt-0.9.3-tests-install/tests/dbus/CMakeLists.txt +--- telepathy-qt-0.9.3/tests/dbus/CMakeLists.txt 2012-07-13 17:40:23.000000000 +0000 ++++ telepathy-qt-0.9.3-tests-install/tests/dbus/CMakeLists.txt 2013-04-12 20:35:46.637635377 +0000 +@@ -100,3 +100,9 @@ + add_custom_target(check ctest --output-on-failure -O test.log + WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/tests) + add_dependencies(check check-local ${_telepathy_qt_test_cases}) ++ ++# Add Nemo install target for tests ++INSTALL(TARGETS ${_telepathy_qt_test_cases_dbus} RUNTIME DESTINATION ${NEMO_TESTS_DIR_BIN}) ++file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dbus-tests.list "${_telepathy_qt_test_cases_dbus}") ++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/dbus-tests.list DESTINATION ${NEMO_TESTS_DIR}) ++INSTALL(FILES ${CMAKE_SOURCE_DIR}/tools/with-session-bus.sh DESTINATION ${NEMO_TESTS_DIR_BIN} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) +diff -Naur telepathy-qt-0.9.3/tests/dbus-1/CMakeLists.txt telepathy-qt-0.9.3-tests-install/tests/dbus-1/CMakeLists.txt +--- telepathy-qt-0.9.3/tests/dbus-1/CMakeLists.txt 2012-07-13 17:40:23.000000000 +0000 ++++ telepathy-qt-0.9.3-tests-install/tests/dbus-1/CMakeLists.txt 2013-04-12 19:10:43.620323663 +0000 +@@ -2,3 +2,7 @@ + configure_file(session.conf.in ${CMAKE_CURRENT_BINARY_DIR}/session.conf) + + add_subdirectory(services) ++ ++# Add Nemo install target ++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/session.conf DESTINATION ${NEMO_TESTS_DIR_DBUS}) ++ +diff -Naur telepathy-qt-0.9.3/tests/dbus-1/services/CMakeLists.txt telepathy-qt-0.9.3-tests-install/tests/dbus-1/services/CMakeLists.txt +--- telepathy-qt-0.9.3/tests/dbus-1/services/CMakeLists.txt 2012-07-13 17:40:23.000000000 +0000 ++++ telepathy-qt-0.9.3-tests-install/tests/dbus-1/services/CMakeLists.txt 2013-04-12 19:09:13.180992764 +0000 +@@ -2,3 +2,7 @@ + set(abs_top_srcdir ${CMAKE_SOURCE_DIR}) + configure_file(account-manager.service.in ${CMAKE_CURRENT_BINARY_DIR}/account-manager.service) + configure_file(spurious.service.in ${CMAKE_CURRENT_BINARY_DIR}/spurious.service) ++ ++# Add Nemo install target ++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/spurious.service ${CMAKE_CURRENT_BINARY_DIR}/account-manager.service DESTINATION ${NEMO_TESTS_DIR_DBUS}/services/) ++ +diff -Naur telepathy-qt-0.9.3/tests/dbus-1/services/account-manager.service.in telepathy-qt-0.9.3-tests-install/tests/dbus-1/services/account-manager.service.in +--- telepathy-qt-0.9.3/tests/dbus-1/services/account-manager.service.in 2013-04-12 17:55:05.490364840 +0000 ++++ telepathy-qt-0.9.3-tests-install/tests/dbus-1/services/account-manager.service.in 2013-04-12 18:49:27.852722717 +0000 +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=org.freedesktop.Telepathy.AccountManager +-Exec=@TEST_PYTHON@ @abs_top_srcdir@/tests/lib/python/account-manager.py ++Exec=@TEST_PYTHON@ @NEMO_TESTS_DIR_BIN@/account-manager.py +diff -Naur telepathy-qt-0.9.3/tests/dbus-1/session.conf.in telepathy-qt-0.9.3-tests-install/tests/dbus-1/session.conf.in +--- telepathy-qt-0.9.3/tests/dbus-1/session.conf.in 2012-07-13 17:40:23.000000000 +0000 ++++ telepathy-qt-0.9.3-tests-install/tests/dbus-1/session.conf.in 2013-04-12 18:49:12.452663093 +0000 +@@ -12,7 +12,7 @@ + + <listen>unix:tmpdir=/tmp</listen> + +- <servicedir>@abs_top_builddir@/tests/dbus-1/services/</servicedir> ++ <servicedir>@NEMO_TESTS_DIR_DBUS@/services/</servicedir> + + <policy context="default"> + <!-- Allow everything to be sent --> +diff -Naur telepathy-qt-0.9.3/tests/lib/CMakeLists.txt telepathy-qt-0.9.3-tests-install/tests/lib/CMakeLists.txt +--- telepathy-qt-0.9.3/tests/lib/CMakeLists.txt 2012-07-13 17:40:23.000000000 +0000 ++++ telepathy-qt-0.9.3-tests-install/tests/lib/CMakeLists.txt 2013-04-12 20:37:12.523909257 +0000 +@@ -28,3 +28,7 @@ + add_subdirectory(glib) + add_subdirectory(glib-helpers) + endif(ENABLE_TP_GLIB_TESTS) ++ ++# Add Nemo install target ++INSTALL(TARGETS tp-qt-tests LIBRARY DESTINATION ${NEMO_TESTS_DIR_LIB}) ++INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/python/account-manager.py DESTINATION ${NEMO_TESTS_DIR_BIN} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) +diff -Naur telepathy-qt-0.9.3/tests/lib/glib/CMakeLists.txt telepathy-qt-0.9.3-tests-install/tests/lib/glib/CMakeLists.txt +--- telepathy-qt-0.9.3/tests/lib/glib/CMakeLists.txt 2012-07-13 17:40:23.000000000 +0000 ++++ telepathy-qt-0.9.3-tests-install/tests/lib/glib/CMakeLists.txt 2013-04-12 17:48:39.140353221 +0000 +@@ -71,3 +71,7 @@ + tp-glib-tests-future-extensions) + + endif(ENABLE_TP_GLIB_TESTS) ++ ++# Add Nemo install target ++INSTALL(TARGETS tp-glib-tests LIBRARY DESTINATION ${NEMO_TESTS_DIR_LIB}) ++ +diff -Naur telepathy-qt-0.9.3/tests/lib/glib-helpers/CMakeLists.txt telepathy-qt-0.9.3-tests-install/tests/lib/glib-helpers/CMakeLists.txt +--- telepathy-qt-0.9.3/tests/lib/glib-helpers/CMakeLists.txt 2012-07-13 17:40:23.000000000 +0000 ++++ telepathy-qt-0.9.3-tests-install/tests/lib/glib-helpers/CMakeLists.txt 2013-04-12 17:49:01.582392678 +0000 +@@ -20,3 +20,6 @@ + ${QT_QTDBUS_LIBRARY} + telepathy-qt${QT_VERSION_MAJOR}) + endif(ENABLE_TP_GLIB_TESTS) ++ ++# Add Nemo install target ++INSTALL(TARGETS tp-qt-tests-glib-helpers LIBRARY DESTINATION ${NEMO_TESTS_DIR_LIB}) ++++++ runDbusTest.sh.in (new) --- runDbusTest.sh.in +++ runDbusTest.sh.in @@ -0,0 +1,10 @@ +#!/bin/sh + +export LD_LIBRARY_PATH=@NEMO_TESTS_DIR_LIB@ +export abs_top_srcdir=@NEMO_TESTS_DIR_DATA@ +export abs_top_builddir=@NEMO_TESTS_DIR_DATA@ +export XDG_DATA_DIRS=@NEMO_TESTS_DIR_DATA@/tests +export XDG_DATA_HOME=@NEMO_TESTS_DIR_DATA@/tests + +sh @NEMO_TESTS_DIR_BIN@/with-session-bus.sh --config-file=@NEMO_TESTS_DIR_DBUS@/session.conf -- "$@" + ++++++ runTest.sh.in (new) --- runTest.sh.in +++ runTest.sh.in @@ -0,0 +1,10 @@ +#!/bin/sh + +export LD_LIBRARY_PATH=@NEMO_TESTS_DIR_LIB@ +export abs_top_srcdir=@NEMO_TESTS_DIR_DATA@ +export abs_top_builddir=@NEMO_TESTS_DIR_DATA@ +export XDG_DATA_DIRS=@NEMO_TESTS_DIR_DATA@/tests +export XDG_DATA_HOME=@NEMO_TESTS_DIR_DATA@/tests + +"$@" + ++++++ telepathy-qt4.yaml --- telepathy-qt4.yaml +++ telepathy-qt4.yaml @@ -7,6 +7,12 @@ URL: http://telepathy.freedesktop.org/wiki/ Sources: - http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-%{version}.tar.gz + - INSIGNIFICANT + - mktests.sh.in + - runDbusTest.sh.in + - runTest.sh.in +Patches: + - nemo-tests-install.patch Description: | Qt-based library for Telepathy components. PkgConfigBR: @@ -58,3 +64,15 @@ - telepathy-farstream-devel Obsoletes: - "%{name}-farsight-devel" + + - Name: tests + Group: Development/Libraries + Summary: Automated tests for %{name} + Description: | + This package contains automated tests and tests.xml + Requires: + - "%{name} = %{version}" + - dbus-python + Files: + - /opt/tests/%{name}/* +
