I have made the following changes intended for : nemo:devel:mw / telepathy-rakia
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/239 Thank You, Reto Zingg [This message was auto-generated] --- Request # 239: Messages from BOSS: State: review at 2013-04-19T12:49:33 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-rakia -> nemo:devel:mw / telepathy-rakia changes files: -------------- --- telepathy-rakia.changes +++ telepathy-rakia.changes @@ -0,0 +1,4 @@ +* Fri Apr 19 2013 Reto Zingg <[email protected]> - 0.7.4 +- add -tests package +- add -devel package + new: ---- 0002-nemo-test-install.patch mktests.sh runTest.sh spec files: ----------- --- telepathy-rakia.spec +++ telepathy-rakia.spec @@ -15,8 +15,11 @@ License: LGPLv2+ URL: http://telepathy.freedesktop.org/wiki/Components Source0: http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz +Source1: runTest.sh +Source2: mktests.sh Source100: telepathy-rakia.yaml Patch0: 0001-Check-for-gio-to-avoid-linking-issue.patch +Patch1: 0002-nemo-test-install.patch Requires: telepathy-filesystem BuildRequires: pkgconfig(gobject-2.0) >= 2.30 BuildRequires: pkgconfig(dbus-1) @@ -25,6 +28,7 @@ BuildRequires: pkgconfig(sofia-sip-ua-glib) >= 1.12.11 BuildRequires: libxslt BuildRequires: python >= 2.3 +BuildRequires: python-twisted Provides: telepathy-sofiasip = %{version}-%{release} Obsoletes: telepathy-sofiasip < 0.7.2 @@ -33,13 +37,39 @@ framework based on the SofiaSIP-stack. +%package tests +Summary: Tests package for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: python-twisted +Requires: dbus-python + +%description tests +The %{name}-tests package contains tests and +tests.xml for automated testing. + + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Library, headers, and other files for developing applications +that use Telepathy-Rakia. + + %prep %setup -q -n %{name}-%{version} # 0001-Check-for-gio-to-avoid-linking-issue.patch %patch0 -p1 +# 0002-nemo-test-install.patch +%patch1 -p1 # >> setup +%__cp $RPM_SOURCE_DIR/mktests.sh tests/ +%__chmod 0755 tests/mktests.sh # << setup %build @@ -50,6 +80,7 @@ make %{?jobs:-j%jobs} # >> build post +tests/mktests.sh > tests/tests.xml # << build post %install @@ -59,16 +90,11 @@ %make_install # >> install post -# Let's not install the headers -rm -rf $RPM_BUILD_ROOT%{_includedir}/%{name}-0.7 +install -m 0755 $RPM_SOURCE_DIR/runTest.sh $RPM_BUILD_ROOT/opt/tests/%{name}/bin/runTest.sh +install -m 0644 tests/tests.xml $RPM_BUILD_ROOT/opt/tests/%{name}/tests.xml # << install post -%check -# >> check -#make check -# << check - %files %defattr(-,root,root,-) # >> files @@ -78,3 +104,15 @@ %{_datadir}/telepathy/managers/*.manager %{_mandir}/man8/%{name}.8.gz # << files + +%files tests +%defattr(-,root,root,-) +/opt/tests/%{name}/* +# >> files tests +# << files tests + +%files devel +%defattr(-,root,root,-) +%{_includedir}/%{name}-0.7 +# >> files devel +# << files devel other changes: -------------- ++++++ 0002-nemo-test-install.patch (new) --- 0002-nemo-test-install.patch +++ 0002-nemo-test-install.patch @@ -0,0 +1,56 @@ +diff -Naur telepathy-rakia-0.7.4/tests/twisted/Makefile.am telepathy-rakia-0.7.4-nemo-testing/tests/twisted/Makefile.am +--- telepathy-rakia-0.7.4/tests/twisted/Makefile.am 2012-05-08 16:51:51.000000000 +0000 ++++ telepathy-rakia-0.7.4-nemo-testing/tests/twisted/Makefile.am 2013-04-19 11:55:30.647538468 +0000 +@@ -17,6 +17,15 @@ + voip/add-remove-content.py \ + $(NULL) + ++nemotestsdir = /opt/tests/telepathy-rakia/ ++nemotestsbindir = /opt/tests/telepathy-rakia/bin/ ++nobase_nodist_nemotests_DATA = rakia-twisted-tests.list ++nobase_nodist_nemotestsbin_SCRIPTS = $(TWISTED_TESTS) ++nobase_nodist_nemotestsbin_DATA = constants.py servicetest.py sofiatest.py voip/voip_test.py config.py ++ ++rakia-twisted-tests.list: ++ $(AM_V_GEN)echo $(TWISTED_TESTS) > $@ ++ + TESTS = + + TESTS_ENVIRONMENT = \ +diff -Naur telepathy-rakia-0.7.4/tests/twisted/config.py telepathy-rakia-0.7.4-nemo-testing/tests/twisted/config.py +--- telepathy-rakia-0.7.4/tests/twisted/config.py 1970-01-01 00:00:00.000000000 +0000 ++++ telepathy-rakia-0.7.4-nemo-testing/tests/twisted/config.py 2013-04-19 11:54:36.139533386 +0000 +@@ -0,0 +1 @@ ++DEBUGGING = True +diff -Naur telepathy-rakia-0.7.4/tests/twisted/tools/Makefile.am telepathy-rakia-0.7.4-nemo-testing/tests/twisted/tools/Makefile.am +--- telepathy-rakia-0.7.4/tests/twisted/tools/Makefile.am 2012-05-08 16:51:51.000000000 +0000 ++++ telepathy-rakia-0.7.4-nemo-testing/tests/twisted/tools/Makefile.am 2013-04-19 11:56:53.266546367 +0000 +@@ -31,3 +31,8 @@ + CLEANFILES = \ + $(BUILT_SOURCES) \ + rakia-testing.log ++ ++nemoteststoolsdir = /opt/tests/telepathy-rakia/bin/tools/ ++nobase_nodist_nemoteststools_SCRIPTS = with-session-bus.sh ++nobase_nodist_nemoteststools_DATA = $(conf_files) $(service_files) ++ +diff -Naur telepathy-rakia-0.7.4/tests/twisted/tools/sofiasip.service.in telepathy-rakia-0.7.4-nemo-testing/tests/twisted/tools/sofiasip.service.in +--- telepathy-rakia-0.7.4/tests/twisted/tools/sofiasip.service.in 2012-02-25 01:11:03.000000000 +0000 ++++ telepathy-rakia-0.7.4-nemo-testing/tests/twisted/tools/sofiasip.service.in 2013-04-19 11:56:29.871544106 +0000 +@@ -1,3 +1,3 @@ + [D-BUS Service] + Name=org.freedesktop.Telepathy.ConnectionManager.sofiasip +-Exec=@abs_top_builddir@/tests/twisted/tools/exec-with-log.sh ++Exec=/usr/libexec/telepathy-rakia +diff -Naur telepathy-rakia-0.7.4/tests/twisted/tools/tmp-session-bus.conf.in telepathy-rakia-0.7.4-nemo-testing/tests/twisted/tools/tmp-session-bus.conf.in +--- telepathy-rakia-0.7.4/tests/twisted/tools/tmp-session-bus.conf.in 2012-02-25 01:11:03.000000000 +0000 ++++ telepathy-rakia-0.7.4-nemo-testing/tests/twisted/tools/tmp-session-bus.conf.in 2013-04-19 11:56:05.427541765 +0000 +@@ -10,7 +10,7 @@ + + <listen>unix:tmpdir=/tmp</listen> + +- <servicedir>@abs_top_builddir@/tests/twisted/tools</servicedir> ++ <servicedir>/opt/tests/telepathy-rakia/bin/tools</servicedir> + + <policy context="default"> + <!-- Allow everything to be sent --> ++++++ mktests.sh (new) --- mktests.sh +++ mktests.sh @@ -0,0 +1,32 @@ +#!/bin/sh + +cat <<EOF +<?xml version="1.0" encoding="UTF-8"?> +<testdefinition version="1.0"> + <suite name="telepathy-rakia-tests"> + <description>Telepathy Rakia tests</description> + <set name="telepathy-rakia-twisted-tests"> +EOF + +for testcase in $(cat tests/twisted/rakia-twisted-tests.list) +do + testcase_name=$(echo $testcase|sed 's/\//_/') + attributes="name=\"$testcase_name\"" + #insignificant=`grep "^$testcase" tests/INSIGNIFICANT || true` + #if test -n "$insignificant" + #then + # continue + # attributes="$attributes insignificant=\"true\"" + #fi + cat <<EOF + <case $attributes> + <step>/opt/tests/telepathy-rakia/bin/runTest.sh python /opt/tests/telepathy-rakia/bin/$testcase</step> + </case> +EOF +done + +cat <<EOF + </set> + </suite> +</testdefinition> +EOF ++++++ runTest.sh (new) --- runTest.sh +++ runTest.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +export PYTHONPATH=/opt/tests/telepathy-rakia/bin/ + +sh /opt/tests/telepathy-rakia/bin/tools/with-session-bus.sh \ + --config-file=/opt/tests/telepathy-rakia/bin/tools/tmp-session-bus.conf -- "$@" + +e=$? + case "$e" in + (0) + echo "PASS" + ;; + (*) + echo "FAIL: ($e)" + ;; + esac + +exit $e + ++++++ telepathy-rakia.yaml --- telepathy-rakia.yaml +++ telepathy-rakia.yaml @@ -7,8 +7,11 @@ URL: http://telepathy.freedesktop.org/wiki/Components Sources: - http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz + - runTest.sh + - mktests.sh Patches: - 0001-Check-for-gio-to-avoid-linking-issue.patch + - 0002-nemo-test-install.patch Description: | %{name} is a SIP connection manager for the Telepathy framework based on the SofiaSIP-stack. @@ -24,10 +27,34 @@ PkgBR: - libxslt - python >= 2.3 +# python-twisted is needed to build the tests + - python-twisted Provides: - telepathy-sofiasip = %{version}-%{release} Obsoletes: - telepathy-sofiasip < 0.7.2 Configure: configure Builder: make -Check: yes +Check: no + +SubPackages: + - Name: tests + Summary: Tests package for %{name} + Group: Development/Libraries + Description: | + The %{name}-tests package contains tests and + tests.xml for automated testing. + Requires: + - python-twisted + - dbus-python + Files: + - /opt/tests/%{name}/* + + - Name: devel + Summary: Development files for %{name} + Group: Development/Libraries + Description: | + Library, headers, and other files for developing applications + that use Telepathy-Rakia. + Files: + - "%{_includedir}/%{name}-0.7"
