Fix merge conflict in tests/by-util/test_cp.rs

.cargo/config

@@ -1,2 +1,11 @@
 [target.x86_64-unknown-redox]
 linker = "x86_64-unknown-redox-gcc"
+
+[target.'cfg(feature = "cargo-clippy")']
+rustflags = [
+ "-Wclippy::use_self",
+ "-Wclippy::needless_pass_by_value",
+ "-Wclippy::semicolon_if_nothing_returned",
+ "-Wclippy::single_char_pattern",
+ "-Wclippy::explicit_iter_loop",
+]

.github/workflows/CICD.yml

@@ -1,7 +1,7 @@
 name: CICD
 
 # spell-checker:ignore (acronyms) CICD MSVC musl
-# spell-checker:ignore (env/flags) Awarnings Ccodegen Coverflow Cpanic RUSTDOCFLAGS RUSTFLAGS Zpanic
+# spell-checker:ignore (env/flags) Awarnings Ccodegen Coverflow Cpanic Dwarnings RUSTDOCFLAGS RUSTFLAGS Zpanic
 # spell-checker:ignore (jargon) SHAs deps dequote softprops subshell toolchain
 # spell-checker:ignore (names) CodeCOV MacOS MinGW Peltoche rivy
 # spell-checker:ignore (shell/tools) choco clippy dmake dpkg esac fakeroot gmake grcov halium lcov libssl mkdir popd printf pushd rustc rustfmt rustup shopt xargs
@@ -340,6 +340,13 @@ jobs:
  ## Confirm MinSRV compatible 'Cargo.lock'
  # * 'Cargo.lock' is required to be in a format that `cargo` of MinSRV can interpret (eg, v1-format for MinSRV < v1.38)
  cargo fetch --locked --quiet || { echo "::error file=Cargo.lock::Incompatible (or out-of-date) 'Cargo.lock' file; update using \`cargo +${{ env.RUST_MIN_SRV }} update\`" ; exit 1 ; }
+ - name: Confirm MinSRV equivalence for '.clippy.toml'
+ shell: bash
+ run: |
+ ## Confirm MinSRV equivalence for '.clippy.toml'
+ # * ensure '.clippy.toml' MSRV configuration setting is equal to ${{ env.RUST_MIN_SRV }}
+ CLIPPY_MSRV=$(grep -P "(?i)^\s*msrv\s*=\s*" .clippy.toml | grep -oP "\d+([.]\d+)+")
+ if [ "${CLIPPY_MSRV}" != "${{ env.RUST_MIN_SRV }}" ]; then { echo "::error file=.clippy.toml::Incorrect MSRV configuration for clippy (found '${CLIPPY_MSRV}'; should be '${{ env.RUST_MIN_SRV }}'); update '.clippy.toml' with 'msrv = \"${{ env.RUST_MIN_SRV }}\"'" ; exit 1 ; } ; fi
  - name: Info
  shell: bash
  run: |

.github/workflows/GnuTests.yml

@@ -1,6 +1,6 @@
 name: GnuTests
 
-# spell-checker:ignore (names) gnulib ; (utils) autopoint gperf pyinotify texinfo ; (vars) XPASS
+# spell-checker:ignore (names) gnulib ; (people) Dawid Dziurla * dawidd6 ; (utils) autopoint chksum gperf pyinotify shopt texinfo ; (vars) FILESET XPASS
 
 on: [push, pull_request]
 
@@ -9,23 +9,55 @@ jobs:
  name: Run GNU tests
  runs-on: ubuntu-latest
  steps:
