Changeset 3186:03f115e06e7b in roaraudio for tests

Timestamp:

01/22/10 21:42:48 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make test work with soname set

Location:

tests

Files:

• Makefile (modified) (1 diff)
• common.sh (modified) (1 diff)
• test-roard.sh (modified) (1 diff)
• test-runnable.sh (modified) (1 diff)

tests/Makefile

@@ -11 +11 @@
 
 #test: sandbox-install test-all sandbox-clean
-test: test-all
+test: sandbox-clean sandbox-install test-all sandbox-clean
 
 test-all: test-runnable test-roard
 
 test-runnable:
-        ./test-runnable.sh "$(CLIENTS)"
+        PREFIX_BIN=$(PREFIX_BIN) PREFIX_LIB=$(PREFIX_LIB) ./test-runnable.sh "$(CLIENTS)"
 test-roard:
-        ./test-roard.sh
+        PREFIX_BIN=$(PREFIX_BIN) PREFIX_LIB=$(PREFIX_LIB) ./test-roard.sh
 sandbox-install:
         mkdir sandbox

tests/common.sh

@@ -2 +2 @@
 
 PWD=`pwd`
-export LD_LIBRARY_PATH=$PWD/../lib/
+PF="$PWD/sandbox"
+export LD_LIBRARY_PATH="$PF/$PREFIX_LIB"
+export BIN_PATH="$PF/$PREFIX_BIN"
 
 OK=0

tests/test-roard.sh

@@ -10 +10 @@
 
 printf "$FORMAT" 'Testing for general runnability'
-if $LD_LIBRARY_PATH$c --no-listen --terminate --client-fh 0 < /dev/null > /dev/null 2> /dev/null
+if $BIN_PATH$c --no-listen --terminate --client-fh 0 < /dev/null > /dev/null 2> /dev/null
 then
  _ok

tests/test-runnable.sh

@@ -12 +12 @@
  printf "%-16s : " "$c"
 
- $LD_LIBRARY_PATH$c --server '(INVALID)' < /dev/null > /dev/null 2> /dev/null
+ $BIN_PATH$c --server '(INVALID)' < /dev/null > /dev/null 2> /dev/null
  R=$?