Merge branch 'main' into mv-msg

Author: aaron-ang

.config/nextest.toml

@@ -5,9 +5,15 @@ final-status-level = "skip"
 failure-output = "immediate-final"
 fail-fast = false
 
+[profile.ci.junit]
+path = "junit.xml"
+
 [profile.coverage]
 retries = 0
 status-level = "all"
 final-status-level = "skip"
 failure-output = "immediate-final"
 fail-fast = false
+
+[profile.coverage.junit]
+path = "junit.xml"

.github/workflows/CICD.yml

@@ -46,7 +46,7 @@ jobs:
         # Ensure updated '*/Cargo.lock'
         # * '*/Cargo.lock' is required to be in a format that `cargo` of MinSRV can interpret (eg, v1-format for MinSRV < v1.38)
         for dir in "." "fuzz"; do
-          ( cd "$dir" && (cargo fetch --locked --quiet || cargo +${{ steps.vars.outputs.RUST_MIN_SRV }} update) )
+          ( cd "$dir" && (cargo fetch --locked --quiet --target $(rustc --print host-tuple) || cargo +${{ steps.vars.outputs.RUST_MIN_SRV }} update) )
         done
     - name: Info
       shell: bash
@@ -65,7 +65,7 @@ jobs:
         cargo tree -V
         ## dependencies
         echo "## dependency list"
-        cargo fetch --locked --quiet
+        cargo fetch --locked --quiet --target $(rustc --print host-tuple)
         ## * using the 'stable' toolchain is necessary to avoid "unexpected '--filter-platform'" errors
         RUSTUP_TOOLCHAIN=stable cargo tree --locked --no-dedupe -e=no-dev --prefix=none --features ${{ matrix.job.features }} | grep -vE "$PWD" | sort --unique
     - name: Commit any changes (to '${{ env.BRANCH_TARGET }}')

.github/workflows/FixPR.yml

@@ -31,7 +31,7 @@ env:
   TEST_STTY_FULL_SUMMARY_FILE: 'gnu-stty-full-result.json'
   TEST_SELINUX_FULL_SUMMARY_FILE: 'selinux-gnu-full-result.json'
   TEST_SELINUX_ROOT_FULL_SUMMARY_FILE: 'selinux-root-gnu-full-result.json'
-  TEST_SMACK_FULL_SUMMARY_FILE: 'smack-gnu-full-result.json'
+  TEST_QEMU_FULL_SUMMARY_FILE: 'qemu-gnu-full-result.json'
 
 jobs:
   native:
@@ -233,15 +233,6 @@ jobs:
         lima ls -laZ /etc/selinux
         lima sudo sestatus
 
-        # Ensure we're running in enforcing mode
-        lima sudo setenforce 1
-        lima getenforce
-
-        # Create test files with SELinux contexts for testing
-        lima sudo mkdir -p /var/test_selinux
-        lima sudo touch /var/test_selinux/test_file
-        lima sudo chcon -t etc_t /var/test_selinux/test_file
-        lima ls -Z /var/test_selinux/test_file  # Verify context
     - name: Install dependencies in VM
       run: |
         lima sudo dnf -y update
@@ -267,8 +258,16 @@ jobs:
         lima bash -c "cd ~/work/uutils/ && echo 'Found SELinux tests:'; wc -l selinux-tests.txt"
     - name: Run GNU SELinux tests
       run: |
+        # Ensure we're running in enforcing mode
         lima sudo setenforce 1
         lima getenforce
+
+        # Create test files with SELinux contexts for testing
+        lima sudo mkdir -p /var/test_selinux
+        lima sudo touch /var/test_selinux/test_file
+        lima sudo chcon -t etc_t /var/test_selinux/test_file
+        lima ls -Z /var/test_selinux/test_file  # Verify context
+
         lima cat /proc/filesystems
         lima bash -c "cd ~/work/uutils/ && bash util/run-gnu-test.sh \$(cat selinux-tests.txt)"
     - name: Extract testing info from individual logs into JSON
@@ -317,8 +316,8 @@ jobs:
           gnu/tests-selinux/*.log
           gnu/tests-selinux/*/*.log.gz
 
-  smack:
-    name: Run GNU tests (SMACK)
+  qemu:
+    name: Run GNU tests (SMACK/ROOTFS)
     runs-on: ubuntu-24.04
     steps:
     - name: Checkout code (uutils)
@@ -338,30 +337,30 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y qemu-system-x86 zstd cpio
-    - name: Run GNU SMACK tests
+    - name: Run GNU SMACK/ROOTFS tests
       run: |
         cd uutils
-        bash util/run-gnu-tests-smack-ci.sh "$GITHUB_WORKSPACE/gnu" "$GITHUB_WORKSPACE/gnu/tests-smack"
+        bash util/run-gnu-tests-smack-ci.sh "$GITHUB_WORKSPACE/gnu" "$GITHUB_WORKSPACE/gnu/tests-qemu"
     - name: Extract testing info into JSON
       run: |