+ - name: Initialize workflow variables
+ id: vars
+ shell: bash
+ run: |
+ ## VARs setup
+ outputs() { step_id="vars"; for var in "$@" ; do echo steps.${step_id}.outputs.${var}="${!var}"; echo ::set-output name=${var}::${!var}; done; }
+ # * config
+ path_GNU="gnu"
+ path_GNULIB="gnulib"
+ path_GNU_tests="gnu/tests"
+ path_UUTILS="uutils"
+ path_reference="reference"
+ outputs path_GNU path_GNU_tests path_GNULIB path_reference path_UUTILS
+ #
+ repo_GNU_ref="v9.0"
+ repo_GNULIB_ref="8e99f24c0931a38880c6ee9b8287c7da80b0036b"
+ repo_reference_branch="${{ github.event.repository.default_branch }}"
+ outputs repo_GNU_ref repo_GNULIB_ref repo_reference_branch
+ #
+ SUITE_LOG_FILE="${path_GNU_tests}/test-suite.log"
+ TEST_LOGS_GLOB="${path_GNU_tests}/**/*.log" ## note: not usable at bash CLI; [why] double globstar not enabled by default b/c MacOS includes only bash v3 which doesn't have double globstar support
+ TEST_FILESET_PREFIX='test-fileset-IDs.sha1#'
+ TEST_FILESET_SUFFIX='.txt'
+ TEST_SUMMARY_FILE='gnu-result.json'
+ outputs SUITE_LOG_FILE TEST_FILESET_PREFIX TEST_FILESET_SUFFIX TEST_LOGS_GLOB TEST_SUMMARY_FILE
  - name: Checkout code uutil
  uses: actions/checkout@v2
  with:
- path: 'uutils'
+ path: '${{ steps.vars.outputs.path_UUTILS }}'
  - name: Checkout GNU coreutils
  uses: actions/checkout@v2
  with:
  repository: 'coreutils/coreutils'
- path: 'gnu'
- ref: v9.0
+ path: '${{ steps.vars.outputs.path_GNU }}'
+ ref: ${{ steps.vars.outputs.repo_GNU_ref }}
  - name: Checkout GNU coreutils library (gnulib)
  uses: actions/checkout@v2
  with:
  repository: 'coreutils/gnulib'
- path: 'gnulib'
- ref: 8e99f24c0931a38880c6ee9b8287c7da80b0036b
- fetch-depth: 0 # gnu gets upset if gnulib is a shallow checkout
+ path: '${{ steps.vars.outputs.path_GNULIB }}'
+ ref: ${{ steps.vars.outputs.repo_GNULIB_ref }}
+ fetch-depth: 0 # full depth checkout (o/w gnu gets upset if gnulib is a shallow checkout)
+ - name: Retrieve reference artifacts
+ uses: dawidd6/action-download-artifact@v2
+ continue-on-error: true ## don't break the build for missing reference artifacts (may be expired or just not generated yet)
+ with:
+ workflow: GnuTests.yml
+ branch: "${{ steps.vars.outputs.repo_reference_branch }}"
+ path: "${{ steps.vars.outputs.path_reference }}"
  - name: Install `rust` toolchain
  uses: actions-rs/toolchain@v1
  with:
@@ -43,28 +75,34 @@ jobs:
  shell: bash
  run: |
  ## Build binaries
- cd uutils
+ cd '${{ steps.vars.outputs.path_UUTILS }}'
  bash util/build-gnu.sh
  - name: Run GNU tests
  shell: bash
  run: |
- bash uutils/util/run-gnu-test.sh
- - name: Extract testing info
+ path_GNU='${{ steps.vars.outputs.path_GNU }}'
+ path_GNULIB='${{ steps.vars.outputs.path_GNULIB }}'
+ path_UUTILS='${{ steps.vars.outputs.path_UUTILS }}'
+ bash "${path_UUTILS}/util/run-gnu-test.sh"
+ - name: Extract/summarize testing info
+ id: summary
  shell: bash
  run: |
- ## Extract testing info
- LOG_FILE=gnu/tests/test-suite.log
- if test -f "$LOG_FILE"
+ ## Extract/summarize testing info
+ outputs() { step_id="summary"; for var in "$@" ; do echo steps.${step_id}.outputs.${var}="${!var}"; echo ::set-output name=${var}::${!var}; done; }
+ #
+ SUITE_LOG_FILE='${{ steps.vars.outputs.SUITE_LOG_FILE }}'
+ if test -f "${SUITE_LOG_FILE}"
  then
