aiden
/
appmotor
mirror of https://github.com/cutefishos/appmotor
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Do not hardcode python version to cmd's.

Browse Source 
Signed-off-by: Marko Saukko <marko.saukko@gmail.com>
pull/1/head
Marko Saukko 14 years ago committed by Robin Burchell
parent 48ed517ce8
commit 7d243fa9d7
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File

4
src/launcher/CMakeLists.txt
Unescape Escape View File

@ -1,14 +1,14 @@
# Generate list of libraries for preload.h # Generate list of libraries for preload.h
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/preload-h-libraries.h OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/preload-h-libraries.h
COMMAND python2.6 ${CMAKE_HOME_DIRECTORY}/scripts/library-helper.py --preload-h-libraries COMMAND python ${CMAKE_HOME_DIRECTORY}/scripts/library-helper.py --preload-h-libraries
DEPENDS ${CMAKE_HOME_DIRECTORY}/scripts/library-helper.py DEPENDS ${CMAKE_HOME_DIRECTORY}/scripts/library-helper.py
) )
# Generate linker command line fragment # Generate linker command line fragment
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/additional-linked-libraries.ld OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/additional-linked-libraries.ld
COMMAND python2.6 ${CMAKE_HOME_DIRECTORY}/scripts/library-helper.py --linker-flags COMMAND python ${CMAKE_HOME_DIRECTORY}/scripts/library-helper.py --linker-flags
DEPENDS ${CMAKE_HOME_DIRECTORY}/scripts/library-helper.py DEPENDS ${CMAKE_HOME_DIRECTORY}/scripts/library-helper.py
) )

6
tests/meego/art-tests/tests.xml
Unescape Escape View File

@ -11,15 +11,15 @@
</pre_steps> </pre_steps>
<case name="zombie-state" type="Functional" description="To test that process exits after the application is killed" timeout="120" level="System"> <case name="zombie-state" type="Functional" description="To test that process exits after the application is killed" timeout="120" level="System">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_003_zombie_state</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_003_zombie_state</step>
</case> </case>
<case name="launch-multi-app" type="Functional" description="To test that more than one applications are launched by the launcher" timeout="120" level="System"> <case name="launch-multi-app" type="Functional" description="To test that more than one applications are launched by the launcher" timeout="120" level="System">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_004_launch_multiple_apps</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_004_launch_multiple_apps</step>
</case> </case>
<case name="one-instance" type="Functional" description="To test that only one instance of a application exist" timeout="120" level="System"> <case name="one-instance" type="Functional" description="To test that only one instance of a application exist" timeout="120" level="System">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_005_one_instance</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_005_one_instance</step>
</case> </case>
<environments> <environments>

18
tests/meego/bug-tests/tests.xml
Unescape Escape View File

@ -11,11 +11,11 @@
</pre_steps> </pre_steps>
<case name="launch-multi-app-cont" type="Functional" description="Test that launcher and invoker have correct credentials" timeout="360" level="System" insignificant="true"> <case name="launch-multi-app-cont" type="Functional" description="Test that launcher and invoker have correct credentials" timeout="360" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_009_launch_multiple_apps_cont</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_009_launch_multiple_apps_cont</step>
</case> </case>
<case name="launch-without-applauncherd" type="Functional" description="Test invoker can launch applications even when applauncherd is not running" timeout="360" level="System" insignificant="true"> <case name="launch-without-applauncherd" type="Functional" description="Test invoker can launch applications even when applauncherd is not running" timeout="360" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_020_launch_wo_applauncherd</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_020_launch_wo_applauncherd</step>
</case> </case>
<environments> <environments>
@ -58,19 +58,19 @@
</pre_steps> </pre_steps>
<case name="invoker-wait-term" type="Functional" description="Test that the launched application is killed when killing invoker that is waiting for app to terminate" timeout="360" level="System" insignificant="true"> <case name="invoker-wait-term" type="Functional" description="Test that the launched application is killed when killing invoker that is waiting for app to terminate" timeout="360" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_010</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_010</step>
</case> </case>
<case name="invoker-status" type="Functional" description="To test that invoker returns the same exit status as the application" timeout="360" level="System" insignificant="true"> <case name="invoker-status" type="Functional" description="To test that invoker returns the same exit status as the application" timeout="360" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_017_invoker_exit_status</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_017_invoker_exit_status</step>
</case> </case>
<case name="gid-uid" type="Functional" description="To Test that the set gid and uid is passed from invoker process to launcher" timeout="360" level="System" insignificant="true"> <case name="gid-uid" type="Functional" description="To Test that the set gid and uid is passed from invoker process to launcher" timeout="360" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_018_invoker_gid_uid</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_018_invoker_gid_uid</step>
</case> </case>
<case name="signal-forwarding" type="Functional" description="To Test that invoker is killed by the same signal as the application" timeout="360" level="System" insignificant="true"> <case name="signal-forwarding" type="Functional" description="To Test that invoker is killed by the same signal as the application" timeout="360" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_019_signal_forwarding</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_019_signal_forwarding</step>
</case> </case>
<environments> <environments>
@ -85,15 +85,15 @@
</pre_steps> </pre_steps>
<case name="fd-booster-m" type="Functional" description="File descriptor test for booster-m" timeout="360" level="System" insignificant="true"> <case name="fd-booster-m" type="Functional" description="File descriptor test for booster-m" timeout="360" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_014_fd_booster_m</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_014_fd_booster_m</step>
</case> </case>
<case name="fd-booster-q" type="Functional" description="File descriptor test for booster-q" timeout="360" level="System" insignificant="true"> <case name="fd-booster-q" type="Functional" description="File descriptor test for booster-q" timeout="360" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_015_fd_booster_q</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_015_fd_booster_q</step>
</case> </case>
<case name="kill-boosters" type="Functional" description="Test that booster is restarted if it is killed" timeout="360" level="System" insignificant="true"> <case name="kill-boosters" type="Functional" description="Test that booster is restarted if it is killed" timeout="360" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_016_restart_booster</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_016_restart_booster</step>
</case> </case>
<environments> <environments>
<scratchbox>true</scratchbox> <scratchbox>true</scratchbox>

