Merge remote branch 'origin/master'

pull/1/head
Alexey Shilov 15 years ago
commit 348a760013

@ -1,4 +1,4 @@
usr/bin/applauncherd.bin
usr/lib/libapplauncherd.so
usr/lib/applauncherd/libapplauncherd.so
usr/bin/applauncherd

14
debian/changelog vendored

@ -1,3 +1,17 @@
applauncherd (0.15.8) unstable; urgency=low
* Changes: Added a workaround to startup time tests from grid to make them work
-- Olli Leppanen <olli.leppanen@nokia.com> Mon, 06 Dec 2010 18:21:06 +0200
applauncherd (0.15.7) stable; urgency=low
* Changes: Install libapplauncherd.so to /usr/lib/applauncherd/libapplauncherd.so
* Changes: Some useless X11 modules removed from fala_windowid's CMakeLists.txt
* Startup time tests polished
-- Jussi Lind <jussi.lind@nokia.com> Fri, 03 Dec 2010 11:21:06 +0200
applauncherd (0.15.6) stable; urgency=low
* Changes: Added the windowid binary to be used in startup tests

@ -0,0 +1,9 @@
#!/bin/sh
if test -n "$1"
then
git archive --format tar --remote=$1 --output=meegotouch-applauncherd-0.15.7.tar --prefix meegotouch-applauncherd-0.15.7/ released/0.15.7
bzip2 meegotouch-applauncherd-0.15.7.tar
else
echo "Usage: create-tarball.sh <repo>"
echo " where <repo> is suitable for git archive --remote=<repo>"
fi

@ -0,0 +1,34 @@
* Fri Dec 3 2010 Jussi Lind <jussi.lind@nokia.com> - 0.15.7
- Changes: Install libapplauncherd.so to /usr/lib/applauncherd/libapplauncherd.so
* Fri Nov 30 2010 Nimika Keshri <nimika.1.keshri@nokia.com> - 0.15.5
- BCM#10591 - meegotouch-applauncherd outdated in MeeGo
- Changes: A bit confusing Booster::readCommand() renamed to
Booster::receiveDataFromInvoker().
- Changes: Access Booster::m_connection and Booster::m_appData through setter
/getter in derived classes.
- Changes: License plates added to some test apps.
- Changes: Default C-flags added to top-level CMakeLists.
- Changes: Launcher library exports only main()
- Changes: Install /usr/bin/applauncherd.launcher to /usr/lib/libapplauncherd.so
due to dh_strip problems and because it's not -pie.
- Changes: Basic implementation of library-based launcher
- Changes: no-wait option for invoker is added
- Changes: invoker - launcher protocol simplification
- Changes: use at() instead of [] operator to read-only access to vector elements
- Changes: use RTLD_LOCAL flag instead of RTLD_GLOBAL in dlopen() to load application binary
- Changes: remove -rdynamic linker parameter
- Changes: acceptConn() => accept(), closeConn() => close(), socket pool is cleared on closeAllSockets()
- Changes: Preloaded libraries are loaded with dlopen() (preload.h)
* Thu Sep 2 2010 Pertti Kellomäki <pertti.kellomaki@nokia.com> - 0.12.1
- Updated to version 0.12.1.
- Packaged tests and test scripts as subpackages, reorganized testing
stuff to satisfy rpmlint.
- Included a .desktop file which kicks off applauncherd in a UI session.
* Wed Aug 25 2010 Pertti Kellomäki <pertti.kellomaki@nokia.com> - 0.10.3
- Updated to version 0.10.3.
* Wed Jul 14 2010 Pertti Kellomäki <pertti.kellomaki@nokia.com> - 0.8.0
- Initial packaging.