-        python3 uutils/util/gnu-json-result.py gnu/tests-smack > ${{ env.TEST_SMACK_FULL_SUMMARY_FILE }}
-    - name: Upload SMACK json results
+        python3 uutils/util/gnu-json-result.py gnu/tests-qemu > ${{ env.TEST_QEMU_FULL_SUMMARY_FILE }}
+    - name: Upload SMACK/ROOTFS json results
       uses: actions/upload-artifact@v6
       with:
-        name: smack-gnu-full-result
-        path: ${{ env.TEST_SMACK_FULL_SUMMARY_FILE }}
-    - name: Compress SMACK test logs
-      run: gzip gnu/tests-smack/*/*.log 2>/dev/null || true
-    - name: Upload SMACK test logs
+        name: qemu-gnu-full-result
+        path: ${{ env.TEST_QEMU_FULL_SUMMARY_FILE }}
+    - name: Compress SMACK/ROOTFS test logs
+      run: gzip gnu/tests-qemu/*/*.log 2>/dev/null || true
+    - name: Upload SMACK/ROOTFS test logs
       uses: actions/upload-artifact@v6
       with:
-        name: smack-test-logs
+        name: qemu-test-logs
         path: |
-          gnu/tests-smack/*.log
-          gnu/tests-smack/*/*.log.gz
+          gnu/tests-qemu/*.log
+          gnu/tests-qemu/*/*.log.gz
 
   aggregate:
-    needs: [native, selinux, smack]
+    needs: [native, selinux, qemu]
     permissions:
       actions: read  # for dawidd6/action-download-artifact to query and download artifacts
       contents: read  # for actions/checkout to fetch code
@@ -426,10 +425,10 @@ jobs:
         name: selinux-root-gnu-full-result
         path: results
         merge-multiple: true
-    - name: Download smack json results
+    - name: Download SMACK/ROOTFS json results
       uses: actions/download-artifact@v7
       with:
-        name: smack-gnu-full-result
+        name: qemu-gnu-full-result
         path: results
         merge-multiple: true
     - name: Extract/summarize testing info

.github/workflows/GnuTests.yml

@@ -22,7 +22,7 @@ concurrency:
 env:
   TERMUX: v0.118.0
   KEY_POSTFIX: nextest+rustc-hash+adb+sshd+upgrade+XGB+inc18
-  COMMON_EMULATOR_OPTIONS: -no-window -noaudio -no-boot-anim -camera-back none -gpu off
+  COMMON_EMULATOR_OPTIONS: -no-metrics -no-window -noaudio -no-boot-anim -camera-back none -gpu off
   EMULATOR_DISK_SIZE: 12GB
   EMULATOR_HEAP_SIZE: 2048M
   EMULATOR_BOOT_TIMEOUT: 1200 # 20min
@@ -39,7 +39,7 @@ jobs:
         ram: [4096]
         api-level: [28]
         target: [google_apis_playstore]
-        arch: [x86, x86_64] # , arm64-v8a
+        arch: [x86_64] # ,x86 ,arm64-v8a
     runs-on: ${{ matrix.os }}
     env:
       EMULATOR_RAM_SIZE: ${{ matrix.ram }}
@@ -166,7 +166,7 @@ jobs:
         disk-size: ${{ env.EMULATOR_DISK_SIZE }}
         cores: ${{ env.EMULATOR_CORES }}
         force-avd-creation: false
-        emulator-options: ${{ env.COMMON_EMULATOR_OPTIONS }} -no-metrics -no-snapshot-save -snapshot ${{ env.AVD_CACHE_KEY }}
+        emulator-options: ${{ env.COMMON_EMULATOR_OPTIONS }} -no-snapshot-save -snapshot ${{ env.AVD_CACHE_KEY }}
         emulator-boot-timeout: ${{ env.EMULATOR_BOOT_TIMEOUT }}
         # This is not a usual script. Every line is executed in a separate shell with `sh -c`. If
         # one of the lines returns with error the whole script is failed (like running a script with

.github/workflows/android.yml

@@ -18,35 +18,38 @@ concurrency:
 
 jobs:
   benchmarks:
-    name: Run benchmarks (CodSpeed)
+    name: Run ${{ matrix.type }} benchmarks for ${{ matrix.package }} (CodSpeed)
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        benchmark-target:
-          - { package: uu_base64 }
-          - { package: uu_cksum }
-          - { package: uu_cp }
-          - { package: uu_cut }
-          - { package: uu_dd }
-          - { package: uu_du }
-          - { package: uu_expand }
-          - { package: uu_fold }
-          - { package: uu_join }
-          - { package: uu_ls }
-          - { package: uu_mv }
-          - { package: uu_nl }
-          - { package: uu_numfmt }
-          - { package: uu_rm }
-          - { package: uu_seq }
-          - { package: uu_shuf }
-          - { package: uu_sort }
-          - { package: uu_split }
-          - { package: uu_tsort }
-          - { package: uu_unexpand }
-          - { package: uu_uniq }
-          - { package: uu_wc }
-          - { package: uu_factor }
-          - { package: uu_date }
+        type: [performance] # , memory]  # memory profile disabled due to variance
+        package: [
+          uu_base64,
+          uu_cksum,
+          uu_cp,
+          uu_cut,
+          uu_dd,
+          uu_df,
+          uu_du,
+          uu_expand,
+          uu_fold,
+          uu_join,
+          uu_ls,
+          uu_mv,
+          uu_nl,
+          uu_numfmt,
+          uu_rm,
+          uu_seq,
+          uu_shuf,
+          uu_sort,
+          uu_split,
+          uu_tsort,
+          uu_unexpand,
+          uu_uniq,
+          uu_wc,
+          uu_factor,
+          uu_date
+        ]
     steps:
       - uses: actions/checkout@v6
         with:
