I have made the following changes intended for : nemo:devel:mw / farstream
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/273 Thank You, Reto Zingg [This message was auto-generated] --- Request # 273: Messages from BOSS: State: review at 2013-04-30T12:32:45 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:nemo-devel / farstream -> nemo:devel:mw / farstream changes files: -------------- --- farstream.changes +++ farstream.changes @@ -0,0 +1,3 @@ +* Tue Apr 30 2013 Reto Zingg <[email protected]> - 0.1.2 +- create tests package + new: ---- mktests.sh nemo-tests-install.patch runTest.sh spec files: ----------- --- farstream.spec +++ farstream.spec @@ -6,6 +6,9 @@ License: LGPLv2+ URL: http://www.freedesktop.org/wiki/Software/Farstream Source0: http://freedesktop.org/software/farstream/releases/farstream/%{name}-%{version}.tar.gz +Source1: runTest.sh +Source2: mktests.sh +Patch0: nemo-tests-install.patch BuildRequires: python BuildRequires: pkgconfig(nice) >= 0.1.0 BuildRequires: pkgconfig(gstreamer-0.10) @@ -22,18 +25,36 @@ %description devel A collection of GStreamer modules and libraries for video conferencing applications +%package tests +Summary: Tests and tests.xml for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description tests +Testpackage for automated tests with tests and tests.xml + %prep %setup -q +# nemo-tests-install.patch +%patch0 -p1 + +# install the mktests.sh to generate the tests.xml +%__cp $RPM_SOURCE_DIR/mktests.sh tests/ +%__chmod 0755 tests/mktests.sh + %build %configure --disable-python --disable-static make %{?_smp_mflags} +tests/mktests.sh > tests/tests.xml %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' +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 %post -p /sbin/ldconfig @@ -70,3 +91,7 @@ %{_datadir}/gtk-doc/html/%{name}-libs-0.10/ %{_datadir}/gtk-doc/html/%{name}-plugins-0.1/ +%files tests +%defattr(-,root,root,-) +/opt/tests/%{name}/* + other changes: -------------- ++++++ 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="farstream-tests"> + <description>Farstream tests</description> + <set name="farstram-unit-tests"> +EOF + +for testcase in $(cat tests/check/farstream-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/farstream/bin/runTest.sh $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,17 @@ +diff -Naur farstream-0.1.2/tests/check/Makefile.am farstream-0.1.2-nemo-tests-install/tests/check/Makefile.am +--- farstream-0.1.2/tests/check/Makefile.am 2011-12-05 20:19:49.000000000 +0000 ++++ farstream-0.1.2-nemo-tests-install/tests/check/Makefile.am 2013-04-30 12:06:20.364110641 +0000 +@@ -173,3 +173,13 @@ + + elements_funnel_CFLAGS = $(AM_CFLAGS) + elements_funnel_SOURCES = elements/funnel.c ++ ++nemotestsbindir = /opt/tests/farstream/bin ++nobase_nemotestsbin_PROGRAMS = $(check_PROGRAMS) ++ ++farstream-tests.list: ++ $(AM_V_GEN)echo $(check_PROGRAMS) > $@ ++ ++nemotestsdatadir = /opt/tests/farstream/data ++nobase_nemotestsdata_DATA = $(EXTRA_DIST) farstream-tests.list ++ ++++++ runTest.sh (new) --- runTest.sh +++ runTest.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +export SRCDIR=/opt/tests/farstream/data/ +export GST_CHECKS=test_nicetransmitter_with_filter + +/opt/tests/farstream/bin/"$1" + +e=$? + case "$e" in + (0) + echo "PASS" + ;; + (*) + echo "FAIL: ($e)" + ;; + esac + +exit $e +