16
tests/meego/functests/tests.xml
Unescape Escape View File

@ -12,35 +12,35 @@
<case name="launcher-exist" type="Functional" description="To test if the launcher exists and is executable or not" timeout="360" level="System" insignificant="false"> <case name="launcher-exist" type="Functional" description="To test if the launcher exists and is executable or not" timeout="360" level="System" insignificant="false">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_001_launcher_exist</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_001_launcher_exist</step>
</case> </case>
<case name="launchable-app-exist" type="Functional" description="test_launchable_application_exists " timeout="360" level="System" insignificant="false"> <case name="launchable-app-exist" type="Functional" description="test_launchable_application_exists " timeout="360" level="System" insignificant="false">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_002_applications_exist</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_002_applications_exist</step>
</case> </case>
<case name="zombie-state" type="Functional" description="To test that process exits after the application is killed" timeout="360" level="System" insignificant="false"> <case name="zombie-state" type="Functional" description="To test that process exits after the application is killed" timeout="360" level="System" insignificant="false">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_003_zombie_state</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_003_zombie_state</step>
</case> </case>
<case name="launch-multi-app" type="Functional" description="To test that more than one applications are launched by the launcher" timeout="360" level="System" insignificant="false"> <case name="launch-multi-app" type="Functional" description="To test that more than one applications are launched by the launcher" timeout="360" level="System" insignificant="false">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_004_launch_multiple_apps</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_004_launch_multiple_apps</step>
</case> </case>
<case name="one-instance" type="Functional" description="To test that only one instance of a application exist" timeout="360" level="System" insignificant="false"> <case name="one-instance" type="Functional" description="To test that only one instance of a application exist" timeout="360" level="System" insignificant="false">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_005_one_instance</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_005_one_instance</step>
</case> </case>
<case name="daemonized" type="Functional" description="Test that the applauncherd can be started daemonized" timeout="360" level="System" insignificant="true"> <case name="daemonized" type="Functional" description="Test that the applauncherd can be started daemonized" timeout="360" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_011</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_011</step>
</case> </case>
<case name="invoker-delay" type="Functional" description="Test that invokers --delay parameter works" timeout="360" level="System" insignificant="true"> <case name="invoker-delay" type="Functional" description="Test that invokers --delay parameter works" timeout="360" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_012</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_012</step>
</case> </case>
<case name="invoker_search_prog" type="Functional" description="Test that invoker finds binaries from PATH" timeout="360" level="System" insignificant="true"> <case name="invoker_search_prog" type="Functional" description="Test that invoker finds binaries from PATH" timeout="360" level="System" insignificant="true">
<step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python2.6 /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_invoker_search_prog</step> <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 python /usr/share/applauncherd-M-testscripts/test-func-launcher.py test_invoker_search_prog</step>
</case> </case>

Write Preview
Loading…
Cancel
Save