testing

5 files changed, 8 insertions, 6 deletions

diff --git a/Makefile.in b/Makefile.in
index d33ff0aff..fc341aab5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,6 +47,7 @@ clean:
         done
         rm -f firejail.1 firejail.1.gz firemon.1 firemon.1.gz firecfg.1 firecfg.gz firejail-profile.5 firejail-profile.5.gz firejail-login.5 firejail-login.5.gz firejail-config.5 firejail-config.5.gz firejail*.rpm
         rm -f test/utils/index.html*
+        rm -f test/utils/lstesting
 
 distclean: clean
         for dir in $(APPS); do \
diff --git a/src/firejail/ls.c b/src/firejail/ls.c
index 444b5b69e..09577fb0c 100644
--- a/src/firejail/ls.c
+++ b/src/firejail/ls.c
@@ -379,6 +379,7 @@ void sandboxfs(int op, pid_t pid, const char *path) {
                         errExit("chown");
                 if (chmod(dest_fname, 0644) == -1)
                         errExit("chmod");
+                printf("Transfer complete\n");
                 EUID_USER();
         }
         
diff --git a/test/test.sh b/test/test.sh
index e92a0f902..df46101a8 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -13,9 +13,6 @@ echo "TESTING: network profile (net_profile.exp)"
 echo "TESTING: bandwidth (bandwidth.exp)"
 ./bandwidth.exp
 
-echo "TESTING: file transfer (ls.exp)"
-./ls.exp
-
 echo "TESTING: protocol.print (protocol-print.exp)"
 ./protocol-print.exp
 
diff --git a/test/ls.exp b/test/utils/ls.exp
index 5fe6d79c6..1936c0aff 100755
--- a/test/ls.exp
+++ b/test/utils/ls.exp
@@ -25,13 +25,13 @@ expect {
 sleep 1
 send -- "firejail --get=test ~/lstesting\r"
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
-        "lstesting"
+        timeout {puts "TESTING ERROR 2\n";exit}
+        "Transfer complete"
 }
 sleep 1
 send -- "cat lstesting\r"
 expect {
-        timeout {puts "TESTING ERROR 1\n";exit}
+        timeout {puts "TESTING ERROR 3\n";exit}
         "my_testing"
 }
 sleep 1
diff --git a/test/utils/utils.sh b/test/utils/utils.sh
index 23cbc6b35..474c026d1 100755
--- a/test/utils/utils.sh
+++ b/test/utils/utils.sh
@@ -75,3 +75,6 @@ echo "TESTING: firemon --seccomp (test/utils/seccomp.exp)"
 echo "TESTING: firemon --caps (test/ustil/caps.exp)"
 ./caps.exp
 
+echo "TESTING: file transfer (test/ustil/ls.exp)"
+./ls.exp
+