Improve support for OBJDIR
This commit is contained in:
parent
98f58e8303
commit
c2937fe495
|
@ -45,6 +45,9 @@ _debug()
|
||||||
#fail
|
#fail
|
||||||
_fail()
|
_fail()
|
||||||
{
|
{
|
||||||
|
test="$1"
|
||||||
|
name="$2"
|
||||||
|
|
||||||
_run "$@"
|
_run "$@"
|
||||||
res=$?
|
res=$?
|
||||||
if [ $res -ne 0 ]; then
|
if [ $res -ne 0 ]; then
|
||||||
|
@ -66,8 +69,14 @@ _run()
|
||||||
shift
|
shift
|
||||||
echo -n "$test:" 1>&2
|
echo -n "$test:" 1>&2
|
||||||
(echo
|
(echo
|
||||||
echo "Testing: $test $name"
|
echo "Testing: $test $name ($OBJDIR)"
|
||||||
LD_LIBRARY_PATH="$OBJDIR../src" $DEBUG "./$test" "$@" 2>&1) >> "$target"
|
[ -n "$OBJDIR" ] || OBJDIR="./"
|
||||||
|
if [ -x "$OBJDIR$test" ]; then
|
||||||
|
test="$OBJDIR$test"
|
||||||
|
elif [ -x "./$test" ]; then
|
||||||
|
test="./$test"
|
||||||
|
fi
|
||||||
|
LD_LIBRARY_PATH="$OBJDIR../src" $DEBUG "$test" "$@" 2>&1) >> "$target"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user