testing

5 files changed, 44 insertions, 5 deletions

diff --git a/src/firejail/cmdline.c b/src/firejail/cmdline.c
index 60301ed58..e62ed8d33 100644
--- a/src/firejail/cmdline.c
+++ b/src/firejail/cmdline.c
@@ -153,6 +153,9 @@ void build_cmdline(char **command_line, char **window_title, int argc, char **ar
                         errExit("malloc");
         
         quote_cmdline(*command_line, *window_title, len, argc, argv, index);
+        
+        if (arg_debug)
+                printf("Building quoted command line: %s\n", *command_line);
 
         assert(*command_line);
         assert(*window_title);
@@ -163,7 +166,9 @@ void build_appimage_cmdline(char **command_line, char **window_title, int argc,
         // the program should exit with an error before entering this function
         assert(index != -1);
 
-//      unsigned argcount = argc - index;
+        if (arg_debug)
+                printf("Building AppImage command line: %s\n", *command_line);
+
 
         int len1 = cmdline_length(argc, argv, index);  // length of argv w/o changes
         int len2 = cmdline_length(1, &argv[index], 0); // apptest.AppImage
@@ -198,6 +203,9 @@ void build_appimage_cmdline(char **command_line, char **window_title, int argc,
         if (asprintf(command_line, "'%s' %s", tmp1, command_line_tmp + len2) == -1)
                 errExit("asprintf");
 
+        if (arg_debug)
+                printf("AppImage quoted command line: %s\n", *command_line);
+
         // free strdup
         free(tmp1);
 }
diff --git a/src/firejail/sandbox.c b/src/firejail/sandbox.c
index d1557e8b2..f9e59f1ed 100644
--- a/src/firejail/sandbox.c
+++ b/src/firejail/sandbox.c
@@ -865,6 +865,14 @@ int sandbox(void* sandbox_arg) {
                         }
                 }
         }
+        if (arg_debug) {
+                char *cpath = get_current_dir_name();
+                if (cpath) {
+                        printf("Current directory: %s\n", cpath);
+                        free(cpath);
+                }
+        }
+        
         
         // set nice
         if (arg_nice) {
diff --git a/test/appimage/appimage-args.exp b/test/appimage/appimage-args.exp
index f304f5b94..b93ad509d 100755
--- a/test/appimage/appimage-args.exp
+++ b/test/appimage/appimage-args.exp
@@ -7,6 +7,7 @@ set timeout 10
 spawn $env(SHELL)
 match_max 100000
 
+set appimage_id $spawn_id
 send -- "firejail --name=appimage-test --debug --appimage Leafpad-0.8.17-x86_64.AppImage testfile\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
@@ -91,7 +92,14 @@ after 100
 
 spawn $env(SHELL)
 send -- "firejail --shutdown=appimage-test\r"
-sleep 3
+
+set spawn_id $appimage_id
+expect {
+        timeout {puts "TESTING ERROR 15\n";exit}
+        "AppImage unmounted"
+}
+
+after 100
 
 puts "\nall done\n"
 
diff --git a/test/appimage/appimage-v1.exp b/test/appimage/appimage-v1.exp
index d9b64af1d..3364ff677 100755
--- a/test/appimage/appimage-v1.exp
+++ b/test/appimage/appimage-v1.exp
@@ -6,6 +6,7 @@
 set timeout 10
 spawn $env(SHELL)
 match_max 100000
+set appimage_id $spawn_id
 
 send -- "firejail --name=appimage-test --debug --appimage Leafpad-0.8.17-x86_64.AppImage\r"
 expect {
@@ -79,7 +80,14 @@ after 100
 
 spawn $env(SHELL)
 send -- "firejail --shutdown=appimage-test\r"
-sleep 3
+
+set spawn_id $appimage_id
+expect {
+        timeout {puts "TESTING ERROR 7\n";exit}
+        "AppImage unmounted"
+}
+
+after 100
 
 puts "\nall done\n"
 
diff --git a/test/appimage/appimage-v2.exp b/test/appimage/appimage-v2.exp
index 10443a1c7..ad741c559 100755
--- a/test/appimage/appimage-v2.exp
+++ b/test/appimage/appimage-v2.exp
@@ -6,8 +6,9 @@
 set timeout 10
 spawn $env(SHELL)
 match_max 100000
+set appimage_id $spawn_id
 
-send -- "firejail --appimage Leafpad-0.8.18.1.glibc2.4-x86_64.AppImage\r"
+send -- "firejail --name=appimage-test --appimage Leafpad-0.8.18.1.glibc2.4-x86_64.AppImage\r"
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
         "Child process initialized"
@@ -79,7 +80,13 @@ after 100
 
 spawn $env(SHELL)
 send -- "firejail --shutdown=appimage-test\r"
-sleep 3
+set spawn_id $appimage_id
+expect {
+        timeout {puts "TESTING ERROR 7\n";exit}
+        "AppImage unmounted"
+}
+
+after 100
 
 puts "\nall done\n"