@ -0,0 +1,207 @@
#
# Do NOT Edit the Auto-generated Part!
# Generated by: spectacle version 0.21
#
# >> macros
# << macros
Name: meegotouch-applauncherd
Summary: Application launcher for fast startup
Version: 0.15.7
Release: 1
Group: System/Daemons
License: LGPLv2+
URL: http://meego.gitorious.com/meegotouch/meegotouch-applauncherd
Source0: %{name}-%{version}.tar.bz2
Source100: meegotouch-applauncherd.yaml
BuildRequires: pkgconfig(QtCore)
BuildRequires: pkgconfig(meegotouch)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xtst)
BuildRequires: pkgconfig(xextproto)
BuildRequires: pkgconfig(xi)
BuildRequires: pkgconfig(xext)
BuildRequires: cmake
%description
Application invoker and launcher daemon that speed up
application startup time.
%package devel
Summary: Development files for launchable applications
Group: Development/Tools
Requires: %{name} = %{version}-%{release}
%description devel
Development files for creating applications that can be launched
using meegotouch-applauncherd.
%package testapps
Summary: Test applications for launchable applications
Group: Development/Tools
Requires: %{name} = %{version}-%{release}
%description testapps
Test applications used for testing meegotouch-applauncherd.
%package tests
Summary: Test scripts for launchable applications
Group: Development/Tools
Requires: %{name} = %{version}-%{release}
Requires: %{name}-testapps = %{version}-%{release}
BuildRequires: desktop-file-utils
%description tests
Test scripts used for testing meegotouch-applauncherd.
%prep
%setup -q -n %{name}-%{version}
# >> setup
# << setup
%build
# >> build pre
export BUILD_TESTS=1
export MEEGO=1
unset LD_AS_NEEDED
# << build pre
%configure --disable-static
make %{?jobs:-j%jobs}
# >> build post
# << build post
%install
rm -rf %{buildroot}
# >> install pre
# << install pre
%make_install
# >> install post
# rpmlint complains about installing binaries in /usr/share, so
# move them elsewhere and leave a symlink in place.
mv %{buildroot}/usr/share/applauncherd-tests %{buildroot}/usr/lib
(cd %{buildroot}/usr/share; ln -s ../lib/applauncherd-tests)
# << install post
%files
%defattr(-,root,root,-)
%{_bindir}/invoker
%{_libdir}/libapplauncherd/libapplauncherd.so
%{_bindir}/applauncherd.bin
%{_bindir}/applauncherd
%config %{_sysconfdir}/xdg/autostart/applauncherd.desktop
# >> files
# << files
%files devel
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/meegotouch-boostable.pc
%{_libdir}/pkgconfig/qt-boostable.pc
%doc %{_docdir}/applauncherd/README
%{_datadir}/qt4/mkspecs/features/meegotouch-boostable.prf
%{_datadir}/qt4/mkspecs/features/qt-boostable.prf
# >> files devel
# << files devel
%files testapps
%defattr(-,root,root,-)
%{_bindir}/fala_ft_hello
%{_bindir}/fala_gettime_ms
%{_bindir}/fala_pixelchanged
%{_bindir}/fala_wl
%{_bindir}/fala_wl.launch
%{_bindir}/fala_wol
%{_bindir}/fala_wol.sh
%{_bindir}/fala_gettime
%{_bindir}/fala_status.launch
%{_bindir}/fala_ft_hello1
%{_bindir}/fala_ft_hello2
%{_bindir}/fala_ft_hello.launch
%{_bindir}/fala_ft_hello1.launch
%{_bindir}/fala_ft_hello2.launch
%{_bindir}/fala_testapp
%{_bindir}/fala_ft_themetest.launch
%{_bindir}/fala_ft_themetest
%{_bindir}/fala_windowid
%{_datadir}/themes/base/meegotouch/fala_ft_themetest/svg/baa.svg
%{_datadir}/dbus-1/services/com.nokia.fala_testapp.service
# >> files testapps
# << files testapps
%files tests
%defattr(-,root,root,-)
%{_datadir}/applauncherd-M-art-tests/tests.xml
%{_datadir}/applauncherd-M-bug-tests/tests.xml
%{_datadir}/applauncherd-M-functional-tests/tests.xml
%{_datadir}/applauncherd-M-performance-tests/tests.xml
%{_datadir}/applauncherd-tests
%{_libdir}/applauncherd-tests/tests.xml
%{_libdir}/applauncherd-tests/ut_booster
%{_libdir}/applauncherd-tests/ut_connection
%{_libdir}/applauncherd-tests/ut_daemon
%{_libdir}/applauncherd-tests/ut_mbooster
%{_libdir}/applauncherd-tests/ut_qtbooster
%{_libdir}/applauncherd-tests/ut_boosterfactory
%{_libdir}/applauncherd-tests/ut_wrtbooster
%{_datadir}/applauncherd-M-testscripts/check_pipes.py
%exclude %{_datadir}/applauncherd-M-testscripts/check_pipes.pyc
%exclude %{_datadir}/applauncherd-M-testscripts/check_pipes.pyo
%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_m.py
%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_m.pyc
%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_m.pyo
%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_m.sh
%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_qt.py
%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_qt.pyc
%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_qt.pyo
%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_qt.sh
%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_wrt.py
%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_wrt.pyc
%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_wrt.pyo
%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_wrt.sh
%{_datadir}/applauncherd-M-testscripts/tc_theming.rb
%{_datadir}/applauncherd-M-testscripts/test-func-launcher.py
%exclude %{_datadir}/applauncherd-M-testscripts/test-func-launcher.pyc
%exclude %{_datadir}/applauncherd-M-testscripts/test-func-launcher.pyo
%{_datadir}/applauncherd-M-testscripts/test-perf-mbooster.py
%exclude %{_datadir}/applauncherd-M-testscripts/test-perf-mbooster.pyc
%exclude %{_datadir}/applauncherd-M-testscripts/test-perf-mbooster.pyo
%{_datadir}/applauncherd-M-testscripts/ts_prestartapp.rb
%{_datadir}/applauncherd-M-testscripts/fala_wid
%{_datadir}/applauncherd-M-testscripts/fala_xres_wl
%{_datadir}/applauncherd-M-testscripts/fala_xres_wol
%{_datadir}/applauncherd-M-testscripts/test-perf.rb
%{_datadir}/applauncherd-M-testscripts/utils.py
%exclude %{_datadir}/applauncherd-M-testscripts/utils.pyc
%exclude %{_datadir}/applauncherd-M-testscripts/utils.pyo
%{_datadir}/themes/base/meegotouch/fala_ft_themetest/style/fala_ft_themetest.css
%{_datadir}/applications/fala_wl.desktop
%{_datadir}/applications/fala_wol.desktop
%{_datadir}/dbus-1/services/com.nokia.fala_wl.service
%{_datadir}/dbus-1/services/com.nokia.fala_wol.service
# >> files tests
# << files tests

