Fix test app build and adjust the app path to the jam output directory.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41817 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -288,7 +288,7 @@ find_test_app(const char *testApp, BString *path)
|
|||||||
if (error == B_OK) {
|
if (error == B_OK) {
|
||||||
*path = BTestShell::GlobalTestDir();
|
*path = BTestShell::GlobalTestDir();
|
||||||
path->CharacterEscape(" \t\n!\"'`$&()?*+{}[]<>|", '\\');
|
path->CharacterEscape(" \t\n!\"'`$&()?*+{}[]<>|", '\\');
|
||||||
*path += "/../kits/app/";
|
*path += "/";
|
||||||
*path += testApp;
|
*path += testApp;
|
||||||
#ifdef TEST_R5
|
#ifdef TEST_R5
|
||||||
*path += "_r5";
|
*path += "_r5";
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
// CommonTestApp.cpp
|
// CommonTestApp.cpp
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#include <cstring>
|
||||||
|
|
||||||
#include <OS.h>
|
#include <OS.h>
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ PipedAppRunner::Run(const char *command, const char *args, bool findCommand)
|
|||||||
if (findCommand) {
|
if (findCommand) {
|
||||||
appPath = BTestShell::GlobalTestDir();
|
appPath = BTestShell::GlobalTestDir();
|
||||||
appPath.CharacterEscape(" \t\n!\"'`$&()?*+{}[]<>|", '\\');
|
appPath.CharacterEscape(" \t\n!\"'`$&()?*+{}[]<>|", '\\');
|
||||||
appPath += "/../kits/app/";
|
appPath += "/";
|
||||||
appPath += command;
|
appPath += command;
|
||||||
#ifdef TEST_R5
|
#ifdef TEST_R5
|
||||||
appPath += "_r5";
|
appPath += "_r5";
|
||||||
|
|||||||
Reference in New Issue
Block a user