fix debug printing of filesystems types (use mount)

cre4ture · Mar 13, 2024 · 7099408 · 7099408
1 parent 42ad9f9
commit 7099408
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/util/android-commands.sh b/util/android-commands.sh
@@ -509,7 +509,7 @@ snapshot() {
 
     apt_upgrade_all_packages
 
-    install_packages_via_ssh_using_apt "rust binutils openssl tar"
+    install_packages_via_ssh_using_apt "rust binutils openssl tar mount-utils"
 
     echo "Read /proc/cpuinfo"
     run_command_via_ssh "cat /proc/cpuinfo"
@@ -573,8 +573,7 @@ build() {
 
     reinit_ssh_connection
 
-    echo "Read /proc/cpuinfo"
-    run_command_via_ssh "cat /proc/cpuinfo"
+    run_script_file_via_ssh "$this_repo/util/android-scripts/collect-info.sh"
 
     command="export CARGO_TERM_COLOR=always;
              export CARGO_INCREMENTAL=0; \
@@ -589,8 +588,7 @@ tests() {
 
     reinit_ssh_connection
 
-    echo "Read /proc/cpuinfo"
-    run_command_via_ssh "cat /proc/cpuinfo"
+    run_script_file_via_ssh "$this_repo/util/android-scripts/collect-info.sh"
 
     run_script_file_via_ssh "$this_repo/util/android-scripts/run-tests.sh" || return
 

diff --git a/util/android-scripts/collect-info.sh b/util/android-scripts/collect-info.sh
@@ -2,12 +2,12 @@
 
 # spell-checker:ignore nextest watchplus PIPESTATUS
 
-echo "system ressources - file systems:"
-df -Th
 echo "system ressources - RAM:"
 free -hm
 echo "system ressources - CPU:"
 lscpu
+echo "system ressources - file systems:"
+mount
 
 echo "$HOME"
 PATH=$HOME/.cargo/bin:$PATH

diff --git a/util/android-scripts/run-tests.sh b/util/android-scripts/run-tests.sh
@@ -45,7 +45,7 @@ run_tests_in_subprocess() (
     }
 
     # observe (log) every 2 seconds the system resource usage to judge if we are at a limit
-    watchplus 2 df -Th &
+    watchplus 2 df -h &
     watchplus 2 free -hm &
 
     nextest_params=(--profile ci --hide-progress-bar --features feat_os_unix_android)