diff options
-rw-r--r-- | Makefile.in | 1 | ||||
-rw-r--r-- | src/firejail/ls.c | 1 | ||||
-rwxr-xr-x | test/test.sh | 3 | ||||
-rwxr-xr-x | test/utils/ls.exp (renamed from test/ls.exp) | 6 | ||||
-rwxr-xr-x | test/utils/utils.sh | 3 |
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: | |||
47 | done | 47 | done |
48 | 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 | 48 | 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 |
49 | rm -f test/utils/index.html* | 49 | rm -f test/utils/index.html* |
50 | rm -f test/utils/lstesting | ||
50 | 51 | ||
51 | distclean: clean | 52 | distclean: clean |
52 | for dir in $(APPS); do \ | 53 | 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) { | |||
379 | errExit("chown"); | 379 | errExit("chown"); |
380 | if (chmod(dest_fname, 0644) == -1) | 380 | if (chmod(dest_fname, 0644) == -1) |
381 | errExit("chmod"); | 381 | errExit("chmod"); |
382 | printf("Transfer complete\n"); | ||
382 | EUID_USER(); | 383 | EUID_USER(); |
383 | } | 384 | } |
384 | 385 | ||
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)" | |||
13 | echo "TESTING: bandwidth (bandwidth.exp)" | 13 | echo "TESTING: bandwidth (bandwidth.exp)" |
14 | ./bandwidth.exp | 14 | ./bandwidth.exp |
15 | 15 | ||
16 | echo "TESTING: file transfer (ls.exp)" | ||
17 | ./ls.exp | ||
18 | |||
19 | echo "TESTING: protocol.print (protocol-print.exp)" | 16 | echo "TESTING: protocol.print (protocol-print.exp)" |
20 | ./protocol-print.exp | 17 | ./protocol-print.exp |
21 | 18 | ||
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 { | |||
25 | sleep 1 | 25 | sleep 1 |
26 | send -- "firejail --get=test ~/lstesting\r" | 26 | send -- "firejail --get=test ~/lstesting\r" |
27 | expect { | 27 | expect { |
28 | timeout {puts "TESTING ERROR 1\n";exit} | 28 | timeout {puts "TESTING ERROR 2\n";exit} |
29 | "lstesting" | 29 | "Transfer complete" |
30 | } | 30 | } |
31 | sleep 1 | 31 | sleep 1 |
32 | send -- "cat lstesting\r" | 32 | send -- "cat lstesting\r" |
33 | expect { | 33 | expect { |
34 | timeout {puts "TESTING ERROR 1\n";exit} | 34 | timeout {puts "TESTING ERROR 3\n";exit} |
35 | "my_testing" | 35 | "my_testing" |
36 | } | 36 | } |
37 | sleep 1 | 37 | 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)" | |||
75 | echo "TESTING: firemon --caps (test/ustil/caps.exp)" | 75 | echo "TESTING: firemon --caps (test/ustil/caps.exp)" |
76 | ./caps.exp | 76 | ./caps.exp |
77 | 77 | ||
78 | echo "TESTING: file transfer (test/ustil/ls.exp)" | ||
79 | ./ls.exp | ||
80 | |||