WIP: debug

Author: Kobzol

library/std_detect/src/detect/os/linux/auxvec.rs

@@ -118,7 +118,7 @@ pub(crate) fn auxv() -> Result<AuxVec, ()> {
     {
         // If calling getauxval fails, try to read the auxiliary vector from
         // its file:
-        auxv_from_file("/proc/self/auxv")
+        auxv_from_file("/proc/self/auxv").map_err(|_| ())
     }
     #[cfg(not(feature = "std_detect_file_io"))]
     {
@@ -153,20 +153,27 @@ fn getauxval(key: usize) -> Result<usize, ()> {
     Ok(unsafe { ffi_getauxval(key as libc::c_ulong) as usize })
 }
 
+#[cfg(feature = "std_detect_file_io")]
+use alloc::string::String;
+
 /// Tries to read the auxiliary vector from the `file`. If this fails, this
 /// function returns `Err`.
 #[cfg(feature = "std_detect_file_io")]
-pub(super) fn auxv_from_file(file: &str) -> Result<AuxVec, ()> {
+pub(super) fn auxv_from_file(file: &str) -> Result<AuxVec, String> {
     let file = super::read_file(file)?;
+    auxv_from_file_bytes(&file)
+}
 
+#[cfg(feature = "std_detect_file_io")]
+pub(super) fn auxv_from_file_bytes(bytes: &[u8]) -> Result<AuxVec, String> {
     // See <https://github.com/torvalds/linux/blob/v5.15/include/uapi/linux/auxvec.h>.
     //
     // The auxiliary vector contains at most 34 (key,value) fields: from
     // `AT_MINSIGSTKSZ` to `AT_NULL`, but its number may increase.
-    let len = file.len();
+    let len = bytes.len();
     let mut buf = alloc::vec![0_usize; 1 + len / core::mem::size_of::<usize>()];
     unsafe {
-        core::ptr::copy_nonoverlapping(file.as_ptr(), buf.as_mut_ptr() as *mut u8, len);
+        core::ptr::copy_nonoverlapping(bytes.as_ptr(), buf.as_mut_ptr() as *mut u8, len);
     }
 
     auxv_from_buf(&buf)
@@ -175,7 +182,7 @@ pub(super) fn auxv_from_file(file: &str) -> Result<AuxVec, ()> {
 /// Tries to interpret the `buffer` as an auxiliary vector. If that fails, this
 /// function returns `Err`.
 #[cfg(feature = "std_detect_file_io")]
-fn auxv_from_buf(buf: &[usize]) -> Result<AuxVec, ()> {
+fn auxv_from_buf(buf: &[usize]) -> Result<AuxVec, String> {
     // Targets with only AT_HWCAP:
     #[cfg(any(
         target_arch = "riscv32",
@@ -220,7 +227,7 @@ fn auxv_from_buf(buf: &[usize]) -> Result<AuxVec, ()> {
     }
     // Suppress unused variable
     let _ = buf;
-    Err(())
+    Err(String::from("hwcap not found"))
 }
 
 #[cfg(test)]

library/std_detect/src/detect/os/linux/auxvec/tests.rs

@@ -46,38 +46,34 @@ cfg_if::cfg_if! {
     if #[cfg(target_arch = "arm")] {
         #[test]
         fn linux_rpi3() {
-            let file = concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/linux-rpi3.auxv");
-            println!("file: {file}");
-            let v = auxv_from_file(file).unwrap();
+            let auxv = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/linux-rpi3.auxv"));
+            let v = auxv_from_file_bytes(auxv).unwrap();
             assert_eq!(v.hwcap, 4174038);
             assert_eq!(v.hwcap2, 16);
         }
 
         #[test]
         fn linux_macos_vb() {
-            let file = concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/macos-virtualbox-linux-x86-4850HQ.auxv");
-            println!("file: {file}");
+            let auxv = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/macos-virtualbox-linux-x86-4850HQ.auxv"));
             // The file contains HWCAP but not HWCAP2. In that case, we treat HWCAP2 as zero.
-            let v = auxv_from_file(file).unwrap();
+            let v = auxv_from_file_bytes(auxv).unwrap();
             assert_eq!(v.hwcap, 126614527);
             assert_eq!(v.hwcap2, 0);
         }
     } else if #[cfg(target_arch = "aarch64")] {
         #[cfg(target_endian = "little")]
         #[test]
         fn linux_artificial_aarch64() {
-            let file = concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/linux-artificial-aarch64.auxv");
-            println!("file: {file}");
-            let v = auxv_from_file(file).unwrap();
+            let auxv = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/linux-artificial-aarch64.auxv"));
+            let v = auxv_from_file_bytes(auxv).unwrap();
             assert_eq!(v.hwcap, 0x0123456789abcdef);
             assert_eq!(v.hwcap2, 0x02468ace13579bdf);
         }
         #[cfg(target_endian = "little")]
         #[test]
         fn linux_no_hwcap2_aarch64() {
-            let file = concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/linux-no-hwcap2-aarch64.auxv");
-            println!("file: {file}");
-            let v = auxv_from_file(file).unwrap();
+            let auxv = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/detect/test_data/linux-no-hwcap2-aarch64.auxv"));
+            let v = auxv_from_file_bytes(auxv).unwrap();
             // An absent HWCAP2 is treated as zero, and does not prevent acceptance of HWCAP.
             assert_ne!(v.hwcap, 0);
             assert_eq!(v.hwcap2, 0);

library/std_detect/src/detect/os/linux/mod.rs

@@ -1,19 +1,23 @@
 //! Run-time feature detection on Linux
 //!
 #[cfg(feature = "std_detect_file_io")]
+use alloc::format;
+#[cfg(feature = "std_detect_file_io")]
+use alloc::string::String;
+#[cfg(feature = "std_detect_file_io")]
 use alloc::vec::Vec;
 
 mod auxvec;
 
 #[cfg(feature = "std_detect_file_io")]
-fn read_file(path: &str) -> Result<Vec<u8>, ()> {
-    let mut path = Vec::from(path.as_bytes());
+fn read_file(orig_path: &str) -> Result<Vec<u8>, String> {
+    let mut path = Vec::from(orig_path.as_bytes());
     path.push(0);
 
     unsafe {
         let file = libc::open(path.as_ptr() as *const libc::c_char, libc::O_RDONLY);
         if file == -1 {
-            return Err(());
+            return Err(format!("Cannot open file at {orig_path}: {}", *libc::__errno_location()));
         }
 
         let mut data = Vec::new();
@@ -23,7 +27,7 @@ fn read_file(path: &str) -> Result<Vec<u8>, ()> {
             match libc::read(file, spare.as_mut_ptr() as *mut _, spare.len()) {
                 -1 => {
                     libc::close(file);
-                    return Err(());
+                    return Err(format!("Error while reading from file at {orig_path}"));
                 }
                 0 => break,
                 n => data.set_len(data.len() + n as usize),

src/ci/docker/host-x86_64/armhf-gnu/Dockerfile

@@ -83,6 +83,22 @@ RUN sh /scripts/sccache.sh
 COPY static/gitconfig /etc/gitconfig
 
 ENV RUST_CONFIGURE_ARGS --qemu-armhf-rootfs=/tmp/rootfs
-ENV SCRIPT python3 ../x.py --stage 2 test --host='' --target arm-unknown-linux-gnueabihf
+ENV SCRIPT \
+    ls -lha /checkout && \
+    ls -lha /checkout/library && \
+    ls -lha /checkout/library/std_detect && \
+    ls -lha /checkout/library/std_detect/src && \
+    ls -lha /checkout/library/std_detect/src/detect && \
+    ls -lha /checkout/library/std_detect/src/detect/test_data && \
+    ls -lha /checkout/library/std_detect/src/detect/test_data/linux-rpi3.auxv && \
+    (python3 ../x.py --stage 2 test --host='' --target arm-unknown-linux-gnueabihf || exit 0) && \
+    ls -lha /checkout && \
+    ls -lha /checkout/library && \
+    ls -lha /checkout/library/std_detect && \
+    ls -lha /checkout/library/std_detect/src && \
+    ls -lha /checkout/library/std_detect/src/detect && \
+    ls -lha /checkout/library/std_detect/src/detect/test_data && \
+    ls -lha /checkout/library/std_detect/src/detect/test_data/linux-rpi3.auxv && \
+    exit 1
 
 ENV NO_CHANGE_USER=1