From 0f6436373e80113294d93e79a877bbc9aed04116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Fri, 4 Nov 2005 12:44:23 +0000 Subject: [PATCH] removed bogus install-libs script, updated NOTES and Playground run script to use the pseudo target install-test-apps git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14686 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/tests/servers/app/NOTES | 12 +++------- src/tests/servers/app/install_libs | 33 ---------------------------- src/tests/servers/app/playground/run | 20 +++++------------ 3 files changed, 9 insertions(+), 56 deletions(-) delete mode 100755 src/tests/servers/app/install_libs diff --git a/src/tests/servers/app/NOTES b/src/tests/servers/app/NOTES index b674e41eff..0e0fbe152a 100644 --- a/src/tests/servers/app/NOTES +++ b/src/tests/servers/app/NOTES @@ -1,16 +1,10 @@ For the tests to run properly on BeOS, you need to prepare a few things. -1.) make sure your target is "r5" (if your target is "bone", you need to adjust the "run" scripts) +There is a pseudo target "install-test-apps" which needs to be built like this: -2.) build the Haiku registrar (from anywhere in the Haiku tree): -jam haiku_registrar +$ TARGET_PLATFORM=r5 jam install-test-apps -3.) build the Haiku app_server (from anywhere in the Haiku tree): -jam haiku_app_server - -4.) make links to some Haiku libs in your ~/config/lib folder. The tests link to libopenbeos.so, haiku_app_server links to libhaikuappserver.so, libhwinterface.so, libhwinterfaceimpl.so, libpng.so and libfreetype.so. You will find these libs in the distro folder for your target after you build the haiku_app_server. - -5.) build the test app you want to run +This will build "haiku_registrar", "haiku_app_server", the needed libs and some test apps and install all into "generated/tests/apps". Each test app folder contains a script "run", which launches the Haiku app_server and a second later the test app which connects to it. diff --git a/src/tests/servers/app/install_libs b/src/tests/servers/app/install_libs deleted file mode 100755 index ba4f81b965..0000000000 --- a/src/tests/servers/app/install_libs +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -CURRENT="$PWD" - -if test -d "../../../../generated/objects/r5/x86/release"; then - cd "../../../../generated/objects/r5/x86/release" -elif test -d "../../../../generated/objects/bone/x86/release"; then - cd "../../../../generated/objects/bone/x86/release" -elif test -d "../../../../generated/objects/dano/x86/release"; then - cd "../../../../generated/objects/dano/x86/release" -fi - -RELEASE="$PWD" -DEST="/boot/home/config/lib" - -cd "$DEST" - -ln -fs "$RELEASE/kits/libopenbeos.so" "libopenbeos.so" - -ln -fs "$RELEASE/libs/freetype2/libfreetype.so" "libfreetype.so" -ln -fs "$RELEASE/libs/png/libpng.so" "libpng.so" - -HAIKU_APP_SERVER="$RELEASE/tests/servers/app" - -if ! test -d "$HAIKU_APP_SERVER/lib"; then - mkdir "$HAIKU_APP_SERVER/lib" -fi - -cd "$HAIKU_APP_SERVER/lib" - -ln -fs "../libhaikuappserver.so" "libhaikuappserver.so" -ln -fs "../libhwinterface.so" "libhwinterface.so" -ln -fs "../libhwinterfaceimpl.so" "libhwinterfaceimpl.so" diff --git a/src/tests/servers/app/playground/run b/src/tests/servers/app/playground/run index ecd5d66565..815e52fc66 100755 --- a/src/tests/servers/app/playground/run +++ b/src/tests/servers/app/playground/run @@ -2,24 +2,16 @@ ../../../../../tests/servers/registrar/run_haiku_registrar || exit -if test -f ../../../../../generated/objects/bone/x86/release/tests/servers/app/haiku_app_server; then - ../../../../../generated/objects/bone/x86/release/tests/servers/app/haiku_app_server & -elif test -f ../../../../../generated/objects/r5/x86/release/tests/servers/app/haiku_app_server; then - ../../../../../generated/objects/r5/x86/release/tests/servers/app/haiku_app_server & -elif test -f ../../../../../generated/objects/dano/x86/release/tests/servers/app/haiku_app_server; then - ../../../../../generated/objects/dano/x86/release/tests/servers/app/haiku_app_server & +if test -f ../../../../../generated/tests/apps/haiku_app_server; then + ../../../../../generated/tests/apps/haiku_app_server & else - echo "You need to jam haiku_app_server first." + echo "You need to \"TARGET_PLATFORM=r5 jam install-test-apps\" first." fi sleep 1s -if test -f ../../../../../generated/objects/r5/x86/release/tests/servers/app/playground/Playground; then - ../../../../../generated/objects/r5/x86/release/tests/servers/app/playground/Playground -elif test -f ../../../../../generated/objects/bone/x86/release/tests/servers/app/playground/Playground; then - ../../../../../generated/objects/bone/x86/release/tests/servers/app/playground/Playground -elif test -f ../../../../../generated/objects/dano/x86/release/tests/servers/app/playground/Playground; then - ../../../../../generated/objects/dano/x86/release/tests/servers/app/playground/Playground +if test -f ../../../../../generated/tests/apps/Playground; then + ../../../../../generated/tests/apps//Playground else - echo "You need to jam Playground first." + echo "You need to \"TARGET_PLATFORM=r5 jam install-test-apps\" first." fi