run/file_vault_client: consider varying file modes

Ref #5148

repos/gems/run/file_vault_client.run

@@ -435,38 +435,49 @@ run_genode_until "<ui_report version=\"step_3_lock\" state=\"locked\"/>.*\n" 60
 
 grep_output {\[init -> dynamic_init -> log_terminal\].*}
 
+proc file_mode { } {
+	if {[have_spec arm_v8a]} { return "rw-------" }
+	if {[have_spec arm_v7a]} { return "rw-------" }
+	return "rwx------"
+}
+
 if {[container_initialized]} {
-	compare_output_to {
+
+	append expected_output {
 [init -> dynamic_init -> log_terminal] total 1
 [init -> dynamic_init -> log_terminal] drwx------ 1 root 0  0 Jan  1  1970 dir_1
-[init -> dynamic_init -> log_terminal] -rwx------ 1 root 0 18 Jan  1  1970 file_1
+[init -> dynamic_init -> log_terminal] -} [file_mode] { 1 root 0 18 Jan  1  1970 file_1
 [init -> dynamic_init -> log_terminal] drwx------ 1 root 0  0 Jan  1  1970 lost+found
 [init -> dynamic_init -> log_terminal] total 1
-[init -> dynamic_init -> log_terminal] -rwx------ 1 root 0 66 Jan  1  1970 file_2
+[init -> dynamic_init -> log_terminal] -} [file_mode] { 1 root 0 66 Jan  1  1970 file_2
 [init -> dynamic_init -> log_terminal] Ein zweiter Test.
 [init -> dynamic_init -> log_terminal] Eine weitere Datei.
 [init -> dynamic_init -> log_terminal] Mit mehr Inhalt.
-[init -> dynamic_init -> log_terminal] Und Sonderzeichen: /.($)=%!
+[init -> dynamic_init -> log_terminal] Und Sonderzeichen: /.:($)=%!
 	}
+	compare_output_to $expected_output
+
 } else {
-	compare_output_to {
+
+	append expected_output {
 [init -> dynamic_init -> log_terminal] Hallo Welt!
 [init -> dynamic_init -> log_terminal] Ein zweiter Test.
 [init -> dynamic_init -> log_terminal] total 1
-[init -> dynamic_init -> log_terminal] -rwx------ 1 root 0 18 Jan  1  1970 file_1
+[init -> dynamic_init -> log_terminal] -} [file_mode] { 1 root 0 18 Jan  1  1970 file_1
 [init -> dynamic_init -> log_terminal] drwx------ 1 root 0  0 Jan  1  1970 lost+found
 [init -> dynamic_init -> log_terminal] Eine weitere Datei.
 [init -> dynamic_init -> log_terminal] Mit mehr Inhalt.
 [init -> dynamic_init -> log_terminal] Eine weitere Datei.
 [init -> dynamic_init -> log_terminal] Mit mehr Inhalt.
-[init -> dynamic_init -> log_terminal] Und Sonderzeichen: /.($)=%!
+[init -> dynamic_init -> log_terminal] Und Sonderzeichen: /.:($)=%!
 [init -> dynamic_init -> log_terminal] total 1
 [init -> dynamic_init -> log_terminal] drwx------ 1 root 0  0 Jan  1  1970 dir_1
-[init -> dynamic_init -> log_terminal] -rwx------ 1 root 0 18 Jan  1  1970 file_1
+[init -> dynamic_init -> log_terminal] -} [file_mode] { 1 root 0 18 Jan  1  1970 file_1
 [init -> dynamic_init -> log_terminal] drwx------ 1 root 0  0 Jan  1  1970 lost+found
 [init -> dynamic_init -> log_terminal] total 1
-[init -> dynamic_init -> log_terminal] -rwx------ 1 root 0 66 Jan  1  1970 file_2
+[init -> dynamic_init -> log_terminal] -} [file_mode] { 1 root 0 66 Jan  1  1970 file_2
 	}
+	compare_output_to $expected_output
 }
 
 if {[get_cmd_switch --autopilot] && [have_board linux]} { exec rm -rf [lx_fs_dir] }