[meego-commits] 10934: Changes to Trunk:Testing/min
Timo Härkönen
no_reply at build.meego.com
Wed Dec 15 05:37:46 UTC 2010
Hi,
I have made the following changes to min in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Timo Härkönen
[This message was auto-generated]
---
Request #10934:
submit: devel:quality/min(r50) -> Trunk:Testing/min
Message:
version 2010w50 - Fixes BMC#10821
State: new 2010-12-14T21:37:44 timoph
Comment: None
changes files:
--------------
--- min.changes
+++ min.changes
@@ -0,0 +1,2 @@
+* Tue Dec 14 2010 Sampo Saaristo <sampo.saaristo at sofica.fi> 2010w50
+ - MIN accepts test libraries with filename *.so and *.so.0 (BMC#10821)
old:
----
min-2010w47.tar.gz
new:
----
debian.tar.gz
min-2010w50.tar.gz
min.dsc
spec files:
-----------
--- min.spec
+++ min.spec
@@ -1,5 +1,5 @@
Name: min
-Version: 2010w47
+Version: 2010w50
Release: 1
Summary: A test framework for C/C++
@@ -10,6 +10,11 @@
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}_%{version}-%{release}-XXXXXX)
BuildRequires: libtool, autoconf, chrpath, ncurses-devel, python-devel, dbus-devel, dbus-glib-devel, doxygen, qt-devel, qt, qt-sqlite, fdupes
+
+%if 0%{?fedora}
+BuildRequires: gcc-c++ fdupes
+%endif
+
Requires: ncurses
%description
@@ -98,14 +103,14 @@
cd ..
cd minqt
%ifarch ARCHITECTURE_NAME
-export DEB_HOST_ARCH=i386; qmake
+export DEB_HOST_ARCH=i386; qmake || qmake-qt4
%else
-export DEB_HOST_ARCH=arm; qmake
+export DEB_HOST_ARCH=arm; qmake || qmake-qt4
%endif
make %{?_smp_mflags}
cd ..
cd mincitests/qsrc
-qmake
+qmake || qmake-qt4
make %{?_smp_mflags}
cd ../..
@@ -135,7 +140,11 @@
rm %{buildroot}%{_libdir}/*.la
rm %{buildroot}%{_libdir}/min/*.a
rm %{buildroot}%{_libdir}/min/*.la
+%if 0%{?fedora}
+
+%else
%fdupes %{buildroot}%{_datadir}/min/
+%endif
%post
ldconfig
dsc files:
----------
++++++ new dsc file:
--- min.dsc
+++ min.dsc
+Format: 1.0
+Source: min
+Binary: min, min-dev, minpythonmodule, min-tests, min-ci-tests, mindbusplugin, min-qt, min-qt-maemo, min-all
+Architecture: any
+Version: 2010w50
+Maintainer: Sampo Saaristo <ext-sampo.1.saaristo at nokia.com>
+Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 4.0.0), libtool, chrpath, libncurses5-dev, python2.5-dev | python2.6-dev, libdbus-1-dev, libdbus-glib-1-dev, libqt4-dev, python
other changes:
--------------
++++++ debian.tar.gz (new)
++++++ min-2010w47.tar.gz -> min-2010w50.tar.gz
--- debian
+++ debian
+(directory)
--- debian/changelog
+++ debian/changelog
+min-all (2010w50) unstable; urgency=low
+
+ * MIN accepts test libraries with filename *.so and *.so.0 (BMC#10821)
+
+ -- Sampo Saaristo <sampo.saaristo at sofica.fi> Tue, 14 Dec 2010 13:34:48 +0200
+
+min-all (2010w47) unstable; urgency=low
+
+ * Fixed: iterative master/slave testing problems (BMC#9694)
+
+ -- Sampo Saaristo <sampo.saaristo at sofica.fi> Wed, 24 Nov 2010 11:20:04 +0200
+
+min-all (2010w44) unstable; urgency=low
+
+ * Fixed: master/slave test hangs after establishing connection (BMC#9694)
+ * Cleaned outdated debian directories (only use the top-level one)
+ * Fixed: missing dependency to libtool
+
+ -- Sampo Saaristo <sampo.saaristo at sofica.fi> Fri, 05 Nov 2010 13:02:06 +0200
+
+min-all (2010w41) unstable; urgency=low
+
+ * Fixed: --slave parameter causes MIN to crash (BMC#7213)
+ * Fixed: SIGCHLD handling in scripter (use SIG_DFL) (BMC#6692)
+
+ -- Sampo Saaristo <ext-sampo.2.saaristo at nokia.com> Wed, 13 Oct 2010 09:07:55 +0300
+
+min-all (2010w35) unstable; urgency=low
+
+ * Fixed: all but one rpmlint warnings
+ * Fixed: minor fix to one sql-query in minqt (by Markku Hulkkonen)
+ * Fixed: mq_peek_message error handling fixes (by Markku Hulkkonen)
+
+ -- Sampo Saaristo <ext-sampo.2.saaristo at nokia.com> Wed, 01 Sep 2010 09:23:40 +0300
+
+min-all (2010w26) unstable; urgency=low
+
+ * Fixed: new_module signal problems with MIN Qt UI
+ * Fixed: timing issues (patch from M. Hulkkonen)
+ * Fixed: illegal use of sprintf() in scripter module
+ * Added: error handling for mq_peek_message
+
+ -- Sampo Saaristo <ext-sampo.2.saaristo at nokia.com> Thu, 01 Jul 2010 08:50:36 +0300
+
+min-all (2010w24) unstable; urgency=low
+
+ * Fixed: still some rpmlint problems
+
+ -- Sampo Saaristo <ext-sampo.2.saaristo at nokia.com> Mon, 14 Jun 2010 16:40:19 +0300
+
+min-all (2010w23) unstable; urgency=low
+
+ * Twentyfourth MIN release
+ * Fixed: MIN spec file rpmlint problems
+ * Fixed: linking issues with MIN cui
+ * Fixed: sigsegv/sigabrt signal handlers (enable default action for core dumps)
+
+ -- Sampo Saaristo <ext-sampo.2.saaristo at nokia.com> Thu, 10 Jun 2010 17:00:30 +0300
+
+min-all (2010w16) unstable; urgency=low
+
+ * Twentythird MIN release
+ * Added: parallel execution from commandline
+ * Fixed: python parallel execution
+ * Fixed: a TMC process continues running after exiting MIN.
+
+ -- Sampo Saaristo <ext-sampo.2.saaristo at nokia.com> Wed, 21 Apr 2010 10:39:16 +0300
+
+min-all (2010w10) unstable; urgency=low
+
+ * Twentysecond MIN release
+ * Added: Support for python2.6 in MIN python module.
+ * Fixes: NB#157310 - testclass symbol validation can be turned off with env var.
+ * Fixes: NB#156981 - MIN cui high cpu usage in hw.
+
+ -- Sampo Saaristo <ext-sampo.1.saaristo at nokia.com> Fri, 12 Mar 2010 09:26:29 +0200
+
+min-all (2010w04) unstable; urgency=low
+ * Twentyfirst MIN release
+ * Fixed: MIN consoleUI does not work over serial line (minicom).
+ * Fixed: logger settings overwriting only for min debug log.
+ * Fixed: build rules for min-ci-tests:minqtdbtests
+
+ -- Sampo Saaristo <ext-sampo.1.saaristo at nokia.com> Wed, 27 Jan 2010 11:45:09 +0200
+
+min-all (2010w03) unstable; urgency=low
+ * Twentieth MIN Release
+ * Added: indication to consoleUI when the menu contains more than visible items.
+ * Added: scripter command line interface for prototyping test scripts.
+ * Added: Qt GUI displays previous test runs.
+
+ -- Sampo Saaristo <ext-sampo.1.saaristo at nokia.com> Fri, 15 Jan 2010 15:21:47 +0100
+
+min-all (2009w51) unstable; urgency=low
+ * Nineteenth MIN Release
+ * Fixed: refactored validate_test_case() for smaller code complexity.
+ * Fixed: refactored rcp-message handling so that it uses MIN Engine api
+ * Added: test case description feature
+
+ -- Sampo Saaristo <ext-sampo.1.saaristo at nokia.com> Wed, 9 Dec 2009 11:46:00 +0100
+
+
+min-all (2009w46) unstable; urgency=low
+ * Eighteenth MIN Release
+ * Fixed: Test case pausing fails in scratchbox ARM emulation.
+ * Fixed: Compile warnings, most lintian warnings.
+ * Added: min-ci-tests debian package for ci testing.
+ * Added: min settings utility.
+
+ -- Sampo Saaristo <ext-sampo.1.saaristo at nokia.com> Mon, 9 Nov 2009 09:23:44 +0100
+
+min-all (2009w44) unstable; urgency=low
+ * Seventeenth MIN Release
+ * Fixed: Entering "start new case" menu very fast right after MIN has started can cause crash
+ * Fixed: Scripter test class method return value handled incorrectly.
+ * Fixed: Scripter leaves processes behind.
+ * Fixed: MIN prints invalid characters to syslog.
+ * Fixed: MIN -ct gets stuck if non-existing test modules are configured.
+ * Added: stdout and stderr outputs to MIN logger.
+ * Added: Make test case execution possible scratchbox armel emulation (sbox2).
+ * Added: Display case result in "all cases" view when the case has finnished.
+ * Added: Qt GUI: Display number of errors in the label of log messages tab.
+
+ -- Sampo Saaristo <ext-sampo.1.saaristo at nokia.com> Mon, 26 Oct 2009 11:58:02 +0100
+
+min-all (2009w42) unstable; urgency=low
+ * Sixteenth MIN Release
+ * Fixed: Aborting paused test case fails.
+ * Fixed: Scripter gets stuck trying to call methods from a crashed test class process.
+ * Added: min-doc debian package.
+ * Added: Log messages menu to Qt GUI.
+ * Added: Debian packaging to test module templates.
+ * Added: Aborting/pausing/resuming possible also from "all cases" view in Qt GUI.
+ -- Sampo Saaristo <ext-sampo.1.saaristo at nokia.com> Mon, 12 Oct 2009 10:11:31 +0100
+
+min-all (2009w40) unstable; urgency=low
+ * Fifteenth MIN Release
+ * Fixed: The wrapper macro around strncpy (STRCPY) and checked it's usage.
+ * Fixed: Remaining resource leaks reported by static analysis tool.
+ * Fixed: Scripter: error in loop keyword syntax validation
+ * Fixed: Bug in remote run handling.
+ * Fixed: ConsoleUI: View output for ongoing case does not update automatically.
+ * Added: Debian package for Embedded version of Qt GUI
+ * Added: Mechanism to get the name of currently running test case from c-code.
+ -- Sampo Saaristo <ext-sampo.1.saaristo at nokia.com> Mon, 28 Sep 2009 13:39:36 +0100
+
+min-all (2009w38) unstable; urgency=low
+ * Fourteenth MIN Release
+ * Fixed: Around 100 defects from static analysis tool.
+ * Fixed: MIN Qt GUI: first test run fails to start sporadically.
+ * Fixed: Crashes from test method not caught properly by scripter-module.
+ * Fixed: MIN Qt GUI: menu titles more intuitive.
+ * Fixed: MIN Qt GUI: problems in ongoing cases view.
+ * Fixed: MIN crashes if .min directory does not exist.
+ * Added: Qt test class for C++ Test Module Template Wizard.
+
+ -- Sampo Saaristo <ext-sampo.1.saaristo at nokia.com> Mon, 14 Sep 2009 11:39:40 +0100
+
+min-all (2009w36) unstable; urgency=low
+ * Thirteenth MIN Release
+ * Fixed: Around 300 defects from static analysis tool.
+ * Fixed: MIN Qt GUI missed start time for "ongoing cases".
+ * Fixed: State event set causes crash when event not requested.
+ * Added: tcp/ip plugin for MIN and the use of plugin from GUI.
+
+ -- Sampo Saaristo <ext-sampo.1.saaristo at nokia.com> Mon, 31 Aug 2009 13:03:21 +0100
+
+min-all (2009w34) unstable; urgency=low
+ * Twelfth MIN Release
+ * Fixed: Doxygen tags updated and harmonized.
+ * Added: Test case debugging from ConsoleUI
+
+ -- Sampo Saaristo <ext-sampo.1.saaristo at nokia.com> Mon, 17 Aug 2009 13:37:13 +0100
+
+min-all (2009w28) unstable; urgency=low
+ * Eleventh MIN Release
+ * Fixed: MIN Qt GUI has problems executing multiple cases.
+ * Fixed: Updated contact information.
+ * Added: Improve the "Add test cases to test set" menu on ConsoleUI
+ * Added: Timeout for blocking scripter commands.
+ * Added: Support for debugging test cases: commandline mode.
+
+ -- Sampo Saaristo <ext-sampo.1.saaristo at nokia.com> Mon, 06 Jul 2009 10:45:55 +0100
+
+min-all (2009w26) unstable; urgency=low
+ * Tenth MIN Release
+ * Fixed: Remote run error not handled properly on master side
+ * Fixed: MIN events are not working properly when looping
+ * Added: CLI interface plugin
+ -- Sampo Saaristo <ext-sampo.1.saaristo at nokia.com> Mon, 22 Jun 2009 12:26:56 +0100
+
+min-all (2009w24) unstable; urgency=low
+ * Ninth MIN Release
+ * Fixed: MIN variable transmission between master and slave doesn't work on tpc/ip version (4145)
+ * Fixed: Slave cannot execute test case when multiple test case files are defined (4146)
+ * Fixed: Bug in commandline option parsing --plugin does not accept short form (-p) (4148)
+ * Fixed: MIN Qt does not work when module is configured twice (4177)
+ * Fixed: MIN Qt works only once without killing MIN manually (4217)
+ * Fixed: Test case reported as passed when it exits prematurely. (4225)
+ * Added: Possibility to register slave devices in /etc/min.d/. (4181)
+ * Added: Support C++ in Test Module Template Wizard (4150)
+ * Added: IP slave registration to dbus plugin. (4180)
+
+ -- Sampo Saaristo <ext-sampo.1.saaristo at nokia.com> Wed, 10 Jun 2009 11:12:15 +0100
+
+min-all (2009w19) unstable; urgency=low
+ * Seventh MIN Release
+ * Fixed: Console-ui doesn't show all the test cases on first view
+ * Fixed: undefined g_cclosure__VOID_STRING occuring on armel.
+
+ -- Sampo Saaristo <ext-sampo.1.saaristo at nokia.com> Mon, 04 May 2009 08:37:10 +0100
+
+min-all (2009w22) unstable; urgency=low
+ * Eight MIN Release
+ * Fixed: ELF binaries from mintest package go to /usr/lib/min-tests instead of /usr/share/min-tests
+ * Fixed: TestModule appended to the name of modules generated by createmodule script
+ * Fixed ConsoleUI executed wrong test case
+ * Fixed: qulonglong issue with DBus
+ * Fixed: min_debug() does not work when called directly
+ * Added: new features documented in MIN
+
+ -- Konrad Marek Zapalowicz <ext-konrad.zapalowicz at nokia.com> Mon, 25 May 2009 12:40:51 +0100
+
+min-all (2009w19) unstable; urgency=low
+ * Seventh MIN Release
+ * Fixed: Console-ui doesn't show all the test cases on first view
+ * Fixed: undefined g_cclosure__VOID_STRING occuring on armel.
+
+ -- Sampo Saaristo <ext-sampo.1.saaristo at nokia.com> Mon, 04 May 2009 08:37:10 +0100
--- debian/compat
+++ debian/compat
+5
--- debian/control
+++ debian/control
+Source: min-all
+Section: devel
+Priority: optional
+Maintainer: Sampo Saaristo <ext-sampo.1.saaristo at nokia.com>
+Build-Depends: debhelper (>= 4.0.0), libtool, chrpath, libncurses5-dev, python2.5-dev | python2.6-dev, libdbus-1-dev, libdbus-glib-1-dev, libqt4-dev
+Standards-Version: 3.8.0
+
+Package: min
+Section: devel
+Suggests: min-doc
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, libncurses5, ncurses-base (>= 5)
+Description: A test framework for C
+ The MIN test framework provides a toolset for creating and executing test cases. Test cases are compiled into module(s).
+ MIN engine starts a Test Module Controller (TMC) for each test module. TMC in turn forks a process for each test case when the test is executed.
+ Tests are run in own process so that e.g. segfaults can be caught and handled. MIN can be operated via console UI (ncurses) or from the commandline.
+
+Package: min-dev
+Section: devel
+Priority: extra
+Architecture: any
+Depends: build-essential, min, ${shlibs:Depends}, ${misc:Depends}
+Description: MIN headers and testmodule wizard
+ The headers and tools needed to develop MIN test modules
+
+Package: minpythonmodule
+Section: devel
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, min, python2.5 | python2.6
+Description: Python scripter module for MIN
+ Python scripter for MIN.
+
+Package: min-tests
+Priority: optional
+Architecture: any
+XB-Maemo-CI-Packages: min
+XB-Maemo-CI-Stage: acceptance
+Depends: ${shlibs:Depends}, ${misc:Depends}, min
+Description: MIN Basic Acceptance Tests.
+ Tests of MIN
+
+Package: min-ci-tests
+Priority: optional
+Architecture: any
+XB-Maemo-CI-Packages: min
+XB-Maemo-CI-Stage: staging
+Depends: ${shlibs:Depends}, min, minpythonmodule
+Description: Tests for MIN utilities used for CI
+ This package includes MIN test modules that can be used to test MIN itself.
+
+Package: mindbusplugin
+Section: devel
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, min
+Description: DBus plugin for MIN
+ Allows interaction with MIN through DBus intreface.
+
+Package: min-qt
+Section: devel
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, min, mindbusplugin
+Description: Qt GUI for MIN
+ MIN graphical user interface written in Qt
+
+Package: min-qt-maemo
+Section: devel
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, min, mindbusplugin
+Description: Qt GUI for MIN in Maemo environment
+ MIN graphical user interface written in Qt
+Maemo-Icon-26:
+ iVBORw0KGgoAAAANSUhEUgAAABgAAAAaCAYAAACtv5zzAAAABHNCSVQICAgI
+ fAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3
+ Lmlua3NjYXBlLm9yZ5vuPBoAAAFVSURBVEiJ1ZS7SgNBFIa/swkJJN5ik06w
+ FCsLQSxFUgUrGyux9xkcB3yaFKawEwWRvICFpZY2NoqXmOtYZBdnZ9eYyE6R
+ Hw6c+c8cPubMMMIpL/yoZZSpRwvR0gD2rHrVKPMqOriGYAPyRZjPwfG6Ueph
+ 1KPPge2oIQAWrZgjrgJQtEJGdnkNBhXolOCrCNSsnmWgGkXAv9R9c4xa6rbw
+ BAnJmaz+AWg7xo5onZ8IIFoaDHgULRfjITEtAFuTAArAfpjXEUpTQFLH5AL6
+ wHuYtzF0swYMEQ6BG4SjEDipNkXrimsmLsacmCbQBBAtB1MAAmA3zcxSiTFl
+ ADDGM2DYsxYrEH95GQAG7kuLXXQGgL5vwLAHPFvGUsYAAK6sPOcDcPlbYTYA
+ Rqkn4N4bIFTqKWYKcAt0vAGMUp9AyxsgVGJM3gF54nNz/5WuUzeM1x3wAZQj
+ 4xupfVB1ukIwMAAAAABJRU5ErkJggg==
+
+Package: min-all
+Section: devel
+Priority: extra
+Architecture: any
+Depends: min, minpythonmodule, min-dev, min-tests
+Description: MIN metapakage
+ All MIN packages
--- debian/copyright
+++ debian/copyright
+MIN Test Framework, © Nokia 2008,2009,2010 All rights reserved, licensed under the Gnu General Public License version 2 (see /usr/share/common-licenses/GPL-2), Contact: min-support at lists.sourceforge.net
+
--- debian/min-ci-tests.install
+++ debian/min-ci-tests.install
+etc/min.d/min-ci-tests.min.conf
+usr/lib/min/dllist_tests*
+usr/lib/min/min_unit_selftest*
+usr/lib/min/item_parser_tests*
+usr/lib/min/logger_tests*
+usr/lib/min/settings_tests*
+usr/lib/min/settings_tests*
+usr/lib/min/minqtdbtests*
+usr/lib/min/minqtdbtests.cfg
+usr/lib/min/python_tests.py
+usr/share/min-ci-tests/tests.xml
+usr/share/min-ci-tests/test.cfg
+usr/bin/min_scripter_cli_test.sh
+usr/bin/check_cli.sh
--- debian/min-ci-tests.postrm
+++ debian/min-ci-tests.postrm
+#!/bin/sh
+if [ "$1" = "remove" ]; then
+ rm -rf /usr/share/min-ci-tests
+fi
+
+#DEBHELPER#
--- debian/min-ci-tests.prerm
+++ debian/min-ci-tests.prerm
+#!/bin/sh
+
+if [ "$1" = "remove" ]; then
+ rm -rf /etc/min.d/min-ci-tests.min.conf
+fi
+
+
+#DEBHELPER#
--- debian/min-dev.install
+++ debian/min-dev.install
+usr/include/min_logger.h
+usr/include/mintfwif.h
+usr/include/min_logger_output.h
+usr/include/min_unit_macros.h
+usr/include/dllist.h
+usr/include/min_parser_common.h
+usr/include/tec.h
+usr/include/min_common.h
+usr/include/min_parser.h
+usr/include/tec_rcp_handling.h
+usr/include/min_plugin_interface.h
+usr/include/test_module_api.h
+usr/include/min_engine_api.h
+usr/include/min_section_parser.h
+usr/include/tllib.h
+usr/include/min_file_parser.h
+usr/include/min_system_logger.h
+usr/include/tmc_common.h
+usr/include/min_ipc_mechanism.h
+usr/include/min_test_event_if.h
+usr/include/tmc.h
+usr/include/min_item_parser.h
+usr/include/min_test_interference.h
+usr/include/tmc_ipc.h
+usr/include/min_logger_common.h
+usr/include/min_text.h
+usr/include/tmc_tpc.h
+usr/share/man/man1/createtestmodule.1
+usr/share/man/man3/*
+usr/share/min/TestModuleTemplates
+usr/share/min/TestModuleTemplates++
+usr/share/min/minunit.c
+usr/lib/pkgconfig/min-dev.pc
+usr/bin/createtestmodule
+usr/bin/createtestmodule++
+usr/lib/pkgconfig/min-dev.pc
--- debian/min-qt-maemo.install
+++ debian/min-qt-maemo.install
+usr/bin/minqt
+usr/share/applications/*
+usr/share/icons/*
+usr/share/pixmap/*
--- debian/min-qt-maemo.postinst
+++ debian/min-qt-maemo.postinst
+#!/bin/sh -e
+
+gtk-update-icon-cache -f /usr/share/icons/hicolor
+
+#DEBHELPER#
+
+exit 0
+
--- debian/min-qt.install
+++ debian/min-qt.install
+usr/bin/minqt
--- debian/min-tests.install
+++ debian/min-tests.install
+/usr/lib/min-tests/EventsTestModule*
+/usr/lib/min-tests/HardCoded*
+/usr/lib/min-tests/TestClass*
+/usr/lib/min-tests/LuaTestClass*
+/usr/share/min-tests/scripter.cfg
+/usr/share/min-tests/luascripter.lua
+/usr/share/min-tests/runtests.sh
+
--- debian/min-tests.postrm
+++ debian/min-tests.postrm
+#!/bin/sh
+set -e
+rm -rf /var/log/min-tests
+#DEBHELPER#
--- debian/min.install
+++ debian/min.install
+usr/bin/min
+usr/share/min/minbaselib.lua
+usr/share/man/man1/min.1
+usr/share/man/man5/min.conf.5
+usr/lib/min/luascripter*
+usr/lib/min/scripter*
+usr/lib/min/scripter_cli*
+usr/lib/min/minDemoModule*
+usr/lib/min/min_cui*
+usr/lib/min/min_tcpip*
+usr/lib/min/min_cli*
+usr/lib/pkgconfig/min.pc
+usr/lib/libminutils*
+usr/lib/libmintfwif*
+usr/lib/libminevent*
+usr/lib/libmintmapi*
+usr/lib/libmininterference*
+usr/bin/mind
+usr/bin/tmc
+usr/bin/min-clean.sh
+usr/bin/patchminconf.sh
+usr/bin/mindelmod.pl
+etc/min.conf
+etc/event.d/min
+etc/init.d/min
--- debian/min.postinst
+++ debian/min.postinst
+#!/bin/sh
+#
+# Post-installation script for MIN
+#
+
+if which update-rc.d >/dev/null 2>&1; then
+ update-rc.d min defaults 90 20
+fi
+if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d min stop
+ invoke-rc.d min start
+else
+ /etc/init.d/min stop
+ /etc/init.d/min start
+fi
+#DEBHELPER#
--- debian/min.postrm
+++ debian/min.postrm
+#!/bin/sh
+#
+# post-remove script for MIN
+#
+
+if which update-rc.d >/dev/null 2>&1; then
+ update-rc.d -f min remove
+fi
+
+#DEBHELPER#
--- debian/min.prerm
+++ debian/min.prerm
+#!/bin/sh
+#
+# pre-remove script for MIN
+#
+if which invoke-rc.d >/dev/null 2>&1; then
+ invoke-rc.d min stop
+else
+ /etc/init.d/min stop
+fi
+true
+#DEBHELPER#
--- debian/mindbusplugin.install
+++ debian/mindbusplugin.install
+usr/lib/min/min_dbus*
+usr/include/min_dbus_client_interface.h
+usr/bin/mindbus.sh
+usr/share/dbus-1/services/org.maemo.MIN.service
+
--- debian/minpythonmodule.install
+++ debian/minpythonmodule.install
+usr/lib/min/pythonscripter*
+usr/lib/min/min_ext*
--- debian/rules
+++ debian/rules
+#!/usr/bin/make -f
+CC = gcc
+CFLAGS = -g -Wall
+export DH_VERBOSE=1
+
+package = min-all
+
+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O2
+endif
+
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+
+SUBDIRS="min minpythonmodule mintests mincitests mindbusplugin"
+ALLDIRS="min minpythonmodule mintests mincitests mindbusplugin minqt mincitests/qsrc"
+INSTALL_ROOT = $(CURDIR)/debian/tmp
+build: build-stamp
+build-stamp:
+ dh_testdir
+ for FILE in "$(SUBDIRS)"; do \
+ cd "$$FILE"; \
+ ./autogen.sh $(confflags); \
+ ./configure --prefix=/usr --sysconfdir=/etc $(confflags)\
+ $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)"; \
+ touch build-stamp; \
+ $(MAKE) || exit 1; \
+ cd ..;\
+ done
+ cd minqt && qmake && $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" && cd ..
+ cd mincitests/qsrc && qmake && $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" && cd ../..
+ touch NEWS
+ touch ChangeLog
+ touch build-stamp
+
+clean:
+ dh_clean
+ rm -f build-stamp
+ for FILE in "$(ALLDIRS)"; do \
+ cd "$$FILE"; \
+ [ ! -f Makefile ] || $(MAKE) distclean; \
+ cd ..;\
+ done
+
+install: build
+ dh_clean
+ dh_installdirs -A etc usr/lib/min/
+ mkdir -p $(CURDIR)/debian/tmp/usr/lib/min
+ mkdir -p $(CURDIR)/debian/tmp/usr/lib/min-tests
+ for FILE in "$(SUBDIRS)"; do \
+ cd "$$FILE"; \
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp; \
+ cd ..;\
+ done
+ cd minqt && $(MAKE) install "INSTALL_ROOT = $(CURDIR)/debian/tmp"
+ cd ..
+ cd mincitests/qsrc && $(MAKE) install "INSTALL_ROOT = $(CURDIR)/debian/tmp" && cp -d *.so* $(CURDIR)/debian/tmp/usr/lib/min
+ cd ../..
+
+binary-indep: install
+
+binary-arch: install
+ dh_testroot -A
+ dh_installdocs -a NEWS
+ dh_installchangelogs -a ChangeLog
+ dh_installdirs -A
+ dh_install --sourcedir=debian/tmp
+ dh_strip -A
+ dh_makeshlibs -A -X usr/lib/min
+ dh_compress -A
+ dh_fixperms -A
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol -A
+ dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: binary binary-arch binary-indep clean checkroot
--- doc/texinfo/debian/compat
+++ doc/texinfo/debian/compat
@@ -1 +1 @@
-4
+5
--- min.changes
+++ min.changes
@@ -1,3 +1,5 @@
+* Tue Dec 14 2010 Sampo Saaristo <sampo.saaristo at sofica.fi> 2010w50
+ - MIN accepts test libraries with filename *.so and *.so.0 (BMC#10821)
* Wed Nov 24 2010 Sampo Saaristo <sampo.saaristo at sofica.fi> 2010w47
- Fixed: iterative master/slave testing problems (BMC#9694)
* Fri Nov 5 2010 Sampo Saaristo <sampo.saaristo at sofica.fi> 2010w44
--- min.spec
+++ min.spec
@@ -1,5 +1,5 @@
Name: min
-Version: 2010w47
+Version: 2010w50
Release: 1%{?dist}
Summary: A test framework for C/C++
--- min/TestModuleTemplates++/HardCodedTestModuleXXX/debian/compat
+++ min/TestModuleTemplates++/HardCodedTestModuleXXX/debian/compat
@@ -1 +1 @@
-4
+5
--- min/TestModuleTemplates++/MINUnitXXX/debian/compat
+++ min/TestModuleTemplates++/MINUnitXXX/debian/compat
@@ -1 +1 @@
-4
+5
--- min/TestModuleTemplates++/TemplateLuaScriptXXX/debian/compat
+++ min/TestModuleTemplates++/TemplateLuaScriptXXX/debian/compat
@@ -1 +1 @@
-4
+5
--- min/TestModuleTemplates++/TemplateQtScriptXXX/debian/compat
+++ min/TestModuleTemplates++/TemplateQtScriptXXX/debian/compat
@@ -1 +1 @@
-4
+5
--- min/TestModuleTemplates++/TemplateScriptXXX/debian/compat
+++ min/TestModuleTemplates++/TemplateScriptXXX/debian/compat
@@ -1 +1 @@
-4
+5
--- min/TestModuleTemplates++/TestModuleXXX/debian/compat
+++ min/TestModuleTemplates++/TestModuleXXX/debian/compat
@@ -1 +1 @@
-4
+5
--- min/TestModuleTemplates/HardCodedTestModuleXXX/debian/compat
+++ min/TestModuleTemplates/HardCodedTestModuleXXX/debian/compat
@@ -1 +1 @@
-4
+5
--- min/TestModuleTemplates/MINUnitXXX/debian/compat
+++ min/TestModuleTemplates/MINUnitXXX/debian/compat
@@ -1 +1 @@
-4
+5
--- min/TestModuleTemplates/TemplateLuaScriptXXX/debian/compat
+++ min/TestModuleTemplates/TemplateLuaScriptXXX/debian/compat
@@ -1 +1 @@
-4
+5
--- min/TestModuleTemplates/TemplateScriptXXX/debian/compat
+++ min/TestModuleTemplates/TemplateScriptXXX/debian/compat
@@ -1 +1 @@
-4
+5
--- min/TestModuleTemplates/TestModuleXXX/debian/compat
+++ min/TestModuleTemplates/TestModuleXXX/debian/compat
@@ -1 +1 @@
-4
+5
--- min/src/engine/tec/tec.c
+++ min/src/engine/tec/tec.c
@@ -1567,12 +1567,19 @@
NEW2 (char,
strlen (((test_module_info_s *)
dl_list_data (work_module_item))->
- module_filename_) + 4);
+ module_filename_) + 6);
sprintf (mod_name, "%s.so",
((test_module_info_s *)
dl_list_data (work_module_item))->module_filename_);
path_pos = ec_search_lib (mod_name);
-
+ if (path_pos == -1) {
+ sprintf (mod_name, "%s.so.0",
+ ((test_module_info_s *)
+ dl_list_data
+ (work_module_item))->module_filename_);
+ path_pos = ec_search_lib (mod_name);
+ }
+
if (path_pos != -1) {
dir =
(char *)
--- min/src/min_common.h
+++ min/src/min_common.h
@@ -42,7 +42,7 @@
/** No error definition */
#define ENOERR 0
/** MIN version */
-#define MIN_VERSION_STR "min2010w47"
+#define MIN_VERSION_STR "min2010w50"
/* ------------------------------------------------------------------------- */
/** Max length of the Test Result description.
*/
--- min/src/services/scripter_module/min_scripter_if.c
+++ min/src/services/scripter_module/min_scripter_if.c
@@ -1401,7 +1401,6 @@
{
int retval = ENOERR;
pid_t pid = -1;
- char *dllpath = NEW2 (char, strlen (dllName) + 3 + 1);
ScriptedTestProcessDetails *stpd = INITPTR;
MsgBuffer input_buffer;
@@ -1418,9 +1417,6 @@
goto EXIT;
}
- memcpy (dllpath, dllName, strlen (dllName));
- strcpy (&dllpath[strlen (dllName)], ".so");
-
pid = fork ();
if (pid == 0) {
/* Child process, lets enter event loop */
@@ -1431,7 +1427,7 @@
signal (SIGUSR2, stp_handle_sigusr2);
signal (SIGSEGV, stp_handle_sigsegv);
signal (SIGABRT, stp_handle_sigabort);
- fetch_ptr2run (dllpath, className);
+ fetch_ptr2run (dllName, className);
while (stprun) {
retval = mq_peek_message (scripter_mod.mqid, getpid());
@@ -1457,7 +1453,7 @@
stpd->status_ = TP_NONE;
stpd->has_crashed_ = ESFalse;
STRCPY (stpd->testclass_, className, 128);
- STRCPY (stpd->dllname_, dllpath, MaxFileName);
+ STRCPY (stpd->dllname_, dllName, MaxFileName);
dl_list_add (scripter_mod.tp_details, (void *)stpd);
} else {
/* Error */
@@ -1466,7 +1462,6 @@
}
EXIT:
- DELETE (dllpath);
return retval;
}
--- min/src/services/scripter_module/scripter_plugin.c
+++ min/src/services/scripter_module/scripter_plugin.c
@@ -390,7 +390,6 @@
int opresult = 0;
char *case_title = NULL;
TSBool case_title_given = ESFalse;
- TSChar *f_path = NULL;
DLList *module_cases = dl_list_create ();
ptr2case get_cases = NULL;
ptr2run run_case = NULL;
@@ -416,15 +415,8 @@
if (case_title != NULL) {
case_title_given = ESTrue;
}
- if (strstr (lib_name, ".so") == NULL) {
- f_path = NEW2 (char, strlen (lib_name) + 4);
- sprintf (f_path, "%s.so", lib_name);
- } else {
- f_path = NEW2 (char, strlen (lib_name) + 1);
- sprintf (f_path, "%s", lib_name);
- }
- dll_handle = tl_open_tc (f_path);
+ dll_handle = tl_open_tc (lib_name);
if (dll_handle == INITPTR) {
opresult = 1;
SCRIPTER_SYNTAX_ERROR_ARG ("run",
@@ -487,7 +479,6 @@
}
EXIT:
if (dll_handle) dlclose (dll_handle);
- DELETE (f_path);
DELETE (lib_name);
DELETE (case_title);
DELETE (cfg_name);
@@ -1362,7 +1353,6 @@
ScripterDataItem *library;
TestClassDetails *test_class = INITPTR;
TestCaseInfo *tc;
- char *libpath = NULL;
void *dll_handle = NULL;
char *callname = NULL;
@@ -1374,26 +1364,11 @@
switch (library->DLL_type_) {
case EDLLTypeClass:
- if (strstr (library->DLL_name_, ".so") == NULL) {
- if (libpath) free (libpath);
- libpath =
- NEW2 (char,
- strlen (library->DLL_name_) + 4);
- sprintf (libpath, "%s.so",
- library->DLL_name_);
- } else {
- if (libpath) free (libpath);
- libpath =
- NEW2 (char,
- strlen (library->DLL_name_) + 1);
- sprintf (libpath, "%s", library->DLL_name_);
- }
- dll_handle = tl_open_tc (libpath);
+ dll_handle = tl_open_tc (library->DLL_name_);
if (dll_handle == INITPTR) {
SCRIPTER_ERROR ("Unable to load "
"test library",
- libpath);
- DELETE (libpath);
+ library->DLL_name_);
return 1;
}
test_class = NEW (TestClassDetails);
@@ -1412,7 +1387,6 @@
dlerror ());
DELETE (test_class->classname_);
DELETE (test_class);
- DELETE (libpath);
return 1;
}
test_class->runtc_ =
@@ -1423,7 +1397,6 @@
dlerror ());
DELETE (test_class->classname_);
DELETE (test_class);
- DELETE (libpath);
return 1;
}
dl_list_add (testclasses, (void *)test_class);
@@ -1434,7 +1407,6 @@
MIN_WARN ("Could not get list of "
"functions from %s",
test_class->classname_);
- DELETE (libpath);
return 1;
}
call_item = dl_list_head (library->symbol_list_);
@@ -1453,7 +1425,6 @@
"in class",
callname);
dlclose (dll_handle);
- DELETE (libpath);
return 1;
}
@@ -1469,7 +1440,6 @@
}
it = dl_list_next (it);
}
- DELETE (libpath);
return ENOERR;
}
--- min/src/test_libraries/Makefile.am
+++ min/src/test_libraries/Makefile.am
@@ -46,7 +46,7 @@
$(top_builddir)/src/services/event_system/libminevent.la \
$(top_builddir)/src/utils/libminutils.la
-minDemoModule_la_LDFLAGS = -shared -module -avoid-version
+minDemoModule_la_LDFLAGS = -shared -module -avoid-version
minDemoModule_la_SOURCES = Demo.c DemoCases.c Demo.h
minDemoModule_la_LIBADD = $(top_builddir)/src/tmc/test_module_api/libmintmapi.la \
$(top_builddir)/src/utils/libminutils.la \
--- min/src/utils/lib_loader/tllib.c
+++ min/src/utils/lib_loader/tllib.c
@@ -60,7 +60,7 @@
/* ------------------------------------------------------------------------- */
/* LOCAL FUNCTION PROTOTYPES */
/* ------------------------------------------------------------------------- */
-LOCAL void* tl_load_lib( const char *libname );
+LOCAL void* tl_load_lib (const char *libname, const char *extension);
/* ------------------------------------------------------------------------- */
/* FORWARD DECLARATIONS */
/* None */
@@ -69,12 +69,13 @@
/* ------------------------------------------------------------------------- */
/** Loads .so library.
* @param libname[in] the name of the library
+ * @param extension[in] extension to try
* @return pointer to dll handler, or INITPTR in case of failure.
*
- * It loads the library. .so extension is added automatically, settings
- * system is used to fetch lobrary paths.
+ * It loads the library. Extension is added to filename, settings
+ * system is used to fetch library paths.
*/
-LOCAL void* tl_load_lib( const char *libname )
+LOCAL void* tl_load_lib( const char *libname, const char *extension )
{
void *retval = INITPTR;
void *shmaddr = INITPTR;
@@ -89,12 +90,17 @@
/* If path specified try to open. */
if(strrchr(libname,'/')!=NULL) {
- retval = dlopen(libname,RTLD_LOCAL|RTLD_LAZY);
+ fullpath = tx_create (libname);
+ if(!strchr(libname,'.')) {tx_c_append(fullpath,
+ extension);}
+
+ retval = dlopen(tx_share_buf(fullpath),RTLD_LOCAL|RTLD_LAZY);
if(retval==NULL) {
MIN_NOTICE ("Library [%s] not opened because: %s"
,libname,dlerror());
retval = INITPTR;
}
+ tx_destroy (&fullpath);
return retval;
}
@@ -124,12 +130,14 @@
if( *(c-1) == '/' ) {
tx_c_append(fullpath,c2);
tx_c_append(fullpath,libname);
- if(!strchr(libname,'.')) {tx_c_append(fullpath,".so");}
+ if(!strchr(libname,'.')) {tx_c_append(fullpath,
+ extension);}
} else {
tx_c_append(fullpath,c2);
tx_c_append(fullpath,"/");
tx_c_append(fullpath,libname);
- if(!strchr(libname,'.')) {tx_c_append(fullpath,".so");}
+ if(!strchr(libname,'.')) {tx_c_append(fullpath,
+ extension);}
}
c=c+1;
c2=c;
@@ -177,7 +185,10 @@
memset(tlibl->date_,'\0',12);
memset(tlibl->time_,'\0',9);
- test_lib = tl_load_lib(lib_name);
+ test_lib = tl_load_lib(lib_name, ".so");
+ if (test_lib == INITPTR)
+ test_lib = tl_load_lib(lib_name, ".so.0");
+
if (test_lib == INITPTR) { return 1; }
tlibl->test_library_ = test_lib;
@@ -267,7 +278,8 @@
flen = strlen(file);
if( flen == 0 ) { goto EXIT; }
- retval = tl_load_lib(file);
+ retval = tl_load_lib(file, ".so");
+ if(retval==INITPTR) { retval=tl_load_lib(file, ".so.0"); }
if(retval==INITPTR) { return retval; }
/* Get version and type */
--- mincitests/qsrc/data/minqtdbtests.cfg
+++ mincitests/qsrc/data/minqtdbtests.cfg
@@ -1,7 +1,7 @@
[Test]
title insertion tests
description try inserting device,module,case
-createx libminqtdbtests test
+createx minqtdbtests test
# dev_id
test Init 2
# dev_id
@@ -22,7 +22,7 @@
[Test]
title execution test
-createx libminqtdbtests test
+createx minqtdbtests test
description insert test run, printout and result
test Init 3
test InsertDev 3
@@ -46,7 +46,7 @@
title check tc file insertion
description insert a couple test case file and check that they
description are found from db
-createx libminqtdbtests t
+createx minqtdbtests t
t Init 2
t InsertDev 2
t CheckTCFileInsert foo
@@ -58,7 +58,7 @@
title check module filename insertion
description insert a couple module file names
description and check that they are found from db
-createx libminqtdbtests t
+createx minqtdbtests t
t Init 2
t InsertDev 2
t CheckTMFileInsert wuz
@@ -68,7 +68,7 @@
[Test]
title test log
-createx libminqtdbtests t
+createx minqtdbtests t
t InsertLog error foo
t InsertLog info bar
t CheckLog info bar
@@ -79,7 +79,7 @@
[Test]
title check IDs
description check module,case,run id getters
-createx libminqtdbtests test
+createx minqtdbtests test
test Init 4
test InsertDev 4
test InsertMod 4 1819 tux
--- mincitests/qsrc/minqtdbtests.pro
+++ mincitests/qsrc/minqtdbtests.pro
@@ -25,7 +25,7 @@
../../minqt/src/core/min_database.hpp \
../../minqt/src/core/min_singleton.hpp
-TARGET = minqtdbtests.so
+TARGET = minqtdbtests.so.0
MIN_SCRIPTS.files = data/*.cfg
MIN_SCRIPTS.path = /usr/lib/min
--- minpythonmodule/min_ext/min_ext.c
+++ minpythonmodule/min_ext/min_ext.c
@@ -164,11 +164,14 @@
*end_pos = '\0';
}
path_to_check = NEW2 (char,
- strlen (start_pos) + strlen (l_name) + 5);
+ strlen (start_pos) + strlen (l_name) + 7);
/*check if it's library */
sprintf (path_to_check, "%s/%s.so", start_pos, l_name);
if (access (path_to_check, F_OK) == 0)
break;
+ sprintf (path_to_check, "%s/%s.so.0", start_pos, l_name);
+ if (access (path_to_check, F_OK) == 0)
+ break;
DELETE (path_to_check);
path_to_check = NEW2 (char,
strlen (start_pos) + strlen (l_name) + 2);
--- mintests/src/cfg/scripter.cfg
+++ mintests/src/cfg/scripter.cfg
@@ -49,8 +49,8 @@
[Test]
title testclasses-call-to-method
createx /usr/lib/min-tests/TestClass rtc
-createx /usr/lib/min-tests/TestClass rtc2
-createx /usr/lib/min-tests/TestClass rtc3
+createx /usr/lib/min-tests/TestClass.so rtc2
+createx /usr/lib/min-tests/TestClass.so.0 rtc3
rtc One
rtc2 Two
rtc3 Three
@@ -61,7 +61,7 @@
[Test]
title combiner-run
-run /usr/lib/min-tests/HardCoded.so dummy.cfg 4
+run /usr/lib/min-tests/HardCoded dummy.cfg 4
[Endtest]
[Test]
More information about the MeeGo-commits
mailing list