@ -0,0 +1,127 @@
Name: meegotouch-applauncherd
Summary: Application launcher for fast startup
Version: 0.15.7
Release: 1
Group: System/Daemons
License: LGPLv2+
URL: http://meego.gitorious.com/meegotouch/meegotouch-applauncherd
Sources:
- "%{name}-%{version}.tar.bz2"
Patches:
Description: |
Application invoker and launcher daemon that speed up
application startup time.
PkgConfigBR:
- QtCore
- meegotouch
- x11
- xtst
- xextproto
- xi
- xext
PkgBR:
- cmake
Builder: make
SubPackages:
- Name: devel
Group: Development/Tools
Summary: Development files for launchable applications
Description: |
Development files for creating applications that can be launched
using meegotouch-applauncherd.
Files:
- "%{_libdir}/pkgconfig/meegotouch-boostable.pc"
- "%{_libdir}/pkgconfig/qt-boostable.pc"
- "%doc %{_docdir}/applauncherd/README"
- "%{_datadir}/qt4/mkspecs/features/meegotouch-boostable.prf"
- "%{_datadir}/qt4/mkspecs/features/qt-boostable.prf"
- Name: testapps
Group: Development/Tools
Summary: Test applications for launchable applications
Description: |
Test applications used for testing meegotouch-applauncherd.
Files:
- "%{_bindir}/fala_ft_hello"
- "%{_bindir}/fala_gettime_ms"
- "%{_bindir}/fala_pixelchanged"
- "%{_bindir}/fala_wl"
- "%{_bindir}/fala_wl.launch"
- "%{_bindir}/fala_wol"
- "%{_bindir}/fala_wol.sh"
- "%{_bindir}/fala_gettime"
- "%{_bindir}/fala_status.launch"
- "%{_bindir}/fala_ft_hello1"
- "%{_bindir}/fala_ft_hello2"
- "%{_bindir}/fala_ft_hello.launch"
- "%{_bindir}/fala_ft_hello1.launch"
- "%{_bindir}/fala_ft_hello2.launch"
- "%{_bindir}/fala_testapp"
- "%{_bindir}/fala_ft_themetest.launch"
- "%{_bindir}/fala_ft_themetest"
- "%{_bindir}/fala_windowid"
- "%{_datadir}/themes/base/meegotouch/fala_ft_themetest/svg/baa.svg"
- "%{_datadir}/dbus-1/services/com.nokia.fala_testapp.service"
- Name: tests
Group: Development/Tools
Summary: Test scripts for launchable applications
Description: |
Test scripts used for testing meegotouch-applauncherd.
Requires: "%{name}-testapps = %{version}-%{release}"
Files:
- "%{_datadir}/applauncherd-M-art-tests/tests.xml"
- "%{_datadir}/applauncherd-M-bug-tests/tests.xml"
- "%{_datadir}/applauncherd-M-functional-tests/tests.xml"
- "%{_datadir}/applauncherd-M-performance-tests/tests.xml"
- "%{_datadir}/applauncherd-tests"
- "%{_libdir}/applauncherd-tests/tests.xml"
- "%{_libdir}/applauncherd-tests/ut_booster"
- "%{_libdir}/applauncherd-tests/ut_connection"
- "%{_libdir}/applauncherd-tests/ut_daemon"
- "%{_libdir}/applauncherd-tests/ut_mbooster"
- "%{_libdir}/applauncherd-tests/ut_qtbooster"
- "%{_libdir}/applauncherd-tests/ut_boosterfactory"
- "%{_libdir}/applauncherd-tests/ut_wrtbooster"
- "%{_datadir}/applauncherd-M-testscripts/check_pipes.py"
- "%exclude %{_datadir}/applauncherd-M-testscripts/check_pipes.pyc"
- "%exclude %{_datadir}/applauncherd-M-testscripts/check_pipes.pyo"
- "%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_m.py"
- "%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_m.pyc"
- "%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_m.pyo"
- "%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_m.sh"
- "%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_qt.py"
- "%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_qt.pyc"
- "%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_qt.pyo"
- "%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_qt.sh"
- "%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_wrt.py"
- "%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_wrt.pyc"
- "%exclude %{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_wrt.pyo"
- "%{_datadir}/applauncherd-M-testscripts/signal-forward/fala_sf_wrt.sh"
- "%{_datadir}/applauncherd-M-testscripts/tc_theming.rb"
- "%{_datadir}/applauncherd-M-testscripts/test-func-launcher.py"
- "%exclude %{_datadir}/applauncherd-M-testscripts/test-func-launcher.pyc"
- "%exclude %{_datadir}/applauncherd-M-testscripts/test-func-launcher.pyo"
- "%{_datadir}/applauncherd-M-testscripts/test-perf-mbooster.py"
- "%exclude %{_datadir}/applauncherd-M-testscripts/test-perf-mbooster.pyc"
- "%exclude %{_datadir}/applauncherd-M-testscripts/test-perf-mbooster.pyo"
- "%{_datadir}/applauncherd-M-testscripts/ts_prestartapp.rb"
- "%{_datadir}/applauncherd-M-testscripts/fala_wid"
- "%{_datadir}/applauncherd-M-testscripts/fala_xres_wl"
- "%{_datadir}/applauncherd-M-testscripts/fala_xres_wol"
- "%{_datadir}/applauncherd-M-testscripts/test-perf.rb"
- "%{_datadir}/applauncherd-M-testscripts/utils.py"
- "%exclude %{_datadir}/applauncherd-M-testscripts/utils.pyc"
- "%exclude %{_datadir}/applauncherd-M-testscripts/utils.pyo"
- "%{_datadir}/themes/base/meegotouch/fala_ft_themetest/style/fala_ft_themetest.css"
- "%{_datadir}/applications/fala_wl.desktop"
- "%{_datadir}/applications/fala_wol.desktop"
- "%{_datadir}/dbus-1/services/com.nokia.fala_wl.service"
- "%{_datadir}/dbus-1/services/com.nokia.fala_wol.service"
Files:
- "%{_bindir}/invoker"
- "%{_libdir}/libapplauncherd/libapplauncherd.so"
- "%{_bindir}/applauncherd.bin"
- "%{_bindir}/applauncherd"
- "%config %{_sysconfdir}/xdg/autostart/applauncherd.desktop"

