Merge commit 'origin/master'

pull/1/head
Alexey Shilov 15 years ago
commit 51318346cc

@ -1,21 +1,15 @@
<aegis>
<provide>
<credential name="access"/>
</provide>
<request>
<credential name="CAP::setgid"/>
<credential name="CAP::setuid"/>
<credential name="CAP::setfcap"/>
<credential name="CAP::setpcap"/>
<credential name="CAP::sys_nice"/>
<credential match="CAP::*"/>
<credential name="drm"/>
<credential name="Cellular"/>
<credential name="ReadUserData"/>
<credential name="ReadWriteUserData"/>
<for path="/usr/bin/applauncherd.bin"/>
</request>
<provide>
<credential name="access" />
</provide>
</aegis>

@ -1,4 +1,5 @@
usr/bin/fala_ft_hello
usr/bin/fala_status.launch
usr/bin/fala_ft_hello1
usr/bin/fala_ft_hello2
usr/bin/fala_ft_hello.launch

10
debian/changelog vendored

@ -1,3 +1,13 @@
applauncherd (0.10.2) stable; urgency=low
* Changes: close connection with invoker if --wait-term param is not used
* Changes: Replaced references to Matti with TDriver
* Changes: sending application exit status to invoker stubs, code refactoring
* Changes: return application's exit status to invoker
* Changes: Changed the order of provide and request in applauncherd-launcher.aegis
-- Nimika Keshri <nimika.1.keshri@nokia.com> Tue, 17 Aug 2010 15:41:40 +0300
applauncherd (0.10.1) stable; urgency=low
* Fixes: NB#184761 - Application launched with applauncher does not generate core dumps

@ -43,3 +43,6 @@ add_subdirectory(TestApps/testapp)
# Sub build: TestApps
add_subdirectory(TestApps/themetest)
# Sub build: TestApps
add_subdirectory(TestApps/fala_status)

@ -0,0 +1,32 @@
# Set sources
set(SRC fala_status.cpp)
link_libraries(${MEEGOTOUCH_LIBRARIES})
include(${QT_USE_FILE})
# Use the compiler and linker flags given in meegotouch-boostable.pc
# in the source tree.
execute_process(COMMAND "env"
"PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig"
"/usr/bin/pkg-config"
"--cflags"
"meegotouch-boostable"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE booster_cflags
OUTPUT_STRIP_TRAILING_WHITESPACE)
execute_process(COMMAND "env"
"PKG_CONFIG_PATH=${CMAKE_SOURCE_DIR}/data/pkgconfig"
"/usr/bin/pkg-config" "--libs"
"meegotouch-boostable"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE booster_libs
OUTPUT_STRIP_TRAILING_WHITESPACE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${booster_cflags}")
set(CMAKE_EXE_LINKER_FLAGS ${booster_libs})
add_executable(fala_status ${SRC})
# Install
install(PROGRAMS fala_status DESTINATION /usr/bin RENAME fala_status.launch)

@ -0,0 +1,39 @@
/***************************************************************************
**
** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (directui@nokia.com)
**
** This file is part of applauncherd
**
** If you have questions regarding the use of this file, please contact
** Nokia at directui@nokia.com.
**
** This library is free software; you can redistribute it and/or
** modify it under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation
** and appearing in the file LICENSE.LGPL included in the packaging
** of this file.
**
****************************************************************************/
#include <MApplication>
#include <MApplicationPage>
#include <MApplicationWindow>
#include <MExport>
#include <QTimer>
#ifdef HAVE_MCOMPONENTCACHE
#include <mcomponentcache.h>
#endif
M_EXPORT int main(int argc, char ** argv)
{
#ifdef HAVE_MCOMPONENTCACHE
MApplication *app = MComponentCache::mApplication(argc, argv);
#endif
QTimer::singleShot(5, app, SLOT(quit()));
app->exec();
return 29;
}

@ -631,6 +631,21 @@ class launcher_tests (unittest.TestCase):
self.assert_(mpid_new != None, "No booster process running")
self.assert_(mpid_new != mpid, "booster process was not killed")
def test_017_invoker_exit_status(self):
"""
To test that invoker returns the same exit status as the application
"""
#Run application without invoker and get the exit status
st, op = commands.getstatusoutput('/usr/bin/fala_status.launch')
app_st_wo_inv = os.WEXITSTATUS(st)
#Run application with invoker and get the exit status
st, op = commands.getstatusoutput('invoker --type=m --wait-term /usr/bin/fala_status.launch')
app_st_w_inv = os.WEXITSTATUS(st)
self.assert_(app_st_wo_inv == app_st_w_inv, "The invoker returns a wrong exit status")
# main
if __name__ == '__main__':

@ -65,6 +65,11 @@
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_010</step>
</case>
<case name="invoker-status" type="Functional" description="To test that invoker returns the same exit status as the application" timeout="120" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_017_invoker_exit_status</step>
</case>
<environments>
<scratchbox>true</scratchbox>
<hardware>true</hardware>

Loading…
Cancel
Save