- TOTAL=$(sed -n "s/.*# TOTAL: \(.*\)/\1/p"  "$LOG_FILE"|tr -d '\r'|head -n1)
- PASS=$(sed -n "s/.*# PASS: \(.*\)/\1/p" "$LOG_FILE"|tr -d '\r'|head -n1)
- SKIP=$(sed -n "s/.*# SKIP: \(.*\)/\1/p" "$LOG_FILE"|tr -d '\r'|head -n1)
- FAIL=$(sed -n "s/.*# FAIL: \(.*\)/\1/p" "$LOG_FILE"|tr -d '\r'|head -n1)
- XPASS=$(sed -n "s/.*# XPASS: \(.*\)/\1/p" "$LOG_FILE"|tr -d '\r'|head -n1)
- ERROR=$(sed -n "s/.*# ERROR: \(.*\)/\1/p" "$LOG_FILE"|tr -d '\r'|head -n1)
+ TOTAL=$(sed -n "s/.*# TOTAL: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+ PASS=$(sed -n "s/.*# PASS: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+ SKIP=$(sed -n "s/.*# SKIP: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+ FAIL=$(sed -n "s/.*# FAIL: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+ XPASS=$(sed -n "s/.*# XPASS: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
+ ERROR=$(sed -n "s/.*# ERROR: \(.*\)/\1/p" "${SUITE_LOG_FILE}" | tr -d '\r' | head -n1)
  if [[ "$TOTAL" -eq 0 || "$TOTAL" -eq 1 ]]; then
-  echo "Error in the execution, failing early"
-  exit 1
+ echo "::error ::Failed to parse test results from '${SUITE_LOG_FILE}'; failing early"
+ exit 1
  fi
  output="GNU tests summary = TOTAL: $TOTAL / PASS: $PASS / FAIL: $FAIL / ERROR: $ERROR"
  echo "${output}"
@@ -78,54 +116,61 @@ jobs:
  --arg fail "$FAIL" \
  --arg xpass "$XPASS" \
  --arg error "$ERROR" \
- '{($date): { sha: $sha, total: $total, pass: $pass, skip: $skip, fail: $fail, xpass: $xpass, error: $error, }}' > gnu-result.json
+ '{($date): { sha: $sha, total: $total, pass: $pass, skip: $skip, fail: $fail, xpass: $xpass, error: $error, }}' > '${{ steps.vars.outputs.TEST_SUMMARY_FILE }}'
+ HASH=$(sha1sum '${{ steps.vars.outputs.TEST_SUMMARY_FILE }}' | cut --delim=" " -f 1)
+ outputs HASH
  else
- echo "::error ::Failed to get summary of test results"
+ echo "::error ::Failed to find summary of test results (missing '${SUITE_LOG_FILE}'); failing early"
+ exit 1
  fi
- - uses: actions/upload-artifact@v2
- with:
- name: test-report
- path: gnu/tests/**/*.log
- - uses: actions/upload-artifact@v2
+ - name: Reserve SHA1/ID of 'test-summary'
+ uses: actions/upload-artifact@v2
  with:
- name: gnu-result
- path: gnu-result.json
- - name: Download the result
- uses: dawidd6/action-download-artifact@v2
+ name: "${{ steps.summary.outputs.HASH }}"
+ path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
+ - name: Reserve test results summary
+ uses: actions/upload-artifact@v2
  with:
- workflow: GnuTests.yml
- name: gnu-result
- repo: uutils/coreutils
- branch: main
- path: dl
- - name: Download the log
- uses: dawidd6/action-download-artifact@v2
+ name: test-summary
+ path: "${{ steps.vars.outputs.TEST_SUMMARY_FILE }}"
+ - name: Reserve test logs
+ uses: actions/upload-artifact@v2
  with:
- workflow: GnuTests.yml
- name: test-report
- repo: uutils/coreutils
- branch: main
- path: dl
- - name: Compare failing tests against main
+ name: test-logs
+ path: "${{ steps.vars.outputs.TEST_LOGS_GLOB }}"
+ - name: Compare test failures VS reference
  shell: bash
  run: |
- OLD_FAILING=$(sed -n "s/^FAIL: \([[:print:]]\+\).*/\1/p" dl/test-suite.log | sort)
- NEW_FAILING=$(sed -n "s/^FAIL: \([[:print:]]\+\).*/\1/p" gnu/tests/test-suite.log | sort)
- for LINE in $OLD_FAILING
- do
- if ! grep -Fxq $LINE<<<"$NEW_FAILING"; then
- echo "::warning ::Congrats! The gnu test $LINE is now passing!"
- fi
- done
- for LINE in $NEW_FAILING
- do
- if ! grep -Fxq $LINE<<<"$OLD_FAILING"
- then
- echo "::error ::GNU test failed: $LINE. $LINE is passing on 'main'. Maybe you have to rebase?"
- fi
- done
- - name: Compare against main results
+ REF_LOG_FILE='${{ steps.vars.outputs.path_reference }}/test-logs/test-suite.log'
+ REF_SUMMARY_FILE='${{ steps.vars.outputs.path_reference }}/test-summary/gnu-result.json'
+ if test -f "${REF_LOG_FILE}"; then
+ echo "Reference SHA1/ID (of '${REF_SUMMARY_FILE}'): $(sha1sum -- "${REF_SUMMARY_FILE}")"
+ REF_FAILING=$(sed -n "s/^FAIL: \([[:print:]]\+\).*/\1/p" "${REF_LOG_FILE}" | sort)
+ NEW_FAILING=$(sed -n "s/^FAIL: \([[:print:]]\+\).*/\1/p" '${{ steps.vars.outputs.path_GNU_tests }}/test-suite.log' | sort)
+ for LINE in $REF_FAILING
+ do
+ if ! grep -Fxq $LINE<<<"$NEW_FAILING"; then
+ echo "::warning ::Congrats! The gnu test $LINE is now passing!"
+ fi
+ done
+ for LINE in $NEW_FAILING
+ do
+ if ! grep -Fxq $LINE<<<"$REF_FAILING"
+ then
+ echo "::error ::GNU test failed: $LINE. $LINE is passing on 'main'. Maybe you have to rebase?"
+ fi
+ done
+ else
+ echo "::warning ::Skipping test failure comparison; no prior reference test logs are available."
+ fi
+ - name: Compare test summary VS reference
  shell: bash
  run: |
- mv dl/gnu-result.json main-gnu-result.json
- python uutils/util/compare_gnu_result.py
+ REF_SUMMARY_FILE='${{ steps.vars.outputs.path_reference }}/test-summary/gnu-result.json'
+ if test -f "${REF_SUMMARY_FILE}"; then
+ echo "Reference SHA1/ID (of '${REF_SUMMARY_FILE}'): $(sha1sum -- "${REF_SUMMARY_FILE}")"
+ mv "${REF_SUMMARY_FILE}" main-gnu-result.json
+ python uutils/util/compare_gnu_result.py
+ else
+ echo "::warning ::Skipping test summary comparison; no prior reference summary is available."
+ fi

.travis/redox-toolchain.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 rustup target add x86_64-unknown-redox
 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA12E97F0881517F

.vscode/.gitattributes

@@ -0,0 +1,2 @@
+# Configure GitHub to not mark comments in configuration files as errors
+*.json linguist-language=jsonc

.vscode/cSpell.json

@@ -1,7 +1,12 @@
 // `cspell` settings
 {
- "version": "0.1", // Version of the setting file. Always 0.1
- "language": "en", // language - current active spelling language
+ // version of the setting file (always 0.1)
+ "version": "0.1",
+
+ // spelling language
+ "language": "en",
+
+ // custom dictionaries
  "dictionaries": ["acronyms+names", "jargon", "people", "shell", "workspace"],
  "dictionaryDefinitions": [
  { "name": "acronyms+names", "path": "./cspell.dictionaries/acronyms+names.wordlist.txt" },
@@ -10,10 +15,19 @@
  { "name": "shell", "path": "./cspell.dictionaries/shell.wordlist.txt" },
  { "name": "workspace", "path": "./cspell.dictionaries/workspace.wordlist.txt" }
  ],
- // ignorePaths - a list of globs to specify which files are to be ignored
- "ignorePaths": ["Cargo.lock", "target/**", "tests/**/fixtures/**", "src/uu/dd/test-resources/**", "vendor/**"],
- // ignoreWords - a list of words to be ignored (even if they are in the flagWords)
+
+ // files to ignore (globs supported)
+ "ignorePaths": [
+ "Cargo.lock",
+ "target/**",
+ "tests/**/fixtures/**",
+ "src/uu/dd/test-resources/**",
+ "vendor/**"
+ ],
+
+ // words to ignore (even if they are in the flagWords)
  "ignoreWords": [],
- // words - list of words to be always considered correct
+
+ // words to always consider correct
  "words": []
 }

.vscode/extensions.json

@@ -1,10 +1,8 @@
+// spell-checker:ignore (misc) matklad
+// see <http://go.microsoft.com/fwlink/?LinkId=827846> for the documentation about the extensions.json format
 {
- // spell-checker:ignore (misc) matklad
- // see <http://go.microsoft.com/fwlink/?LinkId=827846> for the documentation about the extensions.json format
  "recommendations": [
- // Rust language support.
- "rust-lang.rust",
- // Provides support for rust-analyzer: novel LSP server for the Rust programming language.
+ // Rust language support
  "matklad.rust-analyzer",
  // `cspell` spell-checker support
  "streetsidesoftware.code-spell-checker"

src/bin/coreutils.rs

@@ -87,7 +87,7 @@ fn main() {
  };
 
  if util == "completion" {
- gen_completions(args, utils);
+ gen_completions(args, &utils);
  }
 
  match utils.get(util) {
@@ -132,7 +132,7 @@ fn main() {
 /// Prints completions for the utility in the first parameter for the shell in the second parameter to stdout
 fn gen_completions<T: uucore::Args>(
  args: impl Iterator<Item = OsString>,
- util_map: UtilityMap<T>,
+ util_map: &UtilityMap<T>,
 ) -> ! {
  let all_utilities: Vec<_> = std::iter::once("coreutils")
  .chain(util_map.keys().copied())
@@ -168,9 +168,9 @@ fn gen_completions<T: uucore::Args>(
  process::exit(0);
 }
 
-fn gen_coreutils_app<T: uucore::Args>(util_map: UtilityMap<T>) -> App<'static> {
+fn gen_coreutils_app<T: uucore::Args>(util_map: &UtilityMap<T>) -> App<'static> {
  let mut app = App::new("coreutils");
- for (_, (_, sub_app)) in &util_map {
+ for (_, (_, sub_app)) in util_map {
  app = app.subcommand(sub_app());
  }
  app

src/uu/base32/src/base32.rs

@@ -12,14 +12,14 @@ use uucore::{encoding::Format, error::UResult};
 
 pub mod base_common;
 
-static ABOUT: &str = "
- With no FILE, or when FILE is -, read standard input.
-
- The data are encoded as described for the base32 alphabet in RFC
- 4648. When decoding, the input may contain newlines in addition
- to the bytes of the formal base32 alphabet. Use --ignore-garbage
- to attempt to recover from any other non-alphabet bytes in the
- encoded stream.
+static ABOUT: &str = "\
+With no FILE, or when FILE is -, read standard input.
+
+The data are encoded as described for the base32 alphabet in RFC
+4648. When decoding, the input may contain newlines in addition
+to the bytes of the formal base32 alphabet. Use --ignore-garbage
+to attempt to recover from any other non-alphabet bytes in the
+encoded stream.
 ";
 
 fn usage() -> String {

src/uu/base64/src/base64.rs

@@ -13,14 +13,14 @@ use uucore::{encoding::Format, error::UResult};
 
 use std::io::{stdin, Read};
 
-static ABOUT: &str = "
- With no FILE, or when FILE is -, read standard input.
-
- The data are encoded as described for the base64 alphabet in RFC
- 3548. When decoding, the input may contain newlines in addition
- to the bytes of the formal base64 alphabet. Use --ignore-garbage
- to attempt to recover from any other non-alphabet bytes in the
- encoded stream.
+static ABOUT: &str = "\
+With no FILE, or when FILE is -, read standard input.
+
+The data are encoded as described for the base64 alphabet in RFC
+3548. When decoding, the input may contain newlines in addition
+to the bytes of the formal base64 alphabet. Use --ignore-garbage
+to attempt to recover from any other non-alphabet bytes in the
+encoded stream.
 ";
 
 fn usage() -> String {