test: make tests independent of libdir

5 files changed, 14 insertions, 7 deletions

diff --git a/test/fcopy/cmdline.exp b/test/fcopy/cmdline.exp
index 10dd8da58..798c9e718 100755
--- a/test/fcopy/cmdline.exp
+++ b/test/fcopy/cmdline.exp
@@ -7,7 +7,7 @@ set timeout 10
 spawn $env(SHELL)
 match_max 100000
 
-send -- "/usr/lib/firejail/fcopy\r"
+send -- "fcopy\r"
 expect {
         timeout {puts "TESTING ERROR 0\n";exit}
         "arguments missing"
@@ -18,7 +18,7 @@ expect {
 }
 after 100
 
-send -- "/usr/lib/firejail/fcopy foo\r"
+send -- "fcopy foo\r"
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
         "arguments missing"
@@ -29,14 +29,14 @@ expect {
 }
 after 100
 
-send -- "/usr/lib/firejail/fcopy f%oo1 foo2\r"
+send -- "fcopy f%oo1 foo2\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
         "invalid source file name"
 }
 after 100
 
-send -- "/usr/lib/firejail/fcopy foo1 f,oo2\r"
+send -- "fcopy foo1 f,oo2\r"
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
         "invalid dest file name"
diff --git a/test/fcopy/dircopy.exp b/test/fcopy/dircopy.exp
index 573f454c8..e8462ae82 100755
--- a/test/fcopy/dircopy.exp
+++ b/test/fcopy/dircopy.exp
@@ -13,7 +13,7 @@ match_max 100000
 send -- "rm -fr dest/*\r"
 after 100
 
-send -- "/usr/lib/firejail/fcopy src dest\r"
+send -- "fcopy src dest\r"
 after 100
 
 send -- "find dest\r"
diff --git a/test/fcopy/fcopy.sh b/test/fcopy/fcopy.sh
index 0ae50399a..d122eff5d 100755
--- a/test/fcopy/fcopy.sh
+++ b/test/fcopy/fcopy.sh
@@ -6,6 +6,13 @@
 export MALLOC_CHECK_=3
 export MALLOC_PERTURB_=$(($RANDOM % 255 + 1))
 
+if [ -f /etc/debian_version ]; then
+        libdir=$(dirname "$(dpkg -L firejail | grep fcopy)")
+        export PATH="$PATH:$libdir"
+else
+        export PATH="$PATH:/usr/lib/firejail"
+fi
+
 mkdir dest
 
 echo "TESTING: fcopy cmdline (test/fcopy/cmdline.exp)"
diff --git a/test/fcopy/filecopy.exp b/test/fcopy/filecopy.exp
index e0d959c32..824a22bba 100755
--- a/test/fcopy/filecopy.exp
+++ b/test/fcopy/filecopy.exp
@@ -13,7 +13,7 @@ match_max 100000
 send -- "rm -fr dest/*\r"
 after 100
 
-send -- "/usr/lib/firejail/fcopy dircopy.exp dest\r"
+send -- "fcopy dircopy.exp dest\r"
 after 100
 
 send -- "find dest\r"
diff --git a/test/fcopy/linkcopy.exp b/test/fcopy/linkcopy.exp
index beceb3675..46ee327cb 100755
--- a/test/fcopy/linkcopy.exp
+++ b/test/fcopy/linkcopy.exp
@@ -13,7 +13,7 @@ match_max 100000
 send -- "rm -fr dest/*\r"
 after 100
 
-send -- "/usr/lib/firejail/fcopy src/dircopy.exp dest\r"
+send -- "fcopy src/dircopy.exp dest\r"
 after 100
 
 send -- "find dest\r"