@ -9,7 +9,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
# Set precompiler flags
add_definitions(-DLIBRARIES_CONFIG_FILE="/etc/applauncherd.conf")
add_definitions(-DLAUNCHER_LIBRARY="/usr/lib/libapplauncherd.so")
add_definitions(-DLAUNCHER_LIBRARY="/usr/lib/applauncherd/libapplauncherd.so")
link_libraries(${LIBDL})

@ -28,6 +28,5 @@ link_libraries(${MEEGOTOUCH_LIBRARIES} ${LIBDL} ${QT_QTCORE_LIBRARY} ${WRT_LIBRA
add_library(applauncherd MODULE ${SRC} ${MOC_SRC})
# Add install rule
#install(FILES liblauncher.so DESTINATION /usr/bin/ RENAME applauncherd.launch)
install(FILES libapplauncherd.so DESTINATION /usr/lib)
install(FILES libapplauncherd.so DESTINATION /usr/lib/applauncherd/)

@ -1,17 +1,10 @@
# Set sources
set(SRC main.cpp)
# This is needed for MeeGo only?
pkg_check_modules(XI xi REQUIRED)
include_directories(${XI_INCLUDE_DIRS})
pkg_check_modules(X11 x11 REQUIRED)
include_directories(${X11_INCLUDE_DIRS})
pkg_check_modules(XTST xtst REQUIRED)
include_directories(${XTST_INCLUDE_DIRS})
link_libraries(${X11_LDFLAGS} ${XTST_LDFLAGS} ${XI_LDFLAGS})
link_libraries(${X11_LDFLAGS})
add_executable(fala_windowid ${SRC})
# Install

@ -148,7 +148,6 @@ static int client_msg(Display *disp, Window win, char *msg, /* {{{ */
void raise_window(Display *dpy, Window win)
{
client_msg(dpy, win, "_NET_ACTIVE_WINDOW", 0, 0, 0, 0, 0);
XMapRaised(dpy, win);
XSync(dpy, False);
}

@ -27,7 +27,8 @@ include TDriverVerify
WINDOWID_BINARY = '/usr/bin/fala_windowid'
PIXELCHANGED_BINARY= '/usr/bin/fala_pixelchanged'
MATTI_LOCATION='/usr/lib/qt4/plugins/testability/libtestability.so'
TEMPORARY_MATTI_LOCATION='/root/libtestability.so'
options = {}
@ -63,12 +64,37 @@ if options[:application] == nil && !(options[:grid])
exit 1
end
pos = 0
appName=options[:application]
sut = TDriver.sut(:Id=> 'sut_qt_maemo')
# Check if TDriver can attach to meegotouch instance.
# If not, this might be caused because MtHome is started
# before TDriver server or the Matti library is temporary
# renamed.
@meegoHome = nil
begin
@meegoHome = sut.application(:name => 'meegotouchhome')
puts "Meegotouchhome found"
rescue MobyBase::TestObjectNotFoundError
puts "Meegotouchhome not found"
matti_removed = false
if File.exists?(TEMPORARY_MATTI_LOCATION) && !(File.exists?(MATTI_LOCATION))
puts "matti removed. putting back.."
matti_removed = true
system "mv #{TEMPORARY_MATTI_LOCATION} #{MATTI_LOCATION}"
end
puts "restarting meegotouchhome"
system("initctl restart xsession/mthome")
sleep(4)
if matti_removed
puts "removing matti again.."
system "mv #{MATTI_LOCATION} #{TEMPORARY_MATTI_LOCATION}"
end
end
# Bring the meegotouchhome to the top of the screen
meegotouchpid=`pgrep meegotouchhome`
if !(result=$?.success?)
@ -91,15 +117,19 @@ windowid = windowid.split("\n")[-1]
puts "windowid: #{windowid}"
system "#{PIXELCHANGED_BINARY} -r #{windowid}"
@meegoHome = sut.application(:name => 'meegotouchhome')
sleep (2)
system "mcetool --blank-screen"
sleep (2)
system "mcetool --unblank-screen"
# Application grid should be now visible
if options[:grid]
exit 0;
end
@meegoHome = sut.application(:name => 'meegotouchhome')
sleep(2)
if @meegoHome.test_object_exists?("LauncherButton", :text => appName)
icon = @meegoHome.LauncherButton(:name => "LauncherButton", :text => appName)

@ -31,6 +31,9 @@ class TC_PerformanceTests < Test::Unit::TestCase
GET_COORDINATES_SCRIPT="#{TEST_SCRIPT_LOCATION}/get-coordinates.rb"
PIXELCHANGED_LOG = '/tmp/fala_pixelchanged.log'
FALA_GETTIME_BINARY = '/usr/bin/fala_gettime_ms'
MATTI_LOCATION='/usr/lib/qt4/plugins/testability/libtestability.so'
TEMPORARY_MATTI_LOCATION='/root/libtestability.so'
@start_time = 0
@end_time = 0
@pos = 0
@ -107,18 +110,17 @@ class TC_PerformanceTests < Test::Unit::TestCase
puts "Inside SB, Do Nothing to unlock"
else
system "mcetool --set-tklock-mode=unlocked"
system "mcetool --set-inhibit-mode=stay-on"
end
if @options[:application] != nil
system("initctl stop xsession/applifed")
system("initctl restart xsession/mthome")
end
system("initctl stop xsession/search")
system("initctl stop xsession/sysuid")
system("initctl restart xsession/mthome")
sleep(4)
system("mv /usr/lib/qt4/plugins/testability/libtestability.so /tmp/.")
sleep(10)
system "mv #{MATTI_LOCATION} #{TEMPORARY_MATTI_LOCATION}"
system("initctl stop xsession/mprogressindicator")
@ -129,12 +131,15 @@ class TC_PerformanceTests < Test::Unit::TestCase
# method called after any test case for cleanup purposes
def teardown
puts "exit from teardown"
system("mv /tmp/libtestability.so /usr/lib/qt4/plugins/testability/libtestability.so")
sleep(4)
system("initctl restart xsession/mthome")
system("initctl start xsession/sysuid")
system("initctl start xsession/applifed")
system "mv #{TEMPORARY_MATTI_LOCATION} #{MATTI_LOCATION}"
system("initctl start xsession/search")
if @options[:application] != nil
system("initctl start xsession/applifed")
system("initctl restart xsession/mthome")
sleep(10)
end
end
def open_Apps(appName)
@ -157,7 +162,7 @@ class TC_PerformanceTests < Test::Unit::TestCase
# Check the avarage system load is under 0.3
system "/usr/bin/waitloadavg.rb -l 0.3 -p 1.0 -t 100 -d"
start_command ="`#{PIXELCHANGED_BINARY} -q >> #{PIXELCHANGED_LOG} &`; #{FALA_GETTIME_BINARY} \"Started from command line\" >> #{PIXELCHANGED_LOG}; #{@options[:command]} &"
start_command ="`#{PIXELCHANGED_BINARY} -t 2x200 -q >> #{PIXELCHANGED_LOG} &`; #{FALA_GETTIME_BINARY} \"Started from command line\" >> #{PIXELCHANGED_LOG}; #{@options[:command]} &"
puts "start command: #{start_command}"
system "#{start_command}"
sleep (4)
@ -171,17 +176,17 @@ class TC_PerformanceTests < Test::Unit::TestCase
system "#{@options[:pre_step]}"
end
system "/usr/bin/waitloadavg.rb -l 0.3 -p 1.0 -t 100 -d"
system "/usr/bin/waitloadavg.rb -l 0.3 -p 1.0 -t 30 -d"
@pos = `#{GET_COORDINATES_SCRIPT} -a #{@options[:application]}`
puts "original: #{@pos}"
@pos = @pos.split("\n")[-1]
system "/usr/bin/waitloadavg.rb -l 0.3 -p 1.0 -t 30 -d"
puts "#{PIXELCHANGED_BINARY} -c #{@pos} -f #{PIXELCHANGED_LOG} -q"
system "#{PIXELCHANGED_BINARY} -c #{@pos} -f #{PIXELCHANGED_LOG} -q"
system "/usr/bin/waitloadavg.rb -l 0.3 -p 1.0 -t 50 -d"
puts "#{PIXELCHANGED_BINARY} -c #{@pos} -t 2x200 -f #{PIXELCHANGED_LOG} -q"
system "#{PIXELCHANGED_BINARY} -c #{@pos} -t 2x200 -f #{PIXELCHANGED_LOG} -q"
sleep (4)
# Raise meegotouchhome to the top. Workaround for keeping the window
# stack in shape.
# Raise meegotouchhome to the top.
#Workaround for keeping the window stack in shape.
system "#{GET_COORDINATES_SCRIPT} -g"
system "pkill #{@options[:binary]}"

@ -29,13 +29,14 @@
<step>/usr/bin/waitloadavg.rb -l 1.0 -p 1.0 -t 120</step>
</pre_steps>
<case name="Perf-Test-Command-launcher" type="Performance" description="Measure startup time of the application using launcher" timeout="500" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/test-perf.rb name test_performance -- -c /usr/bin/fala_wl -b "fala_wl" &gt; /tmp/perf_commandline_with_launcher.txt</step>
</case>
<case name="Perf-Test-Command-plain" type="Performance" description="Measure startup time of the application using launcher" timeout="500" level="System" insignificant="true">
<case name="Perf-Test-Command-plain" type="Performance" description="Measure startup time of the application without launcher" timeout="500" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/test-perf.rb name test_performance -- -c /usr/bin/fala_wol -b "fala_wol" &gt; /tmp/perf_commandline_without_launcher.txt</step>
</case>
<case name="Perf-Test-Command-launcher" type="Performance" description="Measure startup time of the application using launcher" timeout="500" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/test-perf.rb name test_performance -- -c /usr/bin/fala_wl -b "fala_wl" -l 600 &gt; /tmp/perf_commandline_with_launcher.txt</step>
</case>
<environments>
<scratchbox>false</scratchbox>
<hardware>true</hardware>
@ -52,12 +53,12 @@
<step>/usr/bin/waitloadavg.rb -l 1.0 -p 1.0 -t 120</step>
</pre_steps>
<case name="Perf-Test-Grid-plain" type="Performance" description="Measure startup time of the application without launcher" timeout="500" level="System" insignificant="true">
<case name="Perf-Test-Grid-plain" type="Performance" description="Measure startup time of the application without launcher" timeout="840" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/test-perf.rb name test_performance -- -a fala_wol -b "fala_wol" &gt; /tmp/perf_grid_without_launcher.txt</step>
</case>
<case name="Perf-Test-Grid-launcher" type="Performance" description="Measure startup time of the application using launcher" timeout="500" level="System" insignificant="true">
<case name="Perf-Test-Grid-launcher" type="Performance" description="Measure startup time of the application using launcher" timeout="840" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 /usr/share/applauncherd-testscripts/test-perf.rb name test_performance -- -a fala_wl -b "fala_wl" &gt; /tmp/perf_grid_with_launcher.txt</step>
</case>

Loading…
Cancel
Save