SysTest: log loaded APEX modules

ChangeLog.md

@@ -48,6 +48,10 @@
      * https://github.com/Lanchon/haystack/pull/34
   * various minor improvements
 
+* SysTest
+  * check and log LD_CONFIG_FILE
+  * fix collecting `dalvikvm` information on some recent ROMs
+
 * Patcher, Uninstaller
   * drop old code regarding NanoMod (= NanoDroid older than version 16.0)
 

CommonInstaller

@@ -294,7 +294,7 @@ mount_apex () {
 	echo " INFO: #11 [APEX [ALL]] $(ls /system/apex/*.apex)"
 }
 
-# taken from Magisk, with modifications for NanoDroid
+# taken from Magisk, with minor modifications for NanoDroid
 mount_partitions () {
 	DEVICE_AB=FALSE
 	VENDOR_COMPAT=FALSE
@@ -357,7 +357,7 @@ mount_partitions () {
 
 	[ -z "${build_props}" ] && error "failed to mount /system (unsupported A/B device?)"
 
-	mount_apex
+	[ -d /system/apex ] && mount_apex
 }
 
 detect_mode () {

systest/SysTest

@@ -162,10 +162,9 @@ mount_partitions () {
 
 	[ -z "${build_props}" ] && error "failed to mount /system (unsupported A/B device?)"
 
-	mount_apex
+	[ -d /system/apex ] && mount_apex
 }
 
-
 error () {
 	ui_print " "
 	ui_print " !! ${@}"
@@ -379,10 +378,18 @@ store_results () {
 	add_log "LD_CONFIG_FILE=${LD_FILE}"
 	add_log "ROM_DEX_STATUS=${ROM_DEX_STATUS}"
 
-	if [ -n "${APEX_FILE}" ]; then
-		add_log "APEX_FILE=${APEX_FILE}"
-	elif [ -n "${APEX_DIR}" ]; then
-		add_log "APEX_DIR=${APEX_DIR}"
+	if [ -d /system/apex ]; then
+		add_log ""
+		add_log "Loaded APEX modules"
+		add_log "==================="
+		add_log ""
+
+		i=0
+
+		for apex in /system/apex/*; do
+			i=$((i + 1))
+			add_log "[${i}] $(basename ${apex} .apex)"
+		done
 	fi
 
 	add_log ""