@@ -59,23 +62,35 @@ jobs:
       - name: Run sccache-cache
         uses: mozilla-actions/sccache-action@v0.0.9
 
+      - name: Install locales
+        shell: bash
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y locales
+          sudo locale-gen fr_FR.UTF-8
+          sudo update-locale
+
       - name: Install cargo-codspeed
         shell: bash
         run: cargo install cargo-codspeed --locked
 
-      - name: Build benchmarks for ${{ matrix.benchmark-target.package }}
+      - name: Build benchmarks for ${{ matrix.package }} (${{ matrix.type }})
         shell: bash
         run: |
-          echo "Building benchmarks for ${{ matrix.benchmark-target.package }}"
-          cargo codspeed build -p ${{ matrix.benchmark-target.package }}
+          echo "Building ${{ matrix.type }} benchmarks for ${{ matrix.package }}"
+          if [ "${{ matrix.type }}" = "memory" ]; then
+            cargo codspeed build -m analysis -p ${{ matrix.package }}
+          else
+            cargo codspeed build -p ${{ matrix.package }}
+          fi
 
-      - name: Run benchmarks for ${{ matrix.benchmark-target.package }}
+      - name: Run ${{ matrix.type }} benchmarks for ${{ matrix.package }}
         uses: CodSpeedHQ/action@v4
         env:
           CODSPEED_LOG: debug
         with:
-          mode: simulation
+          mode: ${{ matrix.type == 'memory' && 'memory' || 'simulation' }}
           run: |
-            echo "Running benchmarks for ${{ matrix.benchmark-target.package }}"
-            cargo codspeed run -p ${{ matrix.benchmark-target.package }} > /dev/null
+            echo "Running ${{ matrix.type }} benchmarks for ${{ matrix.package }}"
+            cargo codspeed run -p ${{ matrix.package }} > /dev/null
           token: ${{ secrets.CODSPEED_TOKEN }}

.github/workflows/benchmarks.yml

@@ -133,6 +133,8 @@ jobs:
     - uses: actions/checkout@v6
       with:
         persist-credentials: false
+    - name: Avoid no space left on device (Ubuntu runner)
+      run: sudo rm -rf /usr/share/dotnet /usr/local/lib/android &
     - uses: Swatinem/rust-cache@v2
     - name: Run sccache-cache
       uses: mozilla-actions/sccache-action@v0.0.9
@@ -192,6 +194,7 @@ jobs:
           set +e
           cd "${WORKSPACE}"
           unset FAULT
+          export RUSTFLAGS="-C strip=symbols" # for disk space
           cargo build || FAULT=1
           export PATH=~/.cargo/bin:${PATH}
           export RUST_BACKTRACE=1

.github/workflows/freebsd.yml

@@ -94,7 +94,7 @@ jobs:
           - { name: fuzz_parse_glob, should_pass: true }
           - { name: fuzz_parse_size, should_pass: true }
           - { name: fuzz_parse_time, should_pass: true }
-          - { name: fuzz_seq_parse_number, should_pass: true }
+          - { name: fuzz_seq_parse_number, should_pass: false }
           - { name: fuzz_non_utf8_paths, should_pass: true }
 
     steps:

.github/workflows/fuzzing.yml

@@ -2,6 +2,10 @@ tests/tail/inotify-dir-recreate
 tests/tail/overlay-headers
 tests/timeout/timeout
 tests/rm/rm1
+tests/shuf/shuf-reservoir
+tests/sort/sort-stale-thread-mem
+tests/tty/tty-eof
 tests/misc/stdbuf
 tests/misc/usage_vs_getopt
 tests/misc/tee
+tests/tail/follow-name

.github/workflows/ignore-intermittent.txt

@@ -735,7 +735,7 @@ jobs:
       run: |
         ## Download additional locale files from coreutils-l10n repository
         echo "Downloading additional locale files from coreutils-l10n..."
-        git clone https://github.com/uutils/coreutils-l10n.git coreutils-l10n-repo
+        git clone --depth=1 https://github.com/uutils/coreutils-l10n.git coreutils-l10n-repo
 
         # Create installation directory
         CARGO_INSTALL_DIR="$PWD/cargo-